This version is substantially less "draft-like", and the diffstat
is actually quite large with Thursday's draft.

The changes are as follows:
- updated oss-fuzz build script
- various cases fixed that broke depending on present/absent dependencies
- all build scripts handle --python correctly
- git submodules properly updated before running meson
- no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
- installation matches current build system
- fixes for virtio-vga broken merge
- includes updated s390-ccw patch from Thomas
- less noisy "make check"
- tested with GitLab CI, BSD VM builds and various Docker builds
- input-keymap files properly regenerated

Of our supported build platforms, only Mac OS and non-x86 hosts are
still untested.  But I guess this might finally count as a v1.

This is available from https://gitlab.com/bonzini/qemu.git branch
meson-poc-next.

Thanks to Thomas, Cornelia, Philippe, Daniel, Alexander and everyone else who
tested the draft!

Paolo


Marc-André Lureau (90):
  optionrom: simplify Makefile
  build-sys hack: ensure target directory is there
  configure: expand path variables for meson configure
  configure: generate Meson cross file
  build-sys hack: link with whole .fa archives
  build-sys: add meson submodule
  meson: enable pie
  meson: use coverage option
  meson: add remaining generated tcg trace helpers
  meson: add version.o
  contrib/vhost-user-input: convert to meson
  contrib/vhost-user-gpu: convert to meson
  contrib/ivshmem: convert to meson
  contrib/elf2dmp: convert to meson
  meson: convert vss-win32
  meson: add msi generation
  meson: add qemu-bridge-helper
  meson: add qemu-keymap
  meson: add qemu-edid
  meson: add virtfs-proxy-helper
  meson: keymap-gen
  meson: generate qemu-version.h
  meson: generate shader headers
  meson: generate hxtool files
  meson: handle edk2 bios and descriptors
  meson: convert qom directory to Meson (tools part)
  meson: convert authz directory to Meson
  meson: convert crypto directory to Meson
  meson: convert io directory to Meson
  meson: convert target/s390x/gen-features.h
  meson: add macos dependencies
  meson: add modules infrastructure
  meson: convert chardev directory to Meson (tools part)
  meson: convert block
  meson: qemu-{img,io,nbd}
  meson: qemu-pr-helper
  meson: convert ui directory to Meson
  meson: convert trace/
  meson: convert dump/
  meson: convert replay directory to Meson
  meson: convert migration directory to Meson
  meson: convert net directory to Meson
  meson: convert backends directory to Meson
  meson: convert fsdev/
  meson: convert disas directory to Meson
  meson: convert qapi-specific to meson
  meson: convert hw/xen
  meson: convert hw/core
  meson: convert hw/smbios
  meson: convert hw/mem
  meson: convert hw/watchdog
  meson: convert hw/virtio
  meson: convert hw/vfio
  meson: convert hw/ssi
  meson: convert hw/sd
  meson: convert hw/scsi
  meson: convert hw/pcmcia
  meson: convert hw/pci-host
  meson: convert hw/pci-bridge
  meson: convert hw/pci
  meson: convert hw/nvram
  meson: convert hw/rdma
  meson: convert hw/net
  meson: convert hw/misc
  meson: convert hw/isa
  meson: convert hw/ipmi
  meson: convert hw/ipack
  meson: convert hw/intc
  meson: convert hw/input
  meson: convert hw/ide
  meson: convert hw/i2c
  meson: convert hw/hyperv
  meson: convert hw/gpio
  meson: convert hw/dma
  meson: convert hw/display
  meson: convert hw/cpu
  meson: convert hw/char
  meson: convert hw/block
  meson: convert hw/audio
  meson: convert hw/adc
  meson: convert hw/acpi
  meson: convert hw/9pfs, cleanup
  meson: convert hw/arch*
  meson: accel
  meson: linux-user
  meson: bsd-user
  meson: cpu-emu
  meson: convert systemtap files
  rules.mak: remove version.o
  meson: convert po/

Paolo Bonzini (56):
  oss-fuzz/build: remove LIB_FUZZING_ENGINE
  trace: switch position of headers to what Meson requires
  meson: rename .inc.c files to .inc
  tests/vm: do not pollute configure with --efi-aarch64
  tests/vm: check for Python YAML parser in the Makefile
  tests/docker: add test script for static linux-user builds
  nsis: use "make DESTDIR=" instead of "make prefix="
  configure: do not include $(...) variables in config-host.mak
  configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson
  tests/vm: include setuptools
  configure: integrate Meson in the build system
  meson: move summary to meson.build
  meson: add sparse support
  meson: add testsuite Makefile generator
  libqemuutil, qapi, trace: convert to meson
  contrib/libvhost-user: convert to Meson
  tools/virtiofsd: convert to Meson
  contrib/vhost-user-blk: convert to Meson
  contrib/vhost-user-scsi: convert to Meson
  contrib/rdmacm-mux: convert to Meson
  meson: convert qemu-ga
  meson: convert dummy Windows qga/qemu-ga target
  meson: convert check-decodetree
  meson: convert tests/fp and check-softfloat
  meson: convert check-qapi-schema
  meson: infrastructure for building emulators
  configure, Makefile; remove TOOLS and HELPERS-y variable
  meson: convert chardev directory to Meson (emulator part)
  meson: convert tests/qtest to meson
  meson: convert audio directory to Meson
  meson: convert root directory to Meson
  meson: convert most of softmmu/
  meson: convert common QMP bits for qemu and qemu-storage-daemon
  meson: convert qemu-storage-daemon
  meson: convert hw/semihosting
  meson: convert hw/nubus
  meson: convert hw/usb
  meson: convert hw/tpm
  meson: convert hw/timer
  meson: convert hw/rtc
  meson: target
  meson: plugins
  meson: link emulators without Makefile.target
  remove Makefile.target
  meson: sphinx-build
  meson: build texi doc
  meson: convert check-block
  rules.mak: drop unneeded macros
  meson: replace create-config with meson configure_file
  meson: convert sample plugins
  meson: move SDL and SDL-image detection to meson
  meson: convert VNC and dependent libraries to meson
  meson: update build-system documentation
  acceptance: use stable URLs for the Debian and Ubuntu installer
  cflags     Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  meson: avoid unstable module warning with Meson 0.56.0 or newer

Thomas Huth (1):
  pc-bios/s390-ccw: do not use rules.mak

 .gitignore                                         |    6 +-
 .gitlab-ci.yml                                     |    6 +-
 .gitmodules                                        |    3 +
 Makefile                                           |  985 +-------------
 Makefile.objs                                      |  219 +--
 Makefile.target                                    |  287 ----
 accel/Makefile.objs                                |    6 -
 accel/kvm/Makefile.objs                            |    2 -
 accel/kvm/meson.build                              |    5 +
 accel/kvm/trace.h                                  |    1 +
 accel/meson.build                                  |    7 +
 accel/stubs/Makefile.objs                          |    6 -
 accel/stubs/meson.build                            |    6 +
 accel/tcg/Makefile.objs                            |    9 -
 .../tcg/{atomic_common.inc.c => atomic_common.inc} |    0
 accel/tcg/cputlb.c                                 |    4 +-
 accel/tcg/meson.build                              |   15 +
 accel/tcg/trace.h                                  |    1 +
 accel/tcg/user-exec.c                              |    4 +-
 accel/xen/Makefile.objs                            |    1 -
 accel/xen/meson.build                              |    1 +
 audio/Makefile.objs                                |   35 -
 audio/meson.build                                  |   32 +
 audio/trace.h                                      |    1 +
 authz/Makefile.objs                                |    7 -
 authz/meson.build                                  |   19 +
 authz/trace.h                                      |    1 +
 backends/Makefile.objs                             |   23 -
 backends/meson.build                               |   19 +
 backends/tpm/Makefile.objs                         |    4 -
 backends/tpm/meson.build                           |    8 +
 backends/tpm/trace.h                               |    1 +
 backends/trace.h                                   |    1 +
 block.c                                            |    6 +-
 block/Makefile.objs                                |   75 -
 block/meson.build                                  |  111 ++
 block/monitor/Makefile.objs                        |    2 -
 block/monitor/meson.build                          |    2 +
 block/trace.h                                      |    1 +
 bsd-user/Makefile.objs                             |    2 -
 bsd-user/meson.build                               |   10 +
 chardev/Makefile.objs                              |   29 -
 chardev/meson.build                                |   43 +
 chardev/trace.h                                    |    1 +
 configure                                          |  976 ++++---------
 contrib/elf2dmp/Makefile.objs                      |    4 -
 contrib/elf2dmp/meson.build                        |    5 +
 contrib/gitdm/filetypes.txt                        |    2 +-
 contrib/ivshmem-client/Makefile.objs               |    1 -
 contrib/ivshmem-client/meson.build                 |    4 +
 contrib/ivshmem-server/Makefile.objs               |    1 -
 contrib/ivshmem-server/meson.build                 |    4 +
 contrib/libvhost-user/Makefile.objs                |    1 -
 contrib/libvhost-user/meson.build                  |    3 +
 contrib/rdmacm-mux/Makefile.objs                   |    3 -
 contrib/rdmacm-mux/meson.build                     |    8 +
 contrib/vhost-user-blk/Makefile.objs               |    1 -
 contrib/vhost-user-blk/meson.build                 |    5 +
 contrib/vhost-user-gpu/Makefile.objs               |   10 -
 contrib/vhost-user-gpu/meson.build                 |   13 +
 contrib/vhost-user-input/Makefile.objs             |    1 -
 contrib/vhost-user-input/meson.build               |    5 +
 contrib/vhost-user-scsi/Makefile.objs              |    1 -
 contrib/vhost-user-scsi/meson.build                |    7 +
 crypto/Makefile.objs                               |   43 -
 crypto/meson.build                                 |   63 +
 crypto/trace.h                                     |    1 +
 disas/Makefile.objs                                |   30 -
 disas/libvixl/Makefile.objs                        |    5 -
 disas/libvixl/meson.build                          |    7 +
 disas/meson.build                                  |   27 +
 dma-helpers.c                                      |    2 +-
 docs/devel/blkverify.txt                           |    4 +-
 docs/devel/build-system.txt                        |  406 +++---
 docs/devel/testing.rst                             |   11 +-
 docs/devel/tracing.txt                             |    2 +-
 docs/index.html.in                                 |    4 +-
 docs/interop/live-block-operations.rst             |    4 +-
 docs/interop/qemu-ga-ref.texi                      |    2 +-
 docs/interop/qemu-qmp-ref.texi                     |    2 +-
 docs/meson.build                                   |   68 +
 dump/Makefile.objs                                 |    3 -
 dump/meson.build                                   |    4 +
 exec.c                                             |    6 +-
 ...t-specialize.inc.c => softfloat-specialize.inc} |    0
 fpu/softfloat.c                                    |    2 +-
 fsdev/Makefile.objs                                |   12 -
 fsdev/meson.build                                  |   18 +
 gdbstub.c                                          |    2 +-
 hw/9pfs/Kconfig                                    |    4 +
 hw/9pfs/Makefile.objs                              |    9 -
 hw/9pfs/meson.build                                |   20 +
 hw/9pfs/trace.h                                    |    1 +
 hw/Makefile.objs                                   |   48 -
 hw/acpi/Makefile.objs                              |   26 -
 hw/acpi/meson.build                                |   25 +
 hw/acpi/trace.h                                    |    1 +
 hw/adc/Makefile.objs                               |    1 -
 hw/adc/meson.build                                 |    1 +
 hw/alpha/Makefile.objs                             |    1 -
 hw/alpha/meson.build                               |    8 +
 hw/alpha/trace.h                                   |    1 +
 hw/arm/Makefile.objs                               |   56 -
 hw/arm/meson.build                                 |   59 +
 hw/arm/trace.h                                     |    1 +
 hw/audio/Makefile.objs                             |   18 -
 hw/audio/meson.build                               |   14 +
 hw/audio/trace.h                                   |    1 +
 hw/avr/Makefile.objs                               |    3 -
 hw/avr/meson.build                                 |    6 +
 hw/block/Makefile.objs                             |   18 -
 hw/block/dataplane/Makefile.objs                   |    2 -
 hw/block/dataplane/meson.build                     |    2 +
 hw/block/dataplane/trace.h                         |    1 +
 hw/block/meson.build                               |   21 +
 hw/block/trace.h                                   |    1 +
 hw/char/Makefile.objs                              |   39 -
 hw/char/meson.build                                |   38 +
 hw/char/trace.h                                    |    1 +
 hw/core/Makefile.objs                              |   34 -
 hw/core/cpu.c                                      |    2 +-
 hw/core/meson.build                                |   49 +
 hw/core/trace.h                                    |    1 +
 hw/cpu/Makefile.objs                               |    5 -
 hw/cpu/meson.build                                 |    6 +
 hw/cris/Makefile.objs                              |    2 -
 hw/cris/meson.build                                |    5 +
 hw/display/Makefile.objs                           |   65 -
 hw/display/meson.build                             |   87 ++
 hw/display/trace.h                                 |    1 +
 hw/dma/Makefile.objs                               |   16 -
 hw/dma/meson.build                                 |   15 +
 hw/dma/trace.h                                     |    1 +
 hw/gpio/Makefile.objs                              |   12 -
 hw/gpio/meson.build                                |   12 +
 hw/gpio/trace.h                                    |    1 +
 hw/hppa/Makefile.objs                              |    1 -
 hw/hppa/meson.build                                |    4 +
 hw/hppa/trace.h                                    |    1 +
 hw/hyperv/Makefile.objs                            |    3 -
 hw/hyperv/meson.build                              |    3 +
 hw/hyperv/trace.h                                  |    1 +
 hw/i2c/Makefile.objs                               |   14 -
 hw/i2c/meson.build                                 |   16 +
 hw/i2c/trace.h                                     |    1 +
 hw/i386/Makefile.objs                              |   20 -
 hw/i386/fw_cfg.c                                   |    2 +-
 hw/i386/kvm/Makefile.objs                          |    5 -
 hw/i386/kvm/meson.build                            |    8 +
 hw/i386/meson.build                                |   32 +
 hw/i386/pc.c                                       |    2 +-
 hw/i386/pc_piix.c                                  |    2 +-
 hw/i386/trace.h                                    |    1 +
 hw/i386/x86.c                                      |    2 +-
 hw/i386/xen/Makefile.objs                          |    1 -
 hw/i386/xen/meson.build                            |    7 +
 hw/i386/xen/trace.h                                |    1 +
 hw/ide/Makefile.objs                               |   14 -
 hw/ide/meson.build                                 |   14 +
 hw/ide/trace.h                                     |    1 +
 hw/input/Makefile.objs                             |   18 -
 hw/input/meson.build                               |   18 +
 hw/input/trace.h                                   |    1 +
 hw/intc/Makefile.objs                              |   54 -
 hw/intc/meson.build                                |   55 +
 hw/intc/trace.h                                    |    1 +
 hw/ipack/Makefile.objs                             |    2 -
 hw/ipack/meson.build                               |    1 +
 hw/ipmi/Makefile.objs                              |    8 -
 hw/ipmi/meson.build                                |   11 +
 hw/isa/Makefile.objs                               |   11 -
 hw/isa/meson.build                                 |   11 +
 hw/isa/trace.h                                     |    1 +
 hw/lm32/Makefile.objs                              |    3 -
 hw/lm32/meson.build                                |    6 +
 hw/m68k/Makefile.objs                              |    4 -
 hw/m68k/meson.build                                |    7 +
 hw/mem/Kconfig                                     |    1 +
 hw/mem/Makefile.objs                               |    3 -
 hw/mem/meson.build                                 |    6 +
 hw/mem/trace.h                                     |    1 +
 hw/meson.build                                     |   67 +
 hw/microblaze/Makefile.objs                        |    4 -
 hw/microblaze/meson.build                          |    7 +
 hw/mips/Makefile.objs                              |    8 -
 hw/mips/meson.build                                |   11 +
 hw/mips/trace.h                                    |    1 +
 hw/misc/Makefile.objs                              |   95 --
 hw/misc/macio/Makefile.objs                        |    5 -
 hw/misc/macio/meson.build                          |    8 +
 hw/misc/macio/trace.h                              |    1 +
 hw/misc/meson.build                                |   99 ++
 hw/misc/trace.h                                    |    1 +
 hw/moxie/Makefile.objs                             |    2 -
 hw/moxie/meson.build                               |    4 +
 hw/net/Makefile.objs                               |   59 -
 hw/net/can/Makefile.objs                           |    4 -
 hw/net/can/meson.build                             |    4 +
 hw/net/meson.build                                 |   67 +
 hw/net/trace.h                                     |    1 +
 hw/nios2/Makefile.objs                             |    3 -
 hw/nios2/meson.build                               |    6 +
 hw/nubus/Makefile.objs                             |    4 -
 hw/nubus/meson.build                               |    7 +
 hw/nvram/Makefile.objs                             |    8 -
 hw/nvram/meson.build                               |    9 +
 hw/nvram/trace.h                                   |    1 +
 hw/openrisc/Makefile.objs                          |    2 -
 hw/openrisc/meson.build                            |    5 +
 hw/pci-bridge/Makefile.objs                        |   10 -
 hw/pci-bridge/meson.build                          |   14 +
 hw/pci-host/Makefile.objs                          |   24 -
 hw/pci-host/meson.build                            |   31 +
 hw/pci-host/trace.h                                |    1 +
 hw/pci/Makefile.objs                               |   14 -
 hw/pci/meson.build                                 |   19 +
 hw/pci/trace.h                                     |    1 +
 hw/pcmcia/Makefile.objs                            |    2 -
 hw/pcmcia/meson.build                              |    2 +
 hw/ppc/Makefile.objs                               |   35 -
 hw/ppc/meson.build                                 |   80 ++
 hw/ppc/trace.h                                     |    1 +
 hw/rdma/Makefile.objs                              |    3 -
 hw/rdma/meson.build                                |   10 +
 hw/rdma/trace.h                                    |    1 +
 hw/rdma/vmw/trace.h                                |    1 +
 hw/riscv/Makefile.objs                             |   16 -
 hw/riscv/meson.build                               |   19 +
 hw/riscv/trace.h                                   |    1 +
 hw/rtc/Makefile.objs                               |   15 -
 hw/rtc/meson.build                                 |   16 +
 hw/rtc/trace.h                                     |    1 +
 hw/rx/Makefile.objs                                |    2 -
 hw/rx/meson.build                                  |    5 +
 hw/s390x/Makefile.objs                             |   37 -
 hw/s390x/meson.build                               |   46 +
 hw/s390x/trace.h                                   |    1 +
 hw/scsi/Makefile.objs                              |   15 -
 hw/scsi/meson.build                                |   26 +
 hw/scsi/trace.h                                    |    1 +
 hw/sd/Makefile.objs                                |   12 -
 hw/sd/meson.build                                  |   12 +
 hw/sd/trace.h                                      |    1 +
 hw/semihosting/Makefile.objs                       |    2 -
 hw/semihosting/meson.build                         |    4 +
 hw/sh4/Makefile.objs                               |    4 -
 hw/sh4/meson.build                                 |   10 +
 hw/smbios/Makefile.objs                            |   10 -
 hw/smbios/meson.build                              |   13 +
 hw/sparc/Makefile.objs                             |    3 -
 hw/sparc/meson.build                               |    6 +
 hw/sparc/trace.h                                   |    1 +
 hw/sparc64/Makefile.objs                           |    4 -
 hw/sparc64/meson.build                             |    6 +
 hw/sparc64/trace.h                                 |    1 +
 hw/ssi/Makefile.objs                               |   10 -
 hw/ssi/meson.build                                 |    9 +
 hw/ssi/trace.h                                     |    1 +
 hw/timer/Makefile.objs                             |   41 -
 hw/timer/meson.build                               |   37 +
 hw/timer/trace.h                                   |    1 +
 hw/tpm/Makefile.objs                               |    6 -
 hw/tpm/meson.build                                 |    8 +
 hw/tpm/trace.h                                     |    1 +
 hw/tricore/Makefile.objs                           |    1 -
 hw/tricore/meson.build                             |    4 +
 hw/unicore32/Makefile.objs                         |    4 -
 hw/unicore32/meson.build                           |    5 +
 hw/usb/Makefile.objs                               |   71 -
 hw/usb/meson.build                                 |   69 +
 hw/usb/trace.h                                     |    1 +
 hw/vfio/Makefile.objs                              |    8 -
 hw/vfio/meson.build                                |   18 +
 hw/vfio/pci-quirks.c                               |    2 +-
 hw/vfio/trace.h                                    |    1 +
 hw/virtio/Makefile.objs                            |   48 -
 hw/virtio/meson.build                              |   51 +
 hw/virtio/trace.h                                  |    1 +
 hw/virtio/virtio-mem.c                             |    2 +-
 hw/watchdog/Makefile.objs                          |    7 -
 hw/watchdog/meson.build                            |    7 +
 hw/watchdog/trace.h                                |    1 +
 hw/xen/Makefile.objs                               |    7 -
 hw/xen/meson.build                                 |   20 +
 hw/xen/trace.h                                     |    1 +
 hw/xenpv/Makefile.objs                             |    2 -
 hw/xenpv/meson.build                               |    3 +
 hw/xtensa/Makefile.objs                            |    6 -
 hw/xtensa/meson.build                              |   11 +
 include/qemu/osdep.h                               |    2 +-
 include/tcg/tcg.h                                  |    2 +-
 include/user/syscall-trace.h                       |    2 +-
 io/Makefile.objs                                   |   12 -
 io/meson.build                                     |   25 +
 io/trace.h                                         |    1 +
 job-qmp.c                                          |    2 +-
 job.c                                              |    2 +-
 libdecnumber/Makefile.objs                         |    5 -
 libdecnumber/meson.build                           |    7 +
 linux-user/Makefile.objs                           |   25 -
 linux-user/alpha/Makefile.objs                     |    5 -
 linux-user/alpha/meson.build                       |    5 +
 linux-user/arm/Makefile.objs                       |    8 -
 linux-user/arm/meson.build                         |   10 +
 linux-user/arm/nwfpe/Makefile.objs                 |    2 -
 linux-user/arm/nwfpe/meson.build                   |   10 +
 linux-user/hppa/Makefile.objs                      |    5 -
 linux-user/hppa/meson.build                        |    5 +
 linux-user/i386/Makefile.objs                      |    5 -
 linux-user/i386/meson.build                        |    5 +
 linux-user/i386/syscall_nr.h                       |    1 +
 linux-user/m68k/Makefile.objs                      |    5 -
 linux-user/m68k/meson.build                        |    5 +
 linux-user/meson.build                             |   37 +
 linux-user/microblaze/Makefile.objs                |    5 -
 linux-user/microblaze/meson.build                  |    5 +
 linux-user/mips/Makefile.objs                      |    5 -
 linux-user/mips/meson.build                        |    5 +
 linux-user/mips/syscall_nr.h                       |    1 +
 linux-user/mips64/Makefile.objs                    |   12 -
 linux-user/mips64/meson.build                      |    6 +
 linux-user/mips64/syscall_nr.h                     |    7 +
 linux-user/ppc/Makefile.objs                       |    6 -
 linux-user/ppc/meson.build                         |    5 +
 linux-user/s390x/Makefile.objs                     |    5 -
 linux-user/s390x/meson.build                       |    5 +
 linux-user/sh4/Makefile.objs                       |    5 -
 linux-user/sh4/meson.build                         |    5 +
 linux-user/sparc/Makefile.objs                     |    5 -
 linux-user/sparc/meson.build                       |    5 +
 linux-user/sparc64/Makefile.objs                   |    5 -
 linux-user/sparc64/meson.build                     |    5 +
 linux-user/trace.h                                 |    1 +
 linux-user/x86_64/Makefile.objs                    |    5 -
 linux-user/x86_64/meson.build                      |    5 +
 linux-user/x86_64/syscall_nr.h                     |    1 +
 linux-user/xtensa/Makefile.objs                    |    5 -
 linux-user/xtensa/meson.build                      |    5 +
 memory_ldst.inc.c => memory_ldst.inc               |    0
 meson                                              |    1 +
 meson.build                                        | 1436 ++++++++++++++++++++
 meson_options.txt                                  |    6 +
 migration/Makefile.objs                            |   18 -
 migration/meson.build                              |   40 +
 migration/trace.h                                  |    1 +
 monitor/Makefile.objs                              |    6 -
 monitor/meson.build                                |    9 +
 monitor/trace.h                                    |    1 +
 nbd/Makefile.objs                                  |    1 -
 nbd/meson.build                                    |    5 +
 nbd/trace.h                                        |    1 +
 net/Makefile.objs                                  |   32 -
 net/can/Makefile.objs                              |    2 -
 net/can/meson.build                                |    5 +
 net/meson.build                                    |   40 +
 net/trace.h                                        |    1 +
 os-posix.c                                         |    2 +-
 pc-bios/descriptors/meson.build                    |   14 +
 pc-bios/meson.build                                |   27 +
 pc-bios/optionrom/Makefile                         |   67 +-
 pc-bios/s390-ccw/Makefile                          |   18 +-
 plugins/Makefile.objs                              |   21 -
 plugins/meson.build                                |   13 +
 po/LINGUAS                                         |    7 +
 po/Makefile                                        |   52 -
 po/POTFILES                                        |    1 +
 po/meson.build                                     |    5 +
 po/messages.po                                     |   74 -
 qapi/Makefile.objs                                 |   38 -
 qapi/meson.build                                   |  124 ++
 qapi/trace.h                                       |    1 +
 qga/Makefile.objs                                  |   10 -
 qga/installer/qemu-ga.wxs                          |    2 +-
 qga/meson.build                                    |   87 ++
 qga/vss-win32/Makefile.objs                        |   23 -
 qga/vss-win32/meson.build                          |   36 +
 qobject/Makefile.objs                              |    3 -
 qobject/meson.build                                |    3 +
 qom/Makefile.objs                                  |    5 -
 qom/meson.build                                    |   18 +
 qom/trace.h                                        |    1 +
 replay/Makefile.objs                               |   10 -
 replay/meson.build                                 |   12 +
 rules.mak                                          |  314 +----
 scripts/archive-source.sh                          |    3 +-
 scripts/check_sparse.py                            |   25 +
 scripts/clean-includes                             |    2 +-
 scripts/create_config                              |  129 --
 scripts/decodetree.py                              |    2 +-
 scripts/device-crash-test                          |    2 +-
 scripts/feature_to_c.sh                            |   24 +-
 scripts/grepy.sh                                   |    3 +
 scripts/hxtool                                     |    2 +-
 scripts/minikconf.py                               |    0
 scripts/mtest2make.py                              |  102 ++
 scripts/ninjatool.py                               | 1010 ++++++++++++++
 scripts/oss-fuzz/build.sh                          |   32 +-
 scripts/qapi-gen.py                                |    0
 scripts/qemu-version.sh                            |   25 +
 scripts/tracetool.py                               |    0
 scripts/tracetool/backend/dtrace.py                |    2 +-
 scripts/tracetool/backend/ust.py                   |    6 +-
 scripts/tracetool/format/c.py                      |    5 +-
 scripts/tracetool/format/tcg_h.py                  |    2 +-
 scripts/tracetool/format/tcg_helper_c.py           |    2 +-
 scripts/undefsym.sh                                |   20 +
 scsi/Makefile.objs                                 |    4 -
 scsi/meson.build                                   |    4 +
 scsi/trace.h                                       |    1 +
 softmmu/Makefile.objs                              |   14 -
 softmmu/balloon.c                                  |    2 +-
 softmmu/ioport.c                                   |    2 +-
 softmmu/memory.c                                   |    2 +-
 softmmu/meson.build                                |   10 +
 softmmu/qtest.c                                    |    2 +-
 softmmu/vl.c                                       |    2 +-
 storage-daemon/Makefile.objs                       |    1 -
 storage-daemon/meson.build                         |   14 +
 storage-daemon/qapi/Makefile.objs                  |    1 -
 storage-daemon/qapi/meson.build                    |    7 +
 .../qemu-storage-daemon.c                          |    0
 stubs/Makefile.objs                                |   56 -
 stubs/meson.build                                  |   50 +
 target/alpha/Makefile.objs                         |    4 -
 target/alpha/meson.build                           |   18 +
 target/arm/Makefile.objs                           |   89 --
 target/arm/meson.build                             |   62 +
 target/arm/trace.h                                 |    1 +
 .../{translate-neon.inc.c => translate-neon.inc}   |    6 +-
 target/arm/translate-sve.c                         |    2 +-
 .../arm/{translate-vfp.inc.c => translate-vfp.inc} |    4 +-
 target/arm/translate.c                             |   12 +-
 target/avr/Makefile.objs                           |   34 -
 target/avr/disas.c                                 |    2 +-
 target/avr/meson.build                             |   20 +
 target/avr/translate.c                             |    2 +-
 target/cris/Makefile.objs                          |    3 -
 target/cris/meson.build                            |   14 +
 target/cris/translate.c                            |    2 +-
 .../{translate_v10.inc.c => translate_v10.inc}     |    0
 target/hppa/Makefile.objs                          |   11 -
 target/hppa/meson.build                            |   19 +
 target/hppa/trace.h                                |    1 +
 target/hppa/translate.c                            |    2 +-
 target/i386/Makefile.objs                          |   23 -
 target/i386/hvf/Makefile.objs                      |    2 -
 target/i386/hvf/meson.build                        |   12 +
 target/i386/meson.build                            |   40 +
 target/i386/trace.h                                |    1 +
 target/lm32/Makefile.objs                          |    4 -
 target/lm32/meson.build                            |   15 +
 target/m68k/Makefile.objs                          |    5 -
 target/m68k/meson.build                            |   17 +
 target/meson.build                                 |   23 +
 target/microblaze/Makefile.objs                    |    3 -
 target/microblaze/meson.build                      |   14 +
 target/mips/Makefile.objs                          |    6 -
 target/mips/meson.build                            |   24 +
 target/mips/trace.h                                |    1 +
 target/mips/translate.c                            |    2 +-
 .../{translate_init.inc.c => translate_init.inc}   |    0
 target/moxie/Makefile.objs                         |    2 -
 target/moxie/meson.build                           |   14 +
 target/nios2/Makefile.objs                         |    4 -
 target/nios2/meson.build                           |   15 +
 target/openrisc/Makefile.objs                      |   15 -
 target/openrisc/disas.c                            |    2 +-
 target/openrisc/meson.build                        |   23 +
 target/openrisc/translate.c                        |    2 +-
 target/ppc/Makefile.objs                           |   20 -
 target/ppc/int_helper.c                            |    2 +-
 target/ppc/meson.build                             |   37 +
 target/ppc/{mfrom_table.inc.c => mfrom_table.inc}  |    0
 target/ppc/trace.h                                 |    1 +
 target/ppc/translate.c                             |   22 +-
 .../ppc/translate/{dfp-impl.inc.c => dfp-impl.inc} |    0
 .../ppc/translate/{dfp-ops.inc.c => dfp-ops.inc}   |    0
 .../ppc/translate/{fp-impl.inc.c => fp-impl.inc}   |    0
 target/ppc/translate/{fp-ops.inc.c => fp-ops.inc}  |    0
 .../ppc/translate/{spe-impl.inc.c => spe-impl.inc} |    0
 .../ppc/translate/{spe-ops.inc.c => spe-ops.inc}   |    0
 .../ppc/translate/{vmx-impl.inc.c => vmx-impl.inc} |    0
 .../ppc/translate/{vmx-ops.inc.c => vmx-ops.inc}   |    0
 .../ppc/translate/{vsx-impl.inc.c => vsx-impl.inc} |    0
 .../ppc/translate/{vsx-ops.inc.c => vsx-ops.inc}   |    0
 .../{translate_init.inc.c => translate_init.inc}   |    0
 target/riscv/Makefile.objs                         |   28 -
 ...trans_privileged.inc.c => trans_privileged.inc} |    0
 .../insn_trans/{trans_rva.inc.c => trans_rva.inc}  |    0
 .../insn_trans/{trans_rvd.inc.c => trans_rvd.inc}  |    0
 .../insn_trans/{trans_rvf.inc.c => trans_rvf.inc}  |    0
 .../insn_trans/{trans_rvh.inc.c => trans_rvh.inc}  |    0
 .../insn_trans/{trans_rvi.inc.c => trans_rvi.inc}  |    0
 .../insn_trans/{trans_rvm.inc.c => trans_rvm.inc}  |    0
 .../insn_trans/{trans_rvv.inc.c => trans_rvv.inc}  |    0
 target/riscv/meson.build                           |   34 +
 target/riscv/trace.h                               |    1 +
 target/riscv/translate.c                           |   20 +-
 target/rx/Makefile.objs                            |   11 -
 target/rx/disas.c                                  |    2 +-
 target/rx/meson.build                              |   16 +
 target/rx/translate.c                              |    2 +-
 target/s390x/Makefile.objs                         |   30 -
 target/s390x/cpu_features.h                        |    2 +-
 target/s390x/cpu_models.h                          |    2 +-
 target/s390x/meson.build                           |   49 +
 target/s390x/trace.h                               |    1 +
 target/s390x/translate.c                           |    2 +-
 .../s390x/{translate_vx.inc.c => translate_vx.inc} |    0
 target/sh4/Makefile.objs                           |    3 -
 target/sh4/meson.build                             |   14 +
 target/sparc/Makefile.objs                         |    7 -
 target/sparc/meson.build                           |   23 +
 target/sparc/trace.h                               |    1 +
 target/tilegx/Makefile.objs                        |    1 -
 target/tilegx/meson.build                          |   13 +
 target/tricore/Makefile.objs                       |    1 -
 target/tricore/meson.build                         |   15 +
 target/unicore32/Makefile.objs                     |    8 -
 target/unicore32/meson.build                       |   14 +
 target/xtensa/Makefile.objs                        |   16 -
 target/xtensa/core-dc232b.c                        |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-dc233c.c                        |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-de212.c                         |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-fsf.c                           |    2 +-
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-sample_controller.c             |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-test_kc705_be.c                 |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/core-test_mmuhifi_c3.c               |    4 +-
 .../{gdb-config.inc.c => gdb-config.inc}           |    0
 .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
 target/xtensa/import_core.sh                       |    8 +-
 target/xtensa/meson.build                          |   30 +
 tcg/README                                         |    2 +-
 tcg/aarch64/{tcg-target.inc.c => tcg-target.inc}   |    4 +-
 tcg/arm/{tcg-target.inc.c => tcg-target.inc}       |    4 +-
 tcg/i386/{tcg-target.inc.c => tcg-target.inc}      |    4 +-
 tcg/mips/{tcg-target.inc.c => tcg-target.inc}      |    2 +-
 tcg/ppc/{tcg-target.inc.c => tcg-target.inc}       |    4 +-
 tcg/riscv/{tcg-target.inc.c => tcg-target.inc}     |    4 +-
 tcg/s390/{tcg-target.inc.c => tcg-target.inc}      |    4 +-
 tcg/sparc/{tcg-target.inc.c => tcg-target.inc}     |    2 +-
 tcg/{tcg-ldst.inc.c => tcg-ldst.inc}               |    0
 tcg/{tcg-pool.inc.c => tcg-pool.inc}               |    2 +-
 tcg/tcg.c                                          |    6 +-
 tcg/tci/README                                     |    4 +-
 tcg/tci/{tcg-target.inc.c => tcg-target.inc}       |    0
 tests/Makefile.include                             |  468 +------
 tests/acceptance/avocado_qemu/__init__.py          |    3 +-
 tests/acceptance/boot_linux_console.py             |    6 +-
 tests/data/acpi/rebuild-expected-aml.sh            |    2 +-
 tests/docker/test-static                           |   24 +
 tests/fp/Makefile                                  |  600 --------
 tests/fp/fp-test.c                                 |    2 +-
 tests/fp/meson.build                               |  636 +++++++++
 tests/fp/{wrap.inc.c => wrap.inc}                  |    0
 tests/meson.build                                  |   18 +
 tests/multiboot/run_test.sh                        |    2 +-
 tests/plugin/Makefile                              |   46 -
 tests/plugin/meson.build                           |    7 +
 tests/qapi-schema/meson.build                      |  216 +++
 tests/qemu-iotests/check                           |    6 +-
 tests/qemu-iotests/meson.build                     |   10 +
 tests/qtest/Makefile.include                       |  332 -----
 tests/qtest/ac97-test.c                            |    2 +-
 tests/qtest/acpi-utils.h                           |    2 +-
 tests/qtest/ahci-test.c                            |    2 +-
 tests/qtest/arm-cpu-features.c                     |    2 +-
 tests/qtest/bios-tables-test.c                     |    2 +-
 tests/qtest/boot-order-test.c                      |    2 +-
 tests/qtest/boot-sector.c                          |    2 +-
 tests/qtest/boot-sector.h                          |    2 +-
 tests/qtest/boot-serial-test.c                     |    2 +-
 tests/qtest/cdrom-test.c                           |    2 +-
 tests/qtest/dbus-vmstate-test.c                    |    2 +-
 tests/qtest/device-introspect-test.c               |    2 +-
 tests/qtest/device-plug-test.c                     |    2 +-
 tests/qtest/drive_del-test.c                       |    2 +-
 tests/qtest/ds1338-test.c                          |    2 +-
 tests/qtest/e1000-test.c                           |    2 +-
 tests/qtest/eepro100-test.c                        |    2 +-
 tests/qtest/endianness-test.c                      |    2 +-
 tests/qtest/es1370-test.c                          |    2 +-
 tests/qtest/fuzz/Makefile.include                  |   39 -
 tests/qtest/fuzz/fuzz.c                            |    2 +-
 tests/qtest/fuzz/fuzz.h                            |    2 +-
 tests/qtest/fuzz/i440fx_fuzz.c                     |    6 +-
 tests/qtest/fuzz/meson.build                       |   35 +
 tests/qtest/fuzz/qos_fuzz.c                        |    2 +-
 tests/qtest/fuzz/qtest_wrappers.c                  |    2 +-
 tests/qtest/fuzz/virtio_net_fuzz.c                 |    5 +-
 tests/qtest/fuzz/virtio_scsi_fuzz.c                |    8 +-
 tests/qtest/fw_cfg-test.c                          |    2 +-
 tests/qtest/hd-geo-test.c                          |    2 +-
 tests/qtest/hexloader-test.c                       |    2 +-
 tests/qtest/ide-test.c                             |    2 +-
 tests/qtest/ipoctal232-test.c                      |    2 +-
 tests/qtest/ivshmem-test.c                         |    2 +-
 tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c   |    4 +-
 tests/qtest/libqos/ahci.c                          |    6 +-
 tests/qtest/libqos/ahci.h                          |    6 +-
 tests/qtest/libqos/arm-imx25-pdk-machine.c         |    6 +-
 tests/qtest/libqos/arm-n800-machine.c              |    6 +-
 tests/qtest/libqos/arm-raspi2-machine.c            |    4 +-
 tests/qtest/libqos/arm-sabrelite-machine.c         |    4 +-
 tests/qtest/libqos/arm-smdkc210-machine.c          |    4 +-
 tests/qtest/libqos/arm-virt-machine.c              |    6 +-
 tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c    |    4 +-
 tests/qtest/libqos/e1000e.c                        |    6 +-
 tests/qtest/libqos/e1000e.h                        |    2 +-
 tests/qtest/libqos/fw_cfg.c                        |    2 +-
 tests/qtest/libqos/i2c-imx.c                       |    2 +-
 tests/qtest/libqos/i2c-omap.c                      |    2 +-
 tests/qtest/libqos/i2c.c                           |    2 +-
 tests/qtest/libqos/i2c.h                           |    2 +-
 tests/qtest/libqos/libqos-pc.c                     |    6 +-
 tests/qtest/libqos/libqos-pc.h                     |    2 +-
 tests/qtest/libqos/libqos-spapr.c                  |    6 +-
 tests/qtest/libqos/libqos-spapr.h                  |    2 +-
 tests/qtest/libqos/libqos.c                        |    4 +-
 tests/qtest/libqos/libqos.h                        |    4 +-
 tests/qtest/{ => libqos}/libqtest.h                |    0
 tests/qtest/libqos/malloc-pc.c                     |    4 +-
 tests/qtest/libqos/malloc-pc.h                     |    2 +-
 tests/qtest/libqos/malloc-spapr.c                  |    2 +-
 tests/qtest/libqos/malloc-spapr.h                  |    2 +-
 tests/qtest/libqos/malloc.c                        |    2 +-
 tests/qtest/libqos/meson.build                     |   57 +
 tests/qtest/libqos/pci-pc.c                        |    2 +-
 tests/qtest/libqos/pci-pc.h                        |    6 +-
 tests/qtest/libqos/pci-spapr.c                     |    6 +-
 tests/qtest/libqos/pci-spapr.h                     |    6 +-
 tests/qtest/libqos/pci.c                           |    4 +-
 tests/qtest/libqos/pci.h                           |    2 +-
 tests/qtest/libqos/ppc64_pseries-machine.c         |    4 +-
 tests/qtest/libqos/qgraph.c                        |    4 +-
 tests/qtest/libqos/qgraph.h                        |    8 +-
 tests/qtest/libqos/qgraph_internal.h               |    4 +-
 tests/qtest/libqos/qos_external.c                  |    8 +-
 tests/qtest/libqos/qos_external.h                  |    4 +-
 tests/qtest/libqos/rtas.c                          |    2 +-
 tests/qtest/libqos/rtas.h                          |    2 +-
 tests/qtest/libqos/sdhci.c                         |    2 +-
 tests/qtest/libqos/sdhci.h                         |    2 +-
 tests/qtest/libqos/tpci200.c                       |    4 +-
 tests/qtest/libqos/usb.c                           |    2 +-
 tests/qtest/libqos/usb.h                           |    2 +-
 tests/qtest/libqos/virtio-9p.c                     |    4 +-
 tests/qtest/libqos/virtio-9p.h                     |    6 +-
 tests/qtest/libqos/virtio-balloon.c                |    4 +-
 tests/qtest/libqos/virtio-balloon.h                |    6 +-
 tests/qtest/libqos/virtio-blk.c                    |    4 +-
 tests/qtest/libqos/virtio-blk.h                    |    6 +-
 tests/qtest/libqos/virtio-mmio.c                   |    8 +-
 tests/qtest/libqos/virtio-mmio.h                   |    4 +-
 tests/qtest/libqos/virtio-net.c                    |    4 +-
 tests/qtest/libqos/virtio-net.h                    |    6 +-
 tests/qtest/libqos/virtio-pci.c                    |   14 +-
 tests/qtest/libqos/virtio-pci.h                    |    6 +-
 tests/qtest/libqos/virtio-rng.c                    |    4 +-
 tests/qtest/libqos/virtio-rng.h                    |    6 +-
 tests/qtest/libqos/virtio-scsi.c                   |    4 +-
 tests/qtest/libqos/virtio-scsi.h                   |    6 +-
 tests/qtest/libqos/virtio-serial.c                 |    4 +-
 tests/qtest/libqos/virtio-serial.h                 |    6 +-
 tests/qtest/libqos/virtio.c                        |    2 +-
 tests/qtest/libqos/virtio.h                        |    2 +-
 tests/qtest/libqos/x86_64_pc-machine.c             |    2 +-
 tests/qtest/libqtest-single.h                      |    2 +-
 tests/qtest/libqtest.c                             |    2 +-
 tests/qtest/m48t59-test.c                          |    2 +-
 tests/qtest/machine-none-test.c                    |    2 +-
 tests/qtest/megasas-test.c                         |    2 +-
 tests/qtest/meson.build                            |  257 ++++
 tests/qtest/microbit-test.c                        |    2 +-
 tests/qtest/migration-helpers.h                    |    2 +-
 tests/qtest/migration-test.c                       |    4 +-
 tests/qtest/modules-test.c                         |    2 +-
 tests/qtest/ne2000-test.c                          |    2 +-
 tests/qtest/numa-test.c                            |    2 +-
 tests/qtest/nvme-test.c                            |    2 +-
 tests/qtest/pca9552-test.c                         |    2 +-
 tests/qtest/pci-test.c                             |    2 +-
 tests/qtest/pcnet-test.c                           |    2 +-
 tests/qtest/pflash-cfi02-test.c                    |    2 +-
 tests/qtest/pnv-xscom-test.c                       |    2 +-
 tests/qtest/prom-env-test.c                        |    2 +-
 tests/qtest/pvpanic-test.c                         |    2 +-
 tests/qtest/pxe-test.c                             |    2 +-
 tests/qtest/q35-test.c                             |    2 +-
 tests/qtest/qmp-cmd-test.c                         |    2 +-
 tests/qtest/qmp-test.c                             |    2 +-
 tests/qtest/qom-test.c                             |    2 +-
 tests/qtest/rtas-test.c                            |    4 +-
 tests/qtest/sdhci-test.c                           |    2 +-
 tests/qtest/spapr-phb-test.c                       |    2 +-
 tests/qtest/tco-test.c                             |    2 +-
 tests/qtest/test-filter-mirror.c                   |    2 +-
 tests/qtest/test-filter-redirector.c               |    2 +-
 tests/qtest/test-hmp.c                             |    2 +-
 tests/qtest/tpm-crb-swtpm-test.c                   |    2 +-
 tests/qtest/tpm-tis-device-swtpm-test.c            |    2 +-
 tests/qtest/tpm-tis-swtpm-test.c                   |    2 +-
 tests/qtest/tpm-util.c                             |    2 +-
 tests/qtest/tulip-test.c                           |    2 +-
 tests/qtest/virtio-rng-test.c                      |    2 +-
 tests/qtest/virtio-test.c                          |    2 +-
 tests/qtest/vmgenid-test.c                         |    2 +-
 tests/qtest/vmxnet3-test.c                         |    2 +-
 tests/qtest/wdt_ib700-test.c                       |    2 +-
 tests/tcg/configure.sh                             |    4 +-
 tests/test-qga.c                                   |   10 +-
 tests/test-qgraph.c                                |    5 +-
 tests/vm/Makefile.include                          |    6 +-
 tests/vm/freebsd                                   |    1 +
 tests/vm/netbsd                                    |    1 +
 tests/vm/openbsd                                   |    1 +
 tools/meson.build                                  |   10 +
 tools/virtiofsd/Makefile.objs                      |   12 -
 tools/virtiofsd/meson.build                        |   19 +
 tools/virtiofsd/passthrough_ll.c                   |    2 +-
 .../virtiofsd/{seccomp.c => passthrough_seccomp.c} |    2 +-
 .../virtiofsd/{seccomp.h => passthrough_seccomp.h} |    0
 trace/Makefile.objs                                |   59 -
 trace/control-target.c                             |    2 +-
 trace/control.c                                    |    2 +-
 trace/meson.build                                  |   93 ++
 ui/Makefile.objs                                   |   73 -
 ui/input-keymap.c                                  |   34 +-
 ui/meson.build                                     |  115 ++
 ui/shader.c                                        |    6 +-
 ui/shader/meson.build                              |   15 +
 ui/trace.h                                         |    1 +
 ui/vnc-enc-zrle.c                                  |   22 +-
 ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc}        |    0
 util/Makefile.objs                                 |   83 --
 util/meson.build                                   |   65 +
 util/trace.h                                       |    1 +
 version.texi.in                                    |    2 +
 749 files changed, 8622 insertions(+), 7202 deletions(-)
 delete mode 100644 Makefile.target
 delete mode 100644 accel/Makefile.objs
 delete mode 100644 accel/kvm/Makefile.objs
 create mode 100644 accel/kvm/meson.build
 create mode 100644 accel/kvm/trace.h
 create mode 100644 accel/meson.build
 delete mode 100644 accel/stubs/Makefile.objs
 create mode 100644 accel/stubs/meson.build
 delete mode 100644 accel/tcg/Makefile.objs
 rename accel/tcg/{atomic_common.inc.c => atomic_common.inc} (100%)
 create mode 100644 accel/tcg/meson.build
 create mode 100644 accel/tcg/trace.h
 delete mode 100644 accel/xen/Makefile.objs
 create mode 100644 accel/xen/meson.build
 delete mode 100644 audio/Makefile.objs
 create mode 100644 audio/meson.build
 create mode 100644 audio/trace.h
 delete mode 100644 authz/Makefile.objs
 create mode 100644 authz/meson.build
 create mode 100644 authz/trace.h
 delete mode 100644 backends/Makefile.objs
 create mode 100644 backends/meson.build
 delete mode 100644 backends/tpm/Makefile.objs
 create mode 100644 backends/tpm/meson.build
 create mode 100644 backends/tpm/trace.h
 create mode 100644 backends/trace.h
 delete mode 100644 block/Makefile.objs
 create mode 100644 block/meson.build
 delete mode 100644 block/monitor/Makefile.objs
 create mode 100644 block/monitor/meson.build
 create mode 100644 block/trace.h
 delete mode 100644 bsd-user/Makefile.objs
 create mode 100644 bsd-user/meson.build
 delete mode 100644 chardev/Makefile.objs
 create mode 100644 chardev/meson.build
 create mode 100644 chardev/trace.h
 delete mode 100644 contrib/elf2dmp/Makefile.objs
 create mode 100644 contrib/elf2dmp/meson.build
 delete mode 100644 contrib/ivshmem-client/Makefile.objs
 create mode 100644 contrib/ivshmem-client/meson.build
 delete mode 100644 contrib/ivshmem-server/Makefile.objs
 create mode 100644 contrib/ivshmem-server/meson.build
 delete mode 100644 contrib/libvhost-user/Makefile.objs
 create mode 100644 contrib/libvhost-user/meson.build
 delete mode 100644 contrib/rdmacm-mux/Makefile.objs
 create mode 100644 contrib/rdmacm-mux/meson.build
 delete mode 100644 contrib/vhost-user-blk/Makefile.objs
 create mode 100644 contrib/vhost-user-blk/meson.build
 delete mode 100644 contrib/vhost-user-gpu/Makefile.objs
 create mode 100644 contrib/vhost-user-gpu/meson.build
 delete mode 100644 contrib/vhost-user-input/Makefile.objs
 create mode 100644 contrib/vhost-user-input/meson.build
 delete mode 100644 contrib/vhost-user-scsi/Makefile.objs
 create mode 100644 contrib/vhost-user-scsi/meson.build
 delete mode 100644 crypto/Makefile.objs
 create mode 100644 crypto/meson.build
 create mode 100644 crypto/trace.h
 delete mode 100644 disas/Makefile.objs
 delete mode 100644 disas/libvixl/Makefile.objs
 create mode 100644 disas/libvixl/meson.build
 create mode 100644 disas/meson.build
 create mode 100644 docs/meson.build
 delete mode 100644 dump/Makefile.objs
 create mode 100644 dump/meson.build
 rename fpu/{softfloat-specialize.inc.c => softfloat-specialize.inc} (100%)
 delete mode 100644 fsdev/Makefile.objs
 create mode 100644 fsdev/meson.build
 delete mode 100644 hw/9pfs/Makefile.objs
 create mode 100644 hw/9pfs/meson.build
 create mode 100644 hw/9pfs/trace.h
 delete mode 100644 hw/Makefile.objs
 delete mode 100644 hw/acpi/Makefile.objs
 create mode 100644 hw/acpi/meson.build
 create mode 100644 hw/acpi/trace.h
 delete mode 100644 hw/adc/Makefile.objs
 create mode 100644 hw/adc/meson.build
 delete mode 100644 hw/alpha/Makefile.objs
 create mode 100644 hw/alpha/meson.build
 create mode 100644 hw/alpha/trace.h
 delete mode 100644 hw/arm/Makefile.objs
 create mode 100644 hw/arm/meson.build
 create mode 100644 hw/arm/trace.h
 delete mode 100644 hw/audio/Makefile.objs
 create mode 100644 hw/audio/meson.build
 create mode 100644 hw/audio/trace.h
 delete mode 100644 hw/avr/Makefile.objs
 create mode 100644 hw/avr/meson.build
 delete mode 100644 hw/block/Makefile.objs
 delete mode 100644 hw/block/dataplane/Makefile.objs
 create mode 100644 hw/block/dataplane/meson.build
 create mode 100644 hw/block/dataplane/trace.h
 create mode 100644 hw/block/meson.build
 create mode 100644 hw/block/trace.h
 delete mode 100644 hw/char/Makefile.objs
 create mode 100644 hw/char/meson.build
 create mode 100644 hw/char/trace.h
 delete mode 100644 hw/core/Makefile.objs
 create mode 100644 hw/core/meson.build
 create mode 100644 hw/core/trace.h
 delete mode 100644 hw/cpu/Makefile.objs
 create mode 100644 hw/cpu/meson.build
 delete mode 100644 hw/cris/Makefile.objs
 create mode 100644 hw/cris/meson.build
 delete mode 100644 hw/display/Makefile.objs
 create mode 100644 hw/display/meson.build
 create mode 100644 hw/display/trace.h
 delete mode 100644 hw/dma/Makefile.objs
 create mode 100644 hw/dma/meson.build
 create mode 100644 hw/dma/trace.h
 delete mode 100644 hw/gpio/Makefile.objs
 create mode 100644 hw/gpio/meson.build
 create mode 100644 hw/gpio/trace.h
 delete mode 100644 hw/hppa/Makefile.objs
 create mode 100644 hw/hppa/meson.build
 create mode 100644 hw/hppa/trace.h
 delete mode 100644 hw/hyperv/Makefile.objs
 create mode 100644 hw/hyperv/meson.build
 create mode 100644 hw/hyperv/trace.h
 delete mode 100644 hw/i2c/Makefile.objs
 create mode 100644 hw/i2c/meson.build
 create mode 100644 hw/i2c/trace.h
 delete mode 100644 hw/i386/Makefile.objs
 delete mode 100644 hw/i386/kvm/Makefile.objs
 create mode 100644 hw/i386/kvm/meson.build
 create mode 100644 hw/i386/meson.build
 create mode 100644 hw/i386/trace.h
 delete mode 100644 hw/i386/xen/Makefile.objs
 create mode 100644 hw/i386/xen/meson.build
 create mode 100644 hw/i386/xen/trace.h
 delete mode 100644 hw/ide/Makefile.objs
 create mode 100644 hw/ide/meson.build
 create mode 100644 hw/ide/trace.h
 delete mode 100644 hw/input/Makefile.objs
 create mode 100644 hw/input/meson.build
 create mode 100644 hw/input/trace.h
 delete mode 100644 hw/intc/Makefile.objs
 create mode 100644 hw/intc/meson.build
 create mode 100644 hw/intc/trace.h
 delete mode 100644 hw/ipack/Makefile.objs
 create mode 100644 hw/ipack/meson.build
 delete mode 100644 hw/ipmi/Makefile.objs
 create mode 100644 hw/ipmi/meson.build
 delete mode 100644 hw/isa/Makefile.objs
 create mode 100644 hw/isa/meson.build
 create mode 100644 hw/isa/trace.h
 delete mode 100644 hw/lm32/Makefile.objs
 create mode 100644 hw/lm32/meson.build
 delete mode 100644 hw/m68k/Makefile.objs
 create mode 100644 hw/m68k/meson.build
 delete mode 100644 hw/mem/Makefile.objs
 create mode 100644 hw/mem/meson.build
 create mode 100644 hw/mem/trace.h
 create mode 100644 hw/meson.build
 delete mode 100644 hw/microblaze/Makefile.objs
 create mode 100644 hw/microblaze/meson.build
 delete mode 100644 hw/mips/Makefile.objs
 create mode 100644 hw/mips/meson.build
 create mode 100644 hw/mips/trace.h
 delete mode 100644 hw/misc/Makefile.objs
 delete mode 100644 hw/misc/macio/Makefile.objs
 create mode 100644 hw/misc/macio/meson.build
 create mode 100644 hw/misc/macio/trace.h
 create mode 100644 hw/misc/meson.build
 create mode 100644 hw/misc/trace.h
 delete mode 100644 hw/moxie/Makefile.objs
 create mode 100644 hw/moxie/meson.build
 delete mode 100644 hw/net/Makefile.objs
 delete mode 100644 hw/net/can/Makefile.objs
 create mode 100644 hw/net/can/meson.build
 create mode 100644 hw/net/meson.build
 create mode 100644 hw/net/trace.h
 delete mode 100644 hw/nios2/Makefile.objs
 create mode 100644 hw/nios2/meson.build
 delete mode 100644 hw/nubus/Makefile.objs
 create mode 100644 hw/nubus/meson.build
 delete mode 100644 hw/nvram/Makefile.objs
 create mode 100644 hw/nvram/meson.build
 create mode 100644 hw/nvram/trace.h
 delete mode 100644 hw/openrisc/Makefile.objs
 create mode 100644 hw/openrisc/meson.build
 delete mode 100644 hw/pci-bridge/Makefile.objs
 create mode 100644 hw/pci-bridge/meson.build
 delete mode 100644 hw/pci-host/Makefile.objs
 create mode 100644 hw/pci-host/meson.build
 create mode 100644 hw/pci-host/trace.h
 delete mode 100644 hw/pci/Makefile.objs
 create mode 100644 hw/pci/meson.build
 create mode 100644 hw/pci/trace.h
 delete mode 100644 hw/pcmcia/Makefile.objs
 create mode 100644 hw/pcmcia/meson.build
 delete mode 100644 hw/ppc/Makefile.objs
 create mode 100644 hw/ppc/meson.build
 create mode 100644 hw/ppc/trace.h
 delete mode 100644 hw/rdma/Makefile.objs
 create mode 100644 hw/rdma/meson.build
 create mode 100644 hw/rdma/trace.h
 create mode 100644 hw/rdma/vmw/trace.h
 delete mode 100644 hw/riscv/Makefile.objs
 create mode 100644 hw/riscv/meson.build
 create mode 100644 hw/riscv/trace.h
 delete mode 100644 hw/rtc/Makefile.objs
 create mode 100644 hw/rtc/meson.build
 create mode 100644 hw/rtc/trace.h
 delete mode 100644 hw/rx/Makefile.objs
 create mode 100644 hw/rx/meson.build
 delete mode 100644 hw/s390x/Makefile.objs
 create mode 100644 hw/s390x/meson.build
 create mode 100644 hw/s390x/trace.h
 delete mode 100644 hw/scsi/Makefile.objs
 create mode 100644 hw/scsi/meson.build
 create mode 100644 hw/scsi/trace.h
 delete mode 100644 hw/sd/Makefile.objs
 create mode 100644 hw/sd/meson.build
 create mode 100644 hw/sd/trace.h
 delete mode 100644 hw/semihosting/Makefile.objs
 create mode 100644 hw/semihosting/meson.build
 delete mode 100644 hw/sh4/Makefile.objs
 create mode 100644 hw/sh4/meson.build
 delete mode 100644 hw/smbios/Makefile.objs
 create mode 100644 hw/smbios/meson.build
 delete mode 100644 hw/sparc/Makefile.objs
 create mode 100644 hw/sparc/meson.build
 create mode 100644 hw/sparc/trace.h
 delete mode 100644 hw/sparc64/Makefile.objs
 create mode 100644 hw/sparc64/meson.build
 create mode 100644 hw/sparc64/trace.h
 delete mode 100644 hw/ssi/Makefile.objs
 create mode 100644 hw/ssi/meson.build
 create mode 100644 hw/ssi/trace.h
 delete mode 100644 hw/timer/Makefile.objs
 create mode 100644 hw/timer/meson.build
 create mode 100644 hw/timer/trace.h
 delete mode 100644 hw/tpm/Makefile.objs
 create mode 100644 hw/tpm/meson.build
 create mode 100644 hw/tpm/trace.h
 delete mode 100644 hw/tricore/Makefile.objs
 create mode 100644 hw/tricore/meson.build
 delete mode 100644 hw/unicore32/Makefile.objs
 create mode 100644 hw/unicore32/meson.build
 delete mode 100644 hw/usb/Makefile.objs
 create mode 100644 hw/usb/meson.build
 create mode 100644 hw/usb/trace.h
 delete mode 100644 hw/vfio/Makefile.objs
 create mode 100644 hw/vfio/meson.build
 create mode 100644 hw/vfio/trace.h
 delete mode 100644 hw/virtio/Makefile.objs
 create mode 100644 hw/virtio/meson.build
 create mode 100644 hw/virtio/trace.h
 delete mode 100644 hw/watchdog/Makefile.objs
 create mode 100644 hw/watchdog/meson.build
 create mode 100644 hw/watchdog/trace.h
 delete mode 100644 hw/xen/Makefile.objs
 create mode 100644 hw/xen/meson.build
 create mode 100644 hw/xen/trace.h
 delete mode 100644 hw/xenpv/Makefile.objs
 create mode 100644 hw/xenpv/meson.build
 delete mode 100644 hw/xtensa/Makefile.objs
 create mode 100644 hw/xtensa/meson.build
 delete mode 100644 io/Makefile.objs
 create mode 100644 io/meson.build
 create mode 100644 io/trace.h
 delete mode 100644 libdecnumber/Makefile.objs
 create mode 100644 libdecnumber/meson.build
 delete mode 100644 linux-user/Makefile.objs
 delete mode 100644 linux-user/alpha/Makefile.objs
 create mode 100644 linux-user/alpha/meson.build
 delete mode 100644 linux-user/arm/Makefile.objs
 create mode 100644 linux-user/arm/meson.build
 delete mode 100644 linux-user/arm/nwfpe/Makefile.objs
 create mode 100644 linux-user/arm/nwfpe/meson.build
 delete mode 100644 linux-user/hppa/Makefile.objs
 create mode 100644 linux-user/hppa/meson.build
 delete mode 100644 linux-user/i386/Makefile.objs
 create mode 100644 linux-user/i386/meson.build
 create mode 100644 linux-user/i386/syscall_nr.h
 delete mode 100644 linux-user/m68k/Makefile.objs
 create mode 100644 linux-user/m68k/meson.build
 create mode 100644 linux-user/meson.build
 delete mode 100644 linux-user/microblaze/Makefile.objs
 create mode 100644 linux-user/microblaze/meson.build
 delete mode 100644 linux-user/mips/Makefile.objs
 create mode 100644 linux-user/mips/meson.build
 create mode 100644 linux-user/mips/syscall_nr.h
 delete mode 100644 linux-user/mips64/Makefile.objs
 create mode 100644 linux-user/mips64/meson.build
 create mode 100644 linux-user/mips64/syscall_nr.h
 delete mode 100644 linux-user/ppc/Makefile.objs
 create mode 100644 linux-user/ppc/meson.build
 delete mode 100644 linux-user/s390x/Makefile.objs
 create mode 100644 linux-user/s390x/meson.build
 delete mode 100644 linux-user/sh4/Makefile.objs
 create mode 100644 linux-user/sh4/meson.build
 delete mode 100644 linux-user/sparc/Makefile.objs
 create mode 100644 linux-user/sparc/meson.build
 delete mode 100644 linux-user/sparc64/Makefile.objs
 create mode 100644 linux-user/sparc64/meson.build
 create mode 100644 linux-user/trace.h
 delete mode 100644 linux-user/x86_64/Makefile.objs
 create mode 100644 linux-user/x86_64/meson.build
 create mode 100644 linux-user/x86_64/syscall_nr.h
 delete mode 100644 linux-user/xtensa/Makefile.objs
 create mode 100644 linux-user/xtensa/meson.build
 rename memory_ldst.inc.c => memory_ldst.inc (100%)
 create mode 160000 meson
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 delete mode 100644 migration/Makefile.objs
 create mode 100644 migration/meson.build
 create mode 100644 migration/trace.h
 delete mode 100644 monitor/Makefile.objs
 create mode 100644 monitor/meson.build
 create mode 100644 monitor/trace.h
 delete mode 100644 nbd/Makefile.objs
 create mode 100644 nbd/meson.build
 create mode 100644 nbd/trace.h
 delete mode 100644 net/Makefile.objs
 delete mode 100644 net/can/Makefile.objs
 create mode 100644 net/can/meson.build
 create mode 100644 net/meson.build
 create mode 100644 net/trace.h
 create mode 100644 pc-bios/descriptors/meson.build
 create mode 100644 pc-bios/meson.build
 delete mode 100644 plugins/Makefile.objs
 create mode 100644 plugins/meson.build
 create mode 100644 po/LINGUAS
 delete mode 100644 po/Makefile
 create mode 100644 po/POTFILES
 create mode 100644 po/meson.build
 delete mode 100644 po/messages.po
 delete mode 100644 qapi/Makefile.objs
 create mode 100644 qapi/meson.build
 create mode 100644 qapi/trace.h
 delete mode 100644 qga/Makefile.objs
 create mode 100644 qga/meson.build
 delete mode 100644 qga/vss-win32/Makefile.objs
 create mode 100644 qga/vss-win32/meson.build
 delete mode 100644 qobject/Makefile.objs
 create mode 100644 qobject/meson.build
 delete mode 100644 qom/Makefile.objs
 create mode 100644 qom/meson.build
 create mode 100644 qom/trace.h
 delete mode 100644 replay/Makefile.objs
 create mode 100644 replay/meson.build
 create mode 100644 scripts/check_sparse.py
 delete mode 100755 scripts/create_config
 mode change 100755 => 100644 scripts/decodetree.py
 create mode 100755 scripts/grepy.sh
 mode change 100644 => 100755 scripts/hxtool
 mode change 100755 => 100644 scripts/minikconf.py
 create mode 100644 scripts/mtest2make.py
 create mode 100755 scripts/ninjatool.py
 mode change 100755 => 100644 scripts/qapi-gen.py
 create mode 100755 scripts/qemu-version.sh
 mode change 100755 => 100644 scripts/tracetool.py
 create mode 100755 scripts/undefsym.sh
 delete mode 100644 scsi/Makefile.objs
 create mode 100644 scsi/meson.build
 create mode 100644 scsi/trace.h
 delete mode 100644 softmmu/Makefile.objs
 create mode 100644 softmmu/meson.build
 delete mode 100644 storage-daemon/Makefile.objs
 create mode 100644 storage-daemon/meson.build
 delete mode 100644 storage-daemon/qapi/Makefile.objs
 create mode 100644 storage-daemon/qapi/meson.build
 rename qemu-storage-daemon.c => storage-daemon/qemu-storage-daemon.c (100%)
 delete mode 100644 stubs/Makefile.objs
 create mode 100644 stubs/meson.build
 delete mode 100644 target/alpha/Makefile.objs
 create mode 100644 target/alpha/meson.build
 delete mode 100644 target/arm/Makefile.objs
 create mode 100644 target/arm/meson.build
 create mode 100644 target/arm/trace.h
 rename target/arm/{translate-neon.inc.c => translate-neon.inc} (99%)
 rename target/arm/{translate-vfp.inc.c => translate-vfp.inc} (99%)
 delete mode 100644 target/avr/Makefile.objs
 create mode 100644 target/avr/meson.build
 delete mode 100644 target/cris/Makefile.objs
 create mode 100644 target/cris/meson.build
 rename target/cris/{translate_v10.inc.c => translate_v10.inc} (100%)
 delete mode 100644 target/hppa/Makefile.objs
 create mode 100644 target/hppa/meson.build
 create mode 100644 target/hppa/trace.h
 delete mode 100644 target/i386/Makefile.objs
 delete mode 100644 target/i386/hvf/Makefile.objs
 create mode 100644 target/i386/hvf/meson.build
 create mode 100644 target/i386/meson.build
 create mode 100644 target/i386/trace.h
 delete mode 100644 target/lm32/Makefile.objs
 create mode 100644 target/lm32/meson.build
 delete mode 100644 target/m68k/Makefile.objs
 create mode 100644 target/m68k/meson.build
 create mode 100644 target/meson.build
 delete mode 100644 target/microblaze/Makefile.objs
 create mode 100644 target/microblaze/meson.build
 delete mode 100644 target/mips/Makefile.objs
 create mode 100644 target/mips/meson.build
 create mode 100644 target/mips/trace.h
 rename target/mips/{translate_init.inc.c => translate_init.inc} (100%)
 delete mode 100644 target/moxie/Makefile.objs
 create mode 100644 target/moxie/meson.build
 delete mode 100644 target/nios2/Makefile.objs
 create mode 100644 target/nios2/meson.build
 delete mode 100644 target/openrisc/Makefile.objs
 create mode 100644 target/openrisc/meson.build
 delete mode 100644 target/ppc/Makefile.objs
 create mode 100644 target/ppc/meson.build
 rename target/ppc/{mfrom_table.inc.c => mfrom_table.inc} (100%)
 create mode 100644 target/ppc/trace.h
 rename target/ppc/translate/{dfp-impl.inc.c => dfp-impl.inc} (100%)
 rename target/ppc/translate/{dfp-ops.inc.c => dfp-ops.inc} (100%)
 rename target/ppc/translate/{fp-impl.inc.c => fp-impl.inc} (100%)
 rename target/ppc/translate/{fp-ops.inc.c => fp-ops.inc} (100%)
 rename target/ppc/translate/{spe-impl.inc.c => spe-impl.inc} (100%)
 rename target/ppc/translate/{spe-ops.inc.c => spe-ops.inc} (100%)
 rename target/ppc/translate/{vmx-impl.inc.c => vmx-impl.inc} (100%)
 rename target/ppc/translate/{vmx-ops.inc.c => vmx-ops.inc} (100%)
 rename target/ppc/translate/{vsx-impl.inc.c => vsx-impl.inc} (100%)
 rename target/ppc/translate/{vsx-ops.inc.c => vsx-ops.inc} (100%)
 rename target/ppc/{translate_init.inc.c => translate_init.inc} (100%)
 delete mode 100644 target/riscv/Makefile.objs
 rename target/riscv/insn_trans/{trans_privileged.inc.c => trans_privileged.inc} (100%)
 rename target/riscv/insn_trans/{trans_rva.inc.c => trans_rva.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvd.inc.c => trans_rvd.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvf.inc.c => trans_rvf.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvh.inc.c => trans_rvh.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvi.inc.c => trans_rvi.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvm.inc.c => trans_rvm.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvv.inc.c => trans_rvv.inc} (100%)
 create mode 100644 target/riscv/meson.build
 create mode 100644 target/riscv/trace.h
 delete mode 100644 target/rx/Makefile.objs
 create mode 100644 target/rx/meson.build
 delete mode 100644 target/s390x/Makefile.objs
 create mode 100644 target/s390x/meson.build
 create mode 100644 target/s390x/trace.h
 rename target/s390x/{translate_vx.inc.c => translate_vx.inc} (100%)
 delete mode 100644 target/sh4/Makefile.objs
 create mode 100644 target/sh4/meson.build
 delete mode 100644 target/sparc/Makefile.objs
 create mode 100644 target/sparc/meson.build
 create mode 100644 target/sparc/trace.h
 delete mode 100644 target/tilegx/Makefile.objs
 create mode 100644 target/tilegx/meson.build
 delete mode 100644 target/tricore/Makefile.objs
 create mode 100644 target/tricore/meson.build
 delete mode 100644 target/unicore32/Makefile.objs
 create mode 100644 target/unicore32/meson.build
 delete mode 100644 target/xtensa/Makefile.objs
 rename target/xtensa/core-dc232b/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-dc232b/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-dc233c/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-dc233c/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-de212/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-de212/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-fsf/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-sample_controller/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-sample_controller/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-test_kc705_be/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-test_kc705_be/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 rename target/xtensa/core-test_mmuhifi_c3/{gdb-config.inc.c => gdb-config.inc} (100%)
 rename target/xtensa/core-test_mmuhifi_c3/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
 create mode 100644 target/xtensa/meson.build
 rename tcg/aarch64/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/arm/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/i386/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/mips/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/ppc/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/riscv/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/s390/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/sparc/{tcg-target.inc.c => tcg-target.inc} (99%)
 rename tcg/{tcg-ldst.inc.c => tcg-ldst.inc} (100%)
 rename tcg/{tcg-pool.inc.c => tcg-pool.inc} (99%)
 rename tcg/tci/{tcg-target.inc.c => tcg-target.inc} (100%)
 create mode 100755 tests/docker/test-static
 delete mode 100644 tests/fp/Makefile
 create mode 100644 tests/fp/meson.build
 rename tests/fp/{wrap.inc.c => wrap.inc} (100%)
 create mode 100644 tests/meson.build
 delete mode 100644 tests/plugin/Makefile
 create mode 100644 tests/plugin/meson.build
 create mode 100644 tests/qapi-schema/meson.build
 create mode 100644 tests/qemu-iotests/meson.build
 delete mode 100644 tests/qtest/Makefile.include
 delete mode 100644 tests/qtest/fuzz/Makefile.include
 create mode 100644 tests/qtest/fuzz/meson.build
 rename tests/qtest/{ => libqos}/libqtest.h (100%)
 create mode 100644 tests/qtest/libqos/meson.build
 create mode 100644 tests/qtest/meson.build
 create mode 100644 tools/meson.build
 delete mode 100644 tools/virtiofsd/Makefile.objs
 create mode 100644 tools/virtiofsd/meson.build
 rename tools/virtiofsd/{seccomp.c => passthrough_seccomp.c} (99%)
 rename tools/virtiofsd/{seccomp.h => passthrough_seccomp.h} (100%)
 delete mode 100644 trace/Makefile.objs
 create mode 100644 trace/meson.build
 delete mode 100644 ui/Makefile.objs
 create mode 100644 ui/meson.build
 create mode 100644 ui/shader/meson.build
 create mode 100644 ui/trace.h
 rename ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc} (100%)
 delete mode 100644 util/Makefile.objs
 create mode 100644 util/meson.build
 create mode 100644 util/trace.h
 create mode 100644 version.texi.in

-- 
1.8.3.1

On Mon, 10 Aug 2020 at 18:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> This version is substantially less "draft-like", and the diffstat
> is actually quite large with Thursday's draft.
>
> The changes are as follows:
> - updated oss-fuzz build script
> - various cases fixed that broke depending on present/absent dependencies
> - all build scripts handle --python correctly
> - git submodules properly updated before running meson
> - no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
> - installation matches current build system
> - fixes for virtio-vga broken merge
> - includes updated s390-ccw patch from Thomas
> - less noisy "make check"
> - tested with GitLab CI, BSD VM builds and various Docker builds
> - input-keymap files properly regenerated
>
> Of our supported build platforms, only Mac OS and non-x86 hosts are
> still untested.  But I guess this might finally count as a v1.

Here's a trio of different failures trying the patchseries in my
usual merge-test setup:

Build failure, windows crossbuilds:

make: Entering directory '/home/petmay01/qemu-for-merges/build/w64'
config-host.mak is out-of-date, running configure
  GEN     tests/test-qapi-gen
Submodule 'meson' (https://github.com/mesonbuild/meson/) registered
for path 'meson'
Cloning into '/home/petmay01/qemu-for-merges/meson'...
Disabling PIE due to missing toolchain support
cross containers  no

NOTE: guest cross-compilers enabled: cc
The Meson build system
Version: 0.55.0
Source dir: /home/petmay01/qemu-for-merges
Build dir: /home/petmay01/qemu-for-merges/build/w64
Build type: cross build

../../meson.build:1:0: ERROR: prefix value 'c:/Program Files/QEMU'
must be an absolute path

A full log can be found at
/home/petmay01/qemu-for-merges/build/w64/meson-logs/meson-log.txt

ERROR: meson setup failed

make: *** Deleting file 'config-host.mak'
make: *** No rule to make target 'config-host.mak', needed by
'meson-private/coredata.dat'.  Stop.
make: Leaving directory '/home/petmay01/qemu-for-merges/build/w64'


Build failure, aarch32:

make: Entering directory '/home/peter.maydell/qemu/build/all-a32'
config-host.mak is out-of-date, running configure
  GEN     tests/test-qapi-gen
Submodule 'meson' (https://github.com/mesonbuild/meson/) registered
for path 'meson'
Cloning into '/home/peter.maydell/qemu/meson'...
cross containers  no

NOTE: guest cross-compilers enabled: cc cc cc cc
Traceback (most recent call last):
  File "/home/peter.maydell/qemu/meson/meson.py", line 26, in <module>
    from mesonbuild import mesonmain
  File "/home/peter.maydell/qemu/meson/mesonbuild/mesonmain.py", line
25, in <module>
    from . import mconf, mdist, minit, minstall, mintro, msetup,
mtest, rewriter, msubprojects, munstable_coredata, mcompile
  File "/home/peter.maydell/qemu/meson/mesonbuild/mconf.py", line 16,
in <module>
    from . import coredata, environment, mesonlib, build, mintro, mlog
  File "/home/peter.maydell/qemu/meson/mesonbuild/build.py", line 26,
in <module>
    from . import dependencies
  File "/home/peter.maydell/qemu/meson/mesonbuild/dependencies/__init__.py",
line 15, in <module>
    from .boost import BoostDependency
  File "/home/peter.maydell/qemu/meson/mesonbuild/dependencies/boost.py",
line 25, in <module>
    from .base import DependencyException, ExternalDependency,
PkgConfigDependency
  File "/home/peter.maydell/qemu/meson/mesonbuild/dependencies/base.py",
line 32, in <module>
    import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'

ERROR: meson setup failed

make: *** Deleting file 'config-host.mak'
make: *** No rule to make target 'config-host.mak', needed by
'meson-private/coredata.dat'.  Stop.
make: Leaving directory '/home/peter.maydell/qemu/build/all-a32'


Build failure, aarch64:

Program scripts/grepy.sh found: YES
Configuring config-all-devices.mak with command
Program scripts/hxtool found: YES
Program scripts/shaderinclude.pl found: YES
Program scripts/qapi-gen.py found: YES
Program scripts/tracetool.py found: YES
Program scripts/qemu-version.sh found: YES
Program keycodemapdb/tools/keymap-gen found: YES
Program scripts/decodetree.py found: YES
Program ../scripts/modules/module_block.py found: YES
Program nm found: YES
Program scripts/undefsym.sh found: YES
Program scripts/feature_to_c.sh found: YES
Program scripts/tracetool.py found: YES

../../meson.build:969:2: ERROR: File kvm64.c does not exist.

A full log can be found at /home/pm/qemu/build/all/meson-logs/meson-log.txt

ERROR: meson setup failed

make: *** Deleting file 'config-host.mak'
make: *** No rule to make target 'config-host.mak', needed by
'meson-private/coredata.dat'.  Stop.
make: Leaving directory '/home/pm/qemu/build/all'


The other hosts are still running, will report results as
they finish. These are just the ones that bailed out
immediately.

thanks
-- PMM

On Mon, 10 Aug 2020 at 19:09, Peter Maydell <peter.maydell@linaro.org> wrote:
> The other hosts are still running, will report results as
> they finish. These are just the ones that bailed out
> immediately.

Linux x86-64 succeeded but produced a bunch of warnings:

../../meson.build:9: WARNING: Module unstable-keyval has no backwards
or forwards compatibility and might not exist in future releases.
WARNING: custom_target 'shared QAPI source files' has more than one
output! Using the first one.
WARNING: custom_target 'QGA QAPI files' has more than one output!
Using the first one.
WARNING: custom_target 'QAPI files for qemu-storage-daemon' has more
than one output! Using the first one.
WARNING: custom_target 'dbus-vmstate description' has more than one
output! Using the first one.
WARNING: custom_target 'tools man pages' has more than one output!
Using the first one.
WARNING: custom_target 'system man pages' has more than one output!
Using the first one.

thanks
-- PMM

On 10/08/20 20:14, Peter Maydell wrote:
> Linux x86-64 succeeded but produced a bunch of warnings:
> 
> ../../meson.build:9: WARNING: Module unstable-keyval has no backwards
> or forwards compatibility and might not exist in future releases.

This is unavoidable (it's fixed in 0.56.0 but will warn in 0.55.0).

> WARNING: custom_target 'shared QAPI source files' has more than one
> output! Using the first one.
> WARNING: custom_target 'QGA QAPI files' has more than one output!
> Using the first one.
> WARNING: custom_target 'QAPI files for qemu-storage-daemon' has more
> than one output! Using the first one.
> WARNING: custom_target 'dbus-vmstate description' has more than one
> output! Using the first one.
> WARNING: custom_target 'tools man pages' has more than one output!
> Using the first one.
> WARNING: custom_target 'system man pages' has more than one output!
> Using the first one.

These will be fixed in 0.55.1.

Paolo

On Mon, 10 Aug 2020 at 19:09, Peter Maydell <peter.maydell@linaro.org> wrote:
> The other hosts are still running, will report results as
> they finish.

ppc64be host:

In file included from ../../contrib/vhost-user-scsi/vhost-user-scsi.c:15:0:
/usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function
‘scsi_set_uint16’ declared but never defined [-Werror]
 inline void scsi_set_uint16(unsigned char *c, uint16_t val);
             ^
/usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function
‘scsi_set_uint32’ declared but never defined [-Werror]
 inline void scsi_set_uint32(unsigned char *c, uint32_t val);
             ^
/usr/include/iscsi/scsi-lowlevel.h:808:17: error: inline function
‘scsi_get_uint16’ declared but never defined [-Werror]
 inline uint16_t scsi_get_uint16(const unsigned char *c);
                 ^
/usr/include/iscsi/scsi-lowlevel.h:807:17: error: inline function
‘scsi_get_uint32’ declared but never defined [-Werror]
 inline uint32_t scsi_get_uint32(const unsigned char *c);
                 ^
/usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function
‘scsi_set_uint16’ declared but never defined [-Werror]
 inline void scsi_set_uint16(unsigned char *c, uint16_t val);
             ^
/usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function
‘scsi_set_uint32’ declared but never defined [-Werror]
 inline void scsi_set_uint32(unsigned char *c, uint32_t val);
             ^
/usr/include/iscsi/scsi-lowlevel.h:808:17: error: inline function
‘scsi_get_uint16’ declared but never defined [-Werror]
 inline uint16_t scsi_get_uint16(const unsigned char *c);
                 ^
/usr/include/iscsi/scsi-lowlevel.h:807:17: error: inline function
‘scsi_get_uint32’ declared but never defined [-Werror]
 inline uint32_t scsi_get_uint32(const unsigned char *c);
                 ^
cc1: all warnings being treated as errors

(Looks like an error in the version of the system header
file on this system, which, unlike my x86 box, defines
the prototypes with "inline" (a change that came in upstream
in commit
https://github.com/sahlberg/libiscsi/commit/7692027d6c11c58948ec3c493abea808af00fdd0
).

However, old make-style compilation worked on this system, so
something has changed.

thanks
-- PMM

On 10/08/20 20:20, Peter Maydell wrote:
> (Looks like an error in the version of the system header
> file on this system, which, unlike my x86 box, defines
> the prototypes with "inline" (a change that came in upstream
> in commit
> https://github.com/sahlberg/libiscsi/commit/7692027d6c11c58948ec3c493abea808af00fdd0
> ).

What's the version of libiscsi?

Paolo

On Mon, 10 Aug 2020 at 19:52, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 10/08/20 20:20, Peter Maydell wrote:
> > (Looks like an error in the version of the system header
> > file on this system, which, unlike my x86 box, defines
> > the prototypes with "inline" (a change that came in upstream
> > in commit
> > https://github.com/sahlberg/libiscsi/commit/7692027d6c11c58948ec3c493abea808af00fdd0
> > ).
>
> What's the version of libiscsi?

libiscsi-devel-1.9.0-7.el7.ppc64

thanks
-- PMM

On 10/08/20 20:20, Peter Maydell wrote:
> 
> In file included from ../../contrib/vhost-user-scsi/vhost-user-scsi.c:15:0:
> /usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function
> ‘scsi_set_uint16’ declared but never defined [-Werror]
>  inline void scsi_set_uint16(unsigned char *c, uint16_t val);
>              ^
> /usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function
> ‘scsi_set_uint32’ declared but never defined [-Werror]
>  inline void scsi_set_uint32(unsigned char *c, uint32_t val);
>              ^
> /usr/include/iscsi/scsi-lowlevel.h:808:17: error: inline function
> ‘scsi_get_uint16’ declared but never defined [-Werror]
>  inline uint16_t scsi_get_uint16(const unsigned char *c);
>                  ^
> /usr/include/iscsi/scsi-lowlevel.h:807:17: error: inline function
> ‘scsi_get_uint32’ declared but never defined [-Werror]
>  inline uint32_t scsi_get_uint32(const unsigned char *c);
>                  ^
> /usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function
> ‘scsi_set_uint16’ declared but never defined [-Werror]
>  inline void scsi_set_uint16(unsigned char *c, uint16_t val);
>              ^
> /usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function
> ‘scsi_set_uint32’ declared but never defined [-Werror]
>  inline void scsi_set_uint32(unsigned char *c, uint32_t val);
>              ^
> /usr/include/iscsi/scsi-lowlevel.h:808:17: error: inline function
> ‘scsi_get_uint16’ declared but never defined [-Werror]
>  inline uint16_t scsi_get_uint16(const unsigned char *c);
>                  ^
> /usr/include/iscsi/scsi-lowlevel.h:807:17: error: inline function
> ‘scsi_get_uint32’ declared but never defined [-Werror]
>  inline uint32_t scsi_get_uint32(const unsigned char *c);
>                  ^
> cc1: all warnings being treated as errors
> 
> (Looks like an error in the version of the system header
> file on this system, which, unlike my x86 box, defines
> the prototypes with "inline" (a change that came in upstream
> in commit
> https://github.com/sahlberg/libiscsi/commit/7692027d6c11c58948ec3c493abea808af00fdd0
> ).

This is pre-existing.  Because I found some bitrot (like this...), a few 
more executables are now built by default.  We are already working 
around it in block/iscsi.c, I'll add the same in vhost-user-scsi.c.

--------- 8< ---------
From 805320beafec25f3eadf9a7c58178427480f915d Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 10 Aug 2020 21:15:19 +0200
Subject: [PATCH] vhost-user-scsi: add compatibility for libiscsi 1.9.0

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 7a1db16..3c91238 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -12,7 +12,9 @@
 
 #include "qemu/osdep.h"
 #include <iscsi/iscsi.h>
+#define inline __attribute__((gnu_inline))  /* required for libiscsi v1.9.0 */
 #include <iscsi/scsi-lowlevel.h>
+#undef inline
 #include "contrib/libvhost-user/libvhost-user-glib.h"
 #include "standard-headers/linux/virtio_scsi.h"
 

Paolo

On Mon, 10 Aug 2020 at 19:09, Peter Maydell <peter.maydell@linaro.org> wrote:
> The other hosts are still running, will report results as
> they finish.

And the remainders:

The tests/vm FreeBSD and OpenBSD setups succeed but emit this warning
(as well as the the usual ones):

WARNING: Gettext not found, all translation targets will be ignored.


OSX succeeds but has this extra warning:

../../meson.build:42: WARNING: add_languages is missing native:,
assuming languages are wanted for both host and build.

All other configs built OK (with the same set of warnings as
for x86).

thanks
-- PMM

On 10/08/20 21:16, Peter Maydell wrote:
> And the remainders:
> 
> The tests/vm FreeBSD and OpenBSD setups succeed but emit this warning
> (as well as the the usual ones):
> 
> WARNING: Gettext not found, all translation targets will be ignored.

This is a real warning.  I'll see if we can add a configure option to
disable the translations bug it's fairly low priority.

> OSX succeeds but has this extra warning:
> 
> ../../meson.build:42: WARNING: add_languages is missing native:,
> assuming languages are wanted for both host and build.

Fixed.

> All other configs built OK (with the same set of warnings as
> for x86).

Great, thanks!

Paolo

On Mon, 10 Aug 2020 at 20:22, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 10/08/20 21:16, Peter Maydell wrote:
> > And the remainders:
> >
> > The tests/vm FreeBSD and OpenBSD setups succeed but emit this warning
> > (as well as the the usual ones):
> >
> > WARNING: Gettext not found, all translation targets will be ignored.
>
> This is a real warning.  I'll see if we can add a configure option to
> disable the translations bug it's fairly low priority.

Is there a package that we could install on these VM configs
that would provide gettext in a way that satisfies Meson?

-- PMM

On 10/08/20 21:26, Peter Maydell wrote:
>> This is a real warning.  I'll see if we can add a configure option to
>> disable the translations bug it's fairly low priority.
> Is there a package that we could install on these VM configs
> that would provide gettext in a way that satisfies Meson?

Note that if you don't install it, you just get the previous behavior
(plus a warning).  But if you want that, it would be simply "gettext" I
guess.  You're using tests/vm/*bsd right?

(BTW tests/vm/freebsd is also an interesting configuration because  it
tests --python=python3.7 so it fails if /usr/bin/env python3 is used by
mistake instead of $PYTHON.  I added a paragraph about that to the build
system doc patch, because Meson has some magic to make that simple).

Paolo

On Mon, 10 Aug 2020 at 20:36, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 10/08/20 21:26, Peter Maydell wrote:
> >> This is a real warning.  I'll see if we can add a configure option to
> >> disable the translations bug it's fairly low priority.
> > Is there a package that we could install on these VM configs
> > that would provide gettext in a way that satisfies Meson?
>
> Note that if you don't install it, you just get the previous behavior
> (plus a warning).  But if you want that, it would be simply "gettext" I
> guess.  You're using tests/vm/*bsd right?

Yes. Unless there's a strong reason for testing the no-gettext
configuration via the BSD VMs it seems like we might as well
just install the dependency. Silencing the warning would be
nice as well if the lack of it isn't actually problematic.

thanks
-- PMM

On 10/08/20 21:45, Peter Maydell wrote:
>> Note that if you don't install it, you just get the previous behavior
>> (plus a warning).  But if you want that, it would be simply "gettext" I
>> guess.  You're using tests/vm/*bsd right?
> Yes. Unless there's a strong reason for testing the no-gettext
> configuration via the BSD VMs it seems like we might as well
> just install the dependency. Silencing the warning would be
> nice as well if the lack of it isn't actually problematic.
> 

No, I think the warning is valid.  Silencing it would be predicated on
--disable-gettext or something like that.  I'll just add the dependency.

Paolo

On Mon, 10 Aug 2020 at 20:49, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 10/08/20 21:45, Peter Maydell wrote:
> >> Note that if you don't install it, you just get the previous behavior
> >> (plus a warning).  But if you want that, it would be simply "gettext" I
> >> guess.  You're using tests/vm/*bsd right?
> > Yes. Unless there's a strong reason for testing the no-gettext
> > configuration via the BSD VMs it seems like we might as well
> > just install the dependency. Silencing the warning would be
> > nice as well if the lack of it isn't actually problematic.
> >
>
> No, I think the warning is valid.  Silencing it would be predicated on
> --disable-gettext or something like that.  I'll just add the dependency.

Our usual default convention is "if the host system has feature X,
act as if --enable-X, otherwise act as if --disable-X", not
"act as if --disable-X apart from warning about it".

thanks
-- PMM

Il lun 10 ago 2020, 21:55 Peter Maydell <peter.maydell@linaro.org> ha
scritto:

> On Mon, 10 Aug 2020 at 20:49, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > On 10/08/20 21:45, Peter Maydell wrote:
> > >> Note that if you don't install it, you just get the previous behavior
> > >> (plus a warning).  But if you want that, it would be simply "gettext"
> I
> > >> guess.  You're using tests/vm/*bsd right?
> > > Yes. Unless there's a strong reason for testing the no-gettext
> > > configuration via the BSD VMs it seems like we might as well
> > > just install the dependency. Silencing the warning would be
> > > nice as well if the lack of it isn't actually problematic.
> > >
> >
> > No, I think the warning is valid.  Silencing it would be predicated on
> > --disable-gettext or something like that.  I'll just add the dependency.
>
> Our usual default convention is "if the host system has feature X,
> act as if --enable-X, otherwise act as if --disable-X", not
> "act as if --disable-X apart from warning about it".
>

Fair enough. Actually Meson has the same concept of enabled/auto/disabled
features so it would have been nice to just add a required option to
i18n.gettext. I will just open code it to avoid waiting for the next
release.

Paolo


> thanks
> -- PMM
>
>

On 10/08/20 20:09, Peter Maydell wrote:
> ModuleNotFoundError: No module named 'pkg_resources'
> 
> ERROR: meson setup failed

Missing dependency, you have to install python3-setuptools.  But it will 
fail just as aarch64 due to the same incorrect line.

> make: *** Deleting file 'config-host.mak'
> make: *** No rule to make target 'config-host.mak', needed by
> 'meson-private/coredata.dat'.  Stop.
> make: Leaving directory '/home/peter.maydell/qemu/build/all-a32'
> 
> 
> Build failure, aarch64:
> 
> Program scripts/grepy.sh found: YES
> Configuring config-all-devices.mak with command
> Program scripts/hxtool found: YES
> Program scripts/shaderinclude.pl found: YES
> Program scripts/qapi-gen.py found: YES
> Program scripts/tracetool.py found: YES
> Program scripts/qemu-version.sh found: YES
> Program keycodemapdb/tools/keymap-gen found: YES
> Program scripts/decodetree.py found: YES
> Program ../scripts/modules/module_block.py found: YES
> Program nm found: YES
> Program scripts/undefsym.sh found: YES
> Program scripts/feature_to_c.sh found: YES
> Program scripts/tracetool.py found: YES
> 
> ../../meson.build:969:2: ERROR: File kvm64.c does not exist.
> 
> A full log can be found at /home/pm/qemu/build/all/meson-logs/meson-log.txt

My bug, fixed thusly:

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 056223a..bd46cdb 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -34,7 +34,7 @@ arm_ss.add(zlib)
 arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
 
 kvm_ss = ss.source_set()
-kvm_ss.add(when: 'TARGET_AARCH64', if_true: 'kvm64.c', if_false: 'kvm32.c')
+kvm_ss.add(when: 'TARGET_AARCH64', if_true: files('kvm64.c'), if_false: files('kvm32.c'))
 arm_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
 

Paolo

On Mon, 10 Aug 2020 at 20:26, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 10/08/20 20:09, Peter Maydell wrote:
> > ModuleNotFoundError: No module named 'pkg_resources'
> >
> > ERROR: meson setup failed
>
> Missing dependency, you have to install python3-setuptools.

since that's a new dependency, is it possible to make it be
diagnosed in a more friendly way than "python barfs out a backtrace" ?

thanks
-- PMM

On 10/08/20 21:27, Peter Maydell wrote:
>> Missing dependency, you have to install python3-setuptools.
> since that's a new dependency, is it possible to make it be
> diagnosed in a more friendly way than "python barfs out a backtrace" ?

Ok, will do.  Testing if "import pkg_resources" works is enough.

Paolo

On Mon, Aug 10, 2020 at 07:06:38PM +0200, Paolo Bonzini wrote:
> This version is substantially less "draft-like", and the diffstat
> is actually quite large with Thursday's draft.
> 
> The changes are as follows:
> - updated oss-fuzz build script
> - various cases fixed that broke depending on present/absent dependencies
> - all build scripts handle --python correctly
> - git submodules properly updated before running meson
> - no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
> - installation matches current build system
> - fixes for virtio-vga broken merge
> - includes updated s390-ccw patch from Thomas
> - less noisy "make check"
> - tested with GitLab CI, BSD VM builds and various Docker builds
> - input-keymap files properly regenerated
> 
> Of our supported build platforms, only Mac OS and non-x86 hosts are
> still untested.  But I guess this might finally count as a v1.

I tested on macOS 10.15 and it seems to be going very well, great job!

I've only had a few warnings during the 'configure':

    ...
    Host machine cpu family: x86_64
    Host machine cpu: x86_64
    ../meson.build:9: WARNING: Module unstable-keyval has no backwards or forwards compatibility and might not exist in future releases.
    Program sh found: YES
    Program python3 found: YES (/usr/local/bin/python3)
    ../meson.build:42: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build.
    Objective-C compiler for the host machine: cc (clang 11.0.3)
    Objective-C linker for the host machine: cc ld64 556.6
    ...
    Found ninjatool-1.8 at /Users/stefano/repos/qemu-paolo/build/ninjatool
    WARNING: custom_target 'shared QAPI source files' has more than one output! Using the first one.
    WARNING: custom_target 'QGA QAPI files' has more than one output! Using the first one.
    WARNING: custom_target 'QAPI files for qemu-storage-daemon' has more than one output! Using the first one.
    WARNING: custom_target 'tools man pages' has more than one output! Using the first one.
    WARNING: custom_target 'system man pages' has more than one output! Using the first one.

Let me know if you need the full output.

The build went well, the only thing that didn't work for me is make clean:
    $ make clean
    /usr/local/bin/python3 -B /Users/stefano/repos/qemu-paolo/meson/meson.py introspect --tests | /usr/local/bin/python3 -B scripts/mtest2make.py > Makefile.mtest
    ./ninjatool -t ninja2make --clean --omit dist uninstall < build.ninja > Makefile.ninja
    Cleaning...
    make: rm: Argument list too long
    make: *** [ninja-clean] Error 1

This was my test:
    git clone https://gitlab.com/bonzini/qemu.git --branch meson-poc-next
    cd qemu
    git submodule update --init
    mkdir build
    cd build
    ../configure
    make -j8
    ./qemu-system-x86_64 --nographic
    make clean

Let me know if I need to run any more specific tests.

Thanks,
Stefano

Hi,

I just compiled qemu-system-ppc using the the meson-poc-next branch with:
git clone -b meson-poc-next http://www.github.com/bonzini/qemu
qemu-mesonbuild-next
cd qemu-mesonbuild-next
mkdir build
cd build
../configure --target-list="ppc-softmmu" --enable-sdl --enable-gtk
--disable-werror

qemu-system-ppc is invoked as follows:

./qemu-system-ppc -L pc-bios \
-M mac99,via=pmu -m 512 -sdl \
-serial stdio \
-drive file=/home/hsp/Mac-disks/9.2.img,format=raw,media=disk \
-boot c

Both SDL and GTK GUis are not found, while the configuration overview lists:
SDL support: YES
GTK support: YES

Terminal says:
qemu-system-ppc: Display 'sdl' is not available, or
qemu-system-ppc: Display 'gtk' is not available.

So qemu starts with the vnc server only.

Best,
Howard

Hi Howard,

On 8/12/20 8:32 AM, Howard Spoelstra wrote:
> Hi,
> 
> I just compiled qemu-system-ppc using the the meson-poc-next branch with:
> git clone -b meson-poc-next http://www.github.com/bonzini/qemu
> qemu-mesonbuild-next

I notice you refer to github while Paolo mentioned gitlab in the
cover:

"This is available from https://gitlab.com/bonzini/qemu.git branch"

I am not sure he maintains both sync, can you retest using the gitlab
branch?

> cd qemu-mesonbuild-next
> mkdir build
> cd build
> ../configure --target-list="ppc-softmmu" --enable-sdl --enable-gtk
> --disable-werror
> 
> qemu-system-ppc is invoked as follows:
> 
> ./qemu-system-ppc -L pc-bios \
> -M mac99,via=pmu -m 512 -sdl \
> -serial stdio \
> -drive file=/home/hsp/Mac-disks/9.2.img,format=raw,media=disk \
> -boot c
> 
> Both SDL and GTK GUis are not found, while the configuration overview lists:
> SDL support: YES
> GTK support: YES
> 
> Terminal says:
> qemu-system-ppc: Display 'sdl' is not available, or
> qemu-system-ppc: Display 'gtk' is not available.
> 
> So qemu starts with the vnc server only.
> 
> Best,
> Howard
> 

On Wed, Aug 12, 2020 at 3:24 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> Hi Howard,
>
> On 8/12/20 8:32 AM, Howard Spoelstra wrote:
> > Hi,
> >
> > I just compiled qemu-system-ppc using the the meson-poc-next branch with:
> > git clone -b meson-poc-next http://www.github.com/bonzini/qemu
> > qemu-mesonbuild-next
>
> I notice you refer to github while Paolo mentioned gitlab in the
> cover:
>
> "This is available from https://gitlab.com/bonzini/qemu.git branch"
>
> I am not sure he maintains both sync, can you retest using the gitlab
> branch?
>
> Hi Philippe,

I have the same issue when building from the gitlab repo just minutes ago:
qemu-system-ppc-meson-gitlab: Display 'sdl' is not available.
qemu-system-ppc-meson-gitlab: Display 'gtk' is not available.

Best,
Howard

On Mon, Aug 10, 2020 at 07:06:38PM +0200, Paolo Bonzini wrote:
> This version is substantially less "draft-like", and the diffstat
> is actually quite large with Thursday's draft.
> 
> The changes are as follows:
> - updated oss-fuzz build script
> - various cases fixed that broke depending on present/absent dependencies
> - all build scripts handle --python correctly
> - git submodules properly updated before running meson
> - no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
> - installation matches current build system
> - fixes for virtio-vga broken merge
> - includes updated s390-ccw patch from Thomas
> - less noisy "make check"
> - tested with GitLab CI, BSD VM builds and various Docker builds
> - input-keymap files properly regenerated
> 
> Of our supported build platforms, only Mac OS and non-x86 hosts are
> still untested.  But I guess this might finally count as a v1.
> 

Hi Paolo,

./configure fails on macOS with meson 0.55 installed from homebrew:

  $ mkdir build
  $ cd build
  $ ../configure
  Disabling PIE due to missing toolchain support
  cross containers  docker

  NOTE: guest cross-compilers enabled: cc
    File "/usr/local/bin/meson", line 2
      PYTHONPATH="/usr/local/Cellar/meson/0.55.0/lib/python3.8/site-packages" exec "/usr/local/Cellar/meson/0.55.0/libexec/bin/meson"  "$@"
                                                                              ^
  SyntaxError: invalid syntax

  ERROR: meson setup failed

The line in configure assumes that meson is a python program rather than
a wrapper:

  meson="$python $meson"

Here's how meson looks in homebrew:

  $ brew list meson
  /usr/local/Cellar/meson/0.55.0/bin/meson
  /usr/local/Cellar/meson/0.55.0/lib/python3.8/ (266 files)
  /usr/local/Cellar/meson/0.55.0/libexec/bin/meson
  /usr/local/Cellar/meson/0.55.0/share/man/man1/meson.1
  /usr/local/Cellar/meson/0.55.0/share/polkit-1/actions/com.mesonbuild.install.policy

  $ cat $(which meson)
  #!/bin/bash
  PYTHONPATH="/usr/local/Cellar/meson/0.55.0/lib/python3.8/site-packages" exec "/usr/local/Cellar/meson/0.55.0/libexec/bin/meson"  "$@"

  $ cat /usr/local/Cellar/meson/0.55.0/libexec/bin/meson
  #!/usr/local/opt/python@3.8/bin/python3.8
  # EASY-INSTALL-ENTRY-SCRIPT: 'meson==0.55.0','console_scripts','meson'
  __requires__ = 'meson==0.55.0'
  import re
  import sys
  from pkg_resources import load_entry_point

  if __name__ == '__main__':
      sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
      sys.exit(
          load_entry_point('meson==0.55.0', 'console_scripts', 'meson')()
      )

If I comment out:
  meson="$python $meson"

I get the following ERROR:

../meson.build:1228:2: ERROR: Tried to access compiler for unspecified language "objc".

The change helps to proceed with configuration:

-  summary_info += {'Objective-C compiler': meson.get_compiler('objc', native: true).cmd_array()[0]}
+  summary_info += {'Objective-C compiler': meson.get_compiler('objc').cmd_array()[0]}

Compilation seems to partially succeed but linking of QEMU binary fails:

[3691/5594] Linking target qemu-system-aarch64
FAILED: qemu-system-aarch64
...snip...
ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
ld: library not found for -lcapstone
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Regards,
Roman

> This is available from https://gitlab.com/bonzini/qemu.git branch
> meson-poc-next.
> 
> Thanks to Thomas, Cornelia, Philippe, Daniel, Alexander and everyone else who
> tested the draft!
> 
> Paolo
> 
> 
> Marc-André Lureau (90):
>   optionrom: simplify Makefile
>   build-sys hack: ensure target directory is there
>   configure: expand path variables for meson configure
>   configure: generate Meson cross file
>   build-sys hack: link with whole .fa archives
>   build-sys: add meson submodule
>   meson: enable pie
>   meson: use coverage option
>   meson: add remaining generated tcg trace helpers
>   meson: add version.o
>   contrib/vhost-user-input: convert to meson
>   contrib/vhost-user-gpu: convert to meson
>   contrib/ivshmem: convert to meson
>   contrib/elf2dmp: convert to meson
>   meson: convert vss-win32
>   meson: add msi generation
>   meson: add qemu-bridge-helper
>   meson: add qemu-keymap
>   meson: add qemu-edid
>   meson: add virtfs-proxy-helper
>   meson: keymap-gen
>   meson: generate qemu-version.h
>   meson: generate shader headers
>   meson: generate hxtool files
>   meson: handle edk2 bios and descriptors
>   meson: convert qom directory to Meson (tools part)
>   meson: convert authz directory to Meson
>   meson: convert crypto directory to Meson
>   meson: convert io directory to Meson
>   meson: convert target/s390x/gen-features.h
>   meson: add macos dependencies
>   meson: add modules infrastructure
>   meson: convert chardev directory to Meson (tools part)
>   meson: convert block
>   meson: qemu-{img,io,nbd}
>   meson: qemu-pr-helper
>   meson: convert ui directory to Meson
>   meson: convert trace/
>   meson: convert dump/
>   meson: convert replay directory to Meson
>   meson: convert migration directory to Meson
>   meson: convert net directory to Meson
>   meson: convert backends directory to Meson
>   meson: convert fsdev/
>   meson: convert disas directory to Meson
>   meson: convert qapi-specific to meson
>   meson: convert hw/xen
>   meson: convert hw/core
>   meson: convert hw/smbios
>   meson: convert hw/mem
>   meson: convert hw/watchdog
>   meson: convert hw/virtio
>   meson: convert hw/vfio
>   meson: convert hw/ssi
>   meson: convert hw/sd
>   meson: convert hw/scsi
>   meson: convert hw/pcmcia
>   meson: convert hw/pci-host
>   meson: convert hw/pci-bridge
>   meson: convert hw/pci
>   meson: convert hw/nvram
>   meson: convert hw/rdma
>   meson: convert hw/net
>   meson: convert hw/misc
>   meson: convert hw/isa
>   meson: convert hw/ipmi
>   meson: convert hw/ipack
>   meson: convert hw/intc
>   meson: convert hw/input
>   meson: convert hw/ide
>   meson: convert hw/i2c
>   meson: convert hw/hyperv
>   meson: convert hw/gpio
>   meson: convert hw/dma
>   meson: convert hw/display
>   meson: convert hw/cpu
>   meson: convert hw/char
>   meson: convert hw/block
>   meson: convert hw/audio
>   meson: convert hw/adc
>   meson: convert hw/acpi
>   meson: convert hw/9pfs, cleanup
>   meson: convert hw/arch*
>   meson: accel
>   meson: linux-user
>   meson: bsd-user
>   meson: cpu-emu
>   meson: convert systemtap files
>   rules.mak: remove version.o
>   meson: convert po/
> 
> Paolo Bonzini (56):
>   oss-fuzz/build: remove LIB_FUZZING_ENGINE
>   trace: switch position of headers to what Meson requires
>   meson: rename .inc.c files to .inc
>   tests/vm: do not pollute configure with --efi-aarch64
>   tests/vm: check for Python YAML parser in the Makefile
>   tests/docker: add test script for static linux-user builds
>   nsis: use "make DESTDIR=" instead of "make prefix="
>   configure: do not include $(...) variables in config-host.mak
>   configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson
>   tests/vm: include setuptools
>   configure: integrate Meson in the build system
>   meson: move summary to meson.build
>   meson: add sparse support
>   meson: add testsuite Makefile generator
>   libqemuutil, qapi, trace: convert to meson
>   contrib/libvhost-user: convert to Meson
>   tools/virtiofsd: convert to Meson
>   contrib/vhost-user-blk: convert to Meson
>   contrib/vhost-user-scsi: convert to Meson
>   contrib/rdmacm-mux: convert to Meson
>   meson: convert qemu-ga
>   meson: convert dummy Windows qga/qemu-ga target
>   meson: convert check-decodetree
>   meson: convert tests/fp and check-softfloat
>   meson: convert check-qapi-schema
>   meson: infrastructure for building emulators
>   configure, Makefile; remove TOOLS and HELPERS-y variable
>   meson: convert chardev directory to Meson (emulator part)
>   meson: convert tests/qtest to meson
>   meson: convert audio directory to Meson
>   meson: convert root directory to Meson
>   meson: convert most of softmmu/
>   meson: convert common QMP bits for qemu and qemu-storage-daemon
>   meson: convert qemu-storage-daemon
>   meson: convert hw/semihosting
>   meson: convert hw/nubus
>   meson: convert hw/usb
>   meson: convert hw/tpm
>   meson: convert hw/timer
>   meson: convert hw/rtc
>   meson: target
>   meson: plugins
>   meson: link emulators without Makefile.target
>   remove Makefile.target
>   meson: sphinx-build
>   meson: build texi doc
>   meson: convert check-block
>   rules.mak: drop unneeded macros
>   meson: replace create-config with meson configure_file
>   meson: convert sample plugins
>   meson: move SDL and SDL-image detection to meson
>   meson: convert VNC and dependent libraries to meson
>   meson: update build-system documentation
>   acceptance: use stable URLs for the Debian and Ubuntu installer
>   cflags     Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>   meson: avoid unstable module warning with Meson 0.56.0 or newer
> 
> Thomas Huth (1):
>   pc-bios/s390-ccw: do not use rules.mak
> 
>  .gitignore                                         |    6 +-
>  .gitlab-ci.yml                                     |    6 +-
>  .gitmodules                                        |    3 +
>  Makefile                                           |  985 +-------------
>  Makefile.objs                                      |  219 +--
>  Makefile.target                                    |  287 ----
>  accel/Makefile.objs                                |    6 -
>  accel/kvm/Makefile.objs                            |    2 -
>  accel/kvm/meson.build                              |    5 +
>  accel/kvm/trace.h                                  |    1 +
>  accel/meson.build                                  |    7 +
>  accel/stubs/Makefile.objs                          |    6 -
>  accel/stubs/meson.build                            |    6 +
>  accel/tcg/Makefile.objs                            |    9 -
>  .../tcg/{atomic_common.inc.c => atomic_common.inc} |    0
>  accel/tcg/cputlb.c                                 |    4 +-
>  accel/tcg/meson.build                              |   15 +
>  accel/tcg/trace.h                                  |    1 +
>  accel/tcg/user-exec.c                              |    4 +-
>  accel/xen/Makefile.objs                            |    1 -
>  accel/xen/meson.build                              |    1 +
>  audio/Makefile.objs                                |   35 -
>  audio/meson.build                                  |   32 +
>  audio/trace.h                                      |    1 +
>  authz/Makefile.objs                                |    7 -
>  authz/meson.build                                  |   19 +
>  authz/trace.h                                      |    1 +
>  backends/Makefile.objs                             |   23 -
>  backends/meson.build                               |   19 +
>  backends/tpm/Makefile.objs                         |    4 -
>  backends/tpm/meson.build                           |    8 +
>  backends/tpm/trace.h                               |    1 +
>  backends/trace.h                                   |    1 +
>  block.c                                            |    6 +-
>  block/Makefile.objs                                |   75 -
>  block/meson.build                                  |  111 ++
>  block/monitor/Makefile.objs                        |    2 -
>  block/monitor/meson.build                          |    2 +
>  block/trace.h                                      |    1 +
>  bsd-user/Makefile.objs                             |    2 -
>  bsd-user/meson.build                               |   10 +
>  chardev/Makefile.objs                              |   29 -
>  chardev/meson.build                                |   43 +
>  chardev/trace.h                                    |    1 +
>  configure                                          |  976 ++++---------
>  contrib/elf2dmp/Makefile.objs                      |    4 -
>  contrib/elf2dmp/meson.build                        |    5 +
>  contrib/gitdm/filetypes.txt                        |    2 +-
>  contrib/ivshmem-client/Makefile.objs               |    1 -
>  contrib/ivshmem-client/meson.build                 |    4 +
>  contrib/ivshmem-server/Makefile.objs               |    1 -
>  contrib/ivshmem-server/meson.build                 |    4 +
>  contrib/libvhost-user/Makefile.objs                |    1 -
>  contrib/libvhost-user/meson.build                  |    3 +
>  contrib/rdmacm-mux/Makefile.objs                   |    3 -
>  contrib/rdmacm-mux/meson.build                     |    8 +
>  contrib/vhost-user-blk/Makefile.objs               |    1 -
>  contrib/vhost-user-blk/meson.build                 |    5 +
>  contrib/vhost-user-gpu/Makefile.objs               |   10 -
>  contrib/vhost-user-gpu/meson.build                 |   13 +
>  contrib/vhost-user-input/Makefile.objs             |    1 -
>  contrib/vhost-user-input/meson.build               |    5 +
>  contrib/vhost-user-scsi/Makefile.objs              |    1 -
>  contrib/vhost-user-scsi/meson.build                |    7 +
>  crypto/Makefile.objs                               |   43 -
>  crypto/meson.build                                 |   63 +
>  crypto/trace.h                                     |    1 +
>  disas/Makefile.objs                                |   30 -
>  disas/libvixl/Makefile.objs                        |    5 -
>  disas/libvixl/meson.build                          |    7 +
>  disas/meson.build                                  |   27 +
>  dma-helpers.c                                      |    2 +-
>  docs/devel/blkverify.txt                           |    4 +-
>  docs/devel/build-system.txt                        |  406 +++---
>  docs/devel/testing.rst                             |   11 +-
>  docs/devel/tracing.txt                             |    2 +-
>  docs/index.html.in                                 |    4 +-
>  docs/interop/live-block-operations.rst             |    4 +-
>  docs/interop/qemu-ga-ref.texi                      |    2 +-
>  docs/interop/qemu-qmp-ref.texi                     |    2 +-
>  docs/meson.build                                   |   68 +
>  dump/Makefile.objs                                 |    3 -
>  dump/meson.build                                   |    4 +
>  exec.c                                             |    6 +-
>  ...t-specialize.inc.c => softfloat-specialize.inc} |    0
>  fpu/softfloat.c                                    |    2 +-
>  fsdev/Makefile.objs                                |   12 -
>  fsdev/meson.build                                  |   18 +
>  gdbstub.c                                          |    2 +-
>  hw/9pfs/Kconfig                                    |    4 +
>  hw/9pfs/Makefile.objs                              |    9 -
>  hw/9pfs/meson.build                                |   20 +
>  hw/9pfs/trace.h                                    |    1 +
>  hw/Makefile.objs                                   |   48 -
>  hw/acpi/Makefile.objs                              |   26 -
>  hw/acpi/meson.build                                |   25 +
>  hw/acpi/trace.h                                    |    1 +
>  hw/adc/Makefile.objs                               |    1 -
>  hw/adc/meson.build                                 |    1 +
>  hw/alpha/Makefile.objs                             |    1 -
>  hw/alpha/meson.build                               |    8 +
>  hw/alpha/trace.h                                   |    1 +
>  hw/arm/Makefile.objs                               |   56 -
>  hw/arm/meson.build                                 |   59 +
>  hw/arm/trace.h                                     |    1 +
>  hw/audio/Makefile.objs                             |   18 -
>  hw/audio/meson.build                               |   14 +
>  hw/audio/trace.h                                   |    1 +
>  hw/avr/Makefile.objs                               |    3 -
>  hw/avr/meson.build                                 |    6 +
>  hw/block/Makefile.objs                             |   18 -
>  hw/block/dataplane/Makefile.objs                   |    2 -
>  hw/block/dataplane/meson.build                     |    2 +
>  hw/block/dataplane/trace.h                         |    1 +
>  hw/block/meson.build                               |   21 +
>  hw/block/trace.h                                   |    1 +
>  hw/char/Makefile.objs                              |   39 -
>  hw/char/meson.build                                |   38 +
>  hw/char/trace.h                                    |    1 +
>  hw/core/Makefile.objs                              |   34 -
>  hw/core/cpu.c                                      |    2 +-
>  hw/core/meson.build                                |   49 +
>  hw/core/trace.h                                    |    1 +
>  hw/cpu/Makefile.objs                               |    5 -
>  hw/cpu/meson.build                                 |    6 +
>  hw/cris/Makefile.objs                              |    2 -
>  hw/cris/meson.build                                |    5 +
>  hw/display/Makefile.objs                           |   65 -
>  hw/display/meson.build                             |   87 ++
>  hw/display/trace.h                                 |    1 +
>  hw/dma/Makefile.objs                               |   16 -
>  hw/dma/meson.build                                 |   15 +
>  hw/dma/trace.h                                     |    1 +
>  hw/gpio/Makefile.objs                              |   12 -
>  hw/gpio/meson.build                                |   12 +
>  hw/gpio/trace.h                                    |    1 +
>  hw/hppa/Makefile.objs                              |    1 -
>  hw/hppa/meson.build                                |    4 +
>  hw/hppa/trace.h                                    |    1 +
>  hw/hyperv/Makefile.objs                            |    3 -
>  hw/hyperv/meson.build                              |    3 +
>  hw/hyperv/trace.h                                  |    1 +
>  hw/i2c/Makefile.objs                               |   14 -
>  hw/i2c/meson.build                                 |   16 +
>  hw/i2c/trace.h                                     |    1 +
>  hw/i386/Makefile.objs                              |   20 -
>  hw/i386/fw_cfg.c                                   |    2 +-
>  hw/i386/kvm/Makefile.objs                          |    5 -
>  hw/i386/kvm/meson.build                            |    8 +
>  hw/i386/meson.build                                |   32 +
>  hw/i386/pc.c                                       |    2 +-
>  hw/i386/pc_piix.c                                  |    2 +-
>  hw/i386/trace.h                                    |    1 +
>  hw/i386/x86.c                                      |    2 +-
>  hw/i386/xen/Makefile.objs                          |    1 -
>  hw/i386/xen/meson.build                            |    7 +
>  hw/i386/xen/trace.h                                |    1 +
>  hw/ide/Makefile.objs                               |   14 -
>  hw/ide/meson.build                                 |   14 +
>  hw/ide/trace.h                                     |    1 +
>  hw/input/Makefile.objs                             |   18 -
>  hw/input/meson.build                               |   18 +
>  hw/input/trace.h                                   |    1 +
>  hw/intc/Makefile.objs                              |   54 -
>  hw/intc/meson.build                                |   55 +
>  hw/intc/trace.h                                    |    1 +
>  hw/ipack/Makefile.objs                             |    2 -
>  hw/ipack/meson.build                               |    1 +
>  hw/ipmi/Makefile.objs                              |    8 -
>  hw/ipmi/meson.build                                |   11 +
>  hw/isa/Makefile.objs                               |   11 -
>  hw/isa/meson.build                                 |   11 +
>  hw/isa/trace.h                                     |    1 +
>  hw/lm32/Makefile.objs                              |    3 -
>  hw/lm32/meson.build                                |    6 +
>  hw/m68k/Makefile.objs                              |    4 -
>  hw/m68k/meson.build                                |    7 +
>  hw/mem/Kconfig                                     |    1 +
>  hw/mem/Makefile.objs                               |    3 -
>  hw/mem/meson.build                                 |    6 +
>  hw/mem/trace.h                                     |    1 +
>  hw/meson.build                                     |   67 +
>  hw/microblaze/Makefile.objs                        |    4 -
>  hw/microblaze/meson.build                          |    7 +
>  hw/mips/Makefile.objs                              |    8 -
>  hw/mips/meson.build                                |   11 +
>  hw/mips/trace.h                                    |    1 +
>  hw/misc/Makefile.objs                              |   95 --
>  hw/misc/macio/Makefile.objs                        |    5 -
>  hw/misc/macio/meson.build                          |    8 +
>  hw/misc/macio/trace.h                              |    1 +
>  hw/misc/meson.build                                |   99 ++
>  hw/misc/trace.h                                    |    1 +
>  hw/moxie/Makefile.objs                             |    2 -
>  hw/moxie/meson.build                               |    4 +
>  hw/net/Makefile.objs                               |   59 -
>  hw/net/can/Makefile.objs                           |    4 -
>  hw/net/can/meson.build                             |    4 +
>  hw/net/meson.build                                 |   67 +
>  hw/net/trace.h                                     |    1 +
>  hw/nios2/Makefile.objs                             |    3 -
>  hw/nios2/meson.build                               |    6 +
>  hw/nubus/Makefile.objs                             |    4 -
>  hw/nubus/meson.build                               |    7 +
>  hw/nvram/Makefile.objs                             |    8 -
>  hw/nvram/meson.build                               |    9 +
>  hw/nvram/trace.h                                   |    1 +
>  hw/openrisc/Makefile.objs                          |    2 -
>  hw/openrisc/meson.build                            |    5 +
>  hw/pci-bridge/Makefile.objs                        |   10 -
>  hw/pci-bridge/meson.build                          |   14 +
>  hw/pci-host/Makefile.objs                          |   24 -
>  hw/pci-host/meson.build                            |   31 +
>  hw/pci-host/trace.h                                |    1 +
>  hw/pci/Makefile.objs                               |   14 -
>  hw/pci/meson.build                                 |   19 +
>  hw/pci/trace.h                                     |    1 +
>  hw/pcmcia/Makefile.objs                            |    2 -
>  hw/pcmcia/meson.build                              |    2 +
>  hw/ppc/Makefile.objs                               |   35 -
>  hw/ppc/meson.build                                 |   80 ++
>  hw/ppc/trace.h                                     |    1 +
>  hw/rdma/Makefile.objs                              |    3 -
>  hw/rdma/meson.build                                |   10 +
>  hw/rdma/trace.h                                    |    1 +
>  hw/rdma/vmw/trace.h                                |    1 +
>  hw/riscv/Makefile.objs                             |   16 -
>  hw/riscv/meson.build                               |   19 +
>  hw/riscv/trace.h                                   |    1 +
>  hw/rtc/Makefile.objs                               |   15 -
>  hw/rtc/meson.build                                 |   16 +
>  hw/rtc/trace.h                                     |    1 +
>  hw/rx/Makefile.objs                                |    2 -
>  hw/rx/meson.build                                  |    5 +
>  hw/s390x/Makefile.objs                             |   37 -
>  hw/s390x/meson.build                               |   46 +
>  hw/s390x/trace.h                                   |    1 +
>  hw/scsi/Makefile.objs                              |   15 -
>  hw/scsi/meson.build                                |   26 +
>  hw/scsi/trace.h                                    |    1 +
>  hw/sd/Makefile.objs                                |   12 -
>  hw/sd/meson.build                                  |   12 +
>  hw/sd/trace.h                                      |    1 +
>  hw/semihosting/Makefile.objs                       |    2 -
>  hw/semihosting/meson.build                         |    4 +
>  hw/sh4/Makefile.objs                               |    4 -
>  hw/sh4/meson.build                                 |   10 +
>  hw/smbios/Makefile.objs                            |   10 -
>  hw/smbios/meson.build                              |   13 +
>  hw/sparc/Makefile.objs                             |    3 -
>  hw/sparc/meson.build                               |    6 +
>  hw/sparc/trace.h                                   |    1 +
>  hw/sparc64/Makefile.objs                           |    4 -
>  hw/sparc64/meson.build                             |    6 +
>  hw/sparc64/trace.h                                 |    1 +
>  hw/ssi/Makefile.objs                               |   10 -
>  hw/ssi/meson.build                                 |    9 +
>  hw/ssi/trace.h                                     |    1 +
>  hw/timer/Makefile.objs                             |   41 -
>  hw/timer/meson.build                               |   37 +
>  hw/timer/trace.h                                   |    1 +
>  hw/tpm/Makefile.objs                               |    6 -
>  hw/tpm/meson.build                                 |    8 +
>  hw/tpm/trace.h                                     |    1 +
>  hw/tricore/Makefile.objs                           |    1 -
>  hw/tricore/meson.build                             |    4 +
>  hw/unicore32/Makefile.objs                         |    4 -
>  hw/unicore32/meson.build                           |    5 +
>  hw/usb/Makefile.objs                               |   71 -
>  hw/usb/meson.build                                 |   69 +
>  hw/usb/trace.h                                     |    1 +
>  hw/vfio/Makefile.objs                              |    8 -
>  hw/vfio/meson.build                                |   18 +
>  hw/vfio/pci-quirks.c                               |    2 +-
>  hw/vfio/trace.h                                    |    1 +
>  hw/virtio/Makefile.objs                            |   48 -
>  hw/virtio/meson.build                              |   51 +
>  hw/virtio/trace.h                                  |    1 +
>  hw/virtio/virtio-mem.c                             |    2 +-
>  hw/watchdog/Makefile.objs                          |    7 -
>  hw/watchdog/meson.build                            |    7 +
>  hw/watchdog/trace.h                                |    1 +
>  hw/xen/Makefile.objs                               |    7 -
>  hw/xen/meson.build                                 |   20 +
>  hw/xen/trace.h                                     |    1 +
>  hw/xenpv/Makefile.objs                             |    2 -
>  hw/xenpv/meson.build                               |    3 +
>  hw/xtensa/Makefile.objs                            |    6 -
>  hw/xtensa/meson.build                              |   11 +
>  include/qemu/osdep.h                               |    2 +-
>  include/tcg/tcg.h                                  |    2 +-
>  include/user/syscall-trace.h                       |    2 +-
>  io/Makefile.objs                                   |   12 -
>  io/meson.build                                     |   25 +
>  io/trace.h                                         |    1 +
>  job-qmp.c                                          |    2 +-
>  job.c                                              |    2 +-
>  libdecnumber/Makefile.objs                         |    5 -
>  libdecnumber/meson.build                           |    7 +
>  linux-user/Makefile.objs                           |   25 -
>  linux-user/alpha/Makefile.objs                     |    5 -
>  linux-user/alpha/meson.build                       |    5 +
>  linux-user/arm/Makefile.objs                       |    8 -
>  linux-user/arm/meson.build                         |   10 +
>  linux-user/arm/nwfpe/Makefile.objs                 |    2 -
>  linux-user/arm/nwfpe/meson.build                   |   10 +
>  linux-user/hppa/Makefile.objs                      |    5 -
>  linux-user/hppa/meson.build                        |    5 +
>  linux-user/i386/Makefile.objs                      |    5 -
>  linux-user/i386/meson.build                        |    5 +
>  linux-user/i386/syscall_nr.h                       |    1 +
>  linux-user/m68k/Makefile.objs                      |    5 -
>  linux-user/m68k/meson.build                        |    5 +
>  linux-user/meson.build                             |   37 +
>  linux-user/microblaze/Makefile.objs                |    5 -
>  linux-user/microblaze/meson.build                  |    5 +
>  linux-user/mips/Makefile.objs                      |    5 -
>  linux-user/mips/meson.build                        |    5 +
>  linux-user/mips/syscall_nr.h                       |    1 +
>  linux-user/mips64/Makefile.objs                    |   12 -
>  linux-user/mips64/meson.build                      |    6 +
>  linux-user/mips64/syscall_nr.h                     |    7 +
>  linux-user/ppc/Makefile.objs                       |    6 -
>  linux-user/ppc/meson.build                         |    5 +
>  linux-user/s390x/Makefile.objs                     |    5 -
>  linux-user/s390x/meson.build                       |    5 +
>  linux-user/sh4/Makefile.objs                       |    5 -
>  linux-user/sh4/meson.build                         |    5 +
>  linux-user/sparc/Makefile.objs                     |    5 -
>  linux-user/sparc/meson.build                       |    5 +
>  linux-user/sparc64/Makefile.objs                   |    5 -
>  linux-user/sparc64/meson.build                     |    5 +
>  linux-user/trace.h                                 |    1 +
>  linux-user/x86_64/Makefile.objs                    |    5 -
>  linux-user/x86_64/meson.build                      |    5 +
>  linux-user/x86_64/syscall_nr.h                     |    1 +
>  linux-user/xtensa/Makefile.objs                    |    5 -
>  linux-user/xtensa/meson.build                      |    5 +
>  memory_ldst.inc.c => memory_ldst.inc               |    0
>  meson                                              |    1 +
>  meson.build                                        | 1436 ++++++++++++++++++++
>  meson_options.txt                                  |    6 +
>  migration/Makefile.objs                            |   18 -
>  migration/meson.build                              |   40 +
>  migration/trace.h                                  |    1 +
>  monitor/Makefile.objs                              |    6 -
>  monitor/meson.build                                |    9 +
>  monitor/trace.h                                    |    1 +
>  nbd/Makefile.objs                                  |    1 -
>  nbd/meson.build                                    |    5 +
>  nbd/trace.h                                        |    1 +
>  net/Makefile.objs                                  |   32 -
>  net/can/Makefile.objs                              |    2 -
>  net/can/meson.build                                |    5 +
>  net/meson.build                                    |   40 +
>  net/trace.h                                        |    1 +
>  os-posix.c                                         |    2 +-
>  pc-bios/descriptors/meson.build                    |   14 +
>  pc-bios/meson.build                                |   27 +
>  pc-bios/optionrom/Makefile                         |   67 +-
>  pc-bios/s390-ccw/Makefile                          |   18 +-
>  plugins/Makefile.objs                              |   21 -
>  plugins/meson.build                                |   13 +
>  po/LINGUAS                                         |    7 +
>  po/Makefile                                        |   52 -
>  po/POTFILES                                        |    1 +
>  po/meson.build                                     |    5 +
>  po/messages.po                                     |   74 -
>  qapi/Makefile.objs                                 |   38 -
>  qapi/meson.build                                   |  124 ++
>  qapi/trace.h                                       |    1 +
>  qga/Makefile.objs                                  |   10 -
>  qga/installer/qemu-ga.wxs                          |    2 +-
>  qga/meson.build                                    |   87 ++
>  qga/vss-win32/Makefile.objs                        |   23 -
>  qga/vss-win32/meson.build                          |   36 +
>  qobject/Makefile.objs                              |    3 -
>  qobject/meson.build                                |    3 +
>  qom/Makefile.objs                                  |    5 -
>  qom/meson.build                                    |   18 +
>  qom/trace.h                                        |    1 +
>  replay/Makefile.objs                               |   10 -
>  replay/meson.build                                 |   12 +
>  rules.mak                                          |  314 +----
>  scripts/archive-source.sh                          |    3 +-
>  scripts/check_sparse.py                            |   25 +
>  scripts/clean-includes                             |    2 +-
>  scripts/create_config                              |  129 --
>  scripts/decodetree.py                              |    2 +-
>  scripts/device-crash-test                          |    2 +-
>  scripts/feature_to_c.sh                            |   24 +-
>  scripts/grepy.sh                                   |    3 +
>  scripts/hxtool                                     |    2 +-
>  scripts/minikconf.py                               |    0
>  scripts/mtest2make.py                              |  102 ++
>  scripts/ninjatool.py                               | 1010 ++++++++++++++
>  scripts/oss-fuzz/build.sh                          |   32 +-
>  scripts/qapi-gen.py                                |    0
>  scripts/qemu-version.sh                            |   25 +
>  scripts/tracetool.py                               |    0
>  scripts/tracetool/backend/dtrace.py                |    2 +-
>  scripts/tracetool/backend/ust.py                   |    6 +-
>  scripts/tracetool/format/c.py                      |    5 +-
>  scripts/tracetool/format/tcg_h.py                  |    2 +-
>  scripts/tracetool/format/tcg_helper_c.py           |    2 +-
>  scripts/undefsym.sh                                |   20 +
>  scsi/Makefile.objs                                 |    4 -
>  scsi/meson.build                                   |    4 +
>  scsi/trace.h                                       |    1 +
>  softmmu/Makefile.objs                              |   14 -
>  softmmu/balloon.c                                  |    2 +-
>  softmmu/ioport.c                                   |    2 +-
>  softmmu/memory.c                                   |    2 +-
>  softmmu/meson.build                                |   10 +
>  softmmu/qtest.c                                    |    2 +-
>  softmmu/vl.c                                       |    2 +-
>  storage-daemon/Makefile.objs                       |    1 -
>  storage-daemon/meson.build                         |   14 +
>  storage-daemon/qapi/Makefile.objs                  |    1 -
>  storage-daemon/qapi/meson.build                    |    7 +
>  .../qemu-storage-daemon.c                          |    0
>  stubs/Makefile.objs                                |   56 -
>  stubs/meson.build                                  |   50 +
>  target/alpha/Makefile.objs                         |    4 -
>  target/alpha/meson.build                           |   18 +
>  target/arm/Makefile.objs                           |   89 --
>  target/arm/meson.build                             |   62 +
>  target/arm/trace.h                                 |    1 +
>  .../{translate-neon.inc.c => translate-neon.inc}   |    6 +-
>  target/arm/translate-sve.c                         |    2 +-
>  .../arm/{translate-vfp.inc.c => translate-vfp.inc} |    4 +-
>  target/arm/translate.c                             |   12 +-
>  target/avr/Makefile.objs                           |   34 -
>  target/avr/disas.c                                 |    2 +-
>  target/avr/meson.build                             |   20 +
>  target/avr/translate.c                             |    2 +-
>  target/cris/Makefile.objs                          |    3 -
>  target/cris/meson.build                            |   14 +
>  target/cris/translate.c                            |    2 +-
>  .../{translate_v10.inc.c => translate_v10.inc}     |    0
>  target/hppa/Makefile.objs                          |   11 -
>  target/hppa/meson.build                            |   19 +
>  target/hppa/trace.h                                |    1 +
>  target/hppa/translate.c                            |    2 +-
>  target/i386/Makefile.objs                          |   23 -
>  target/i386/hvf/Makefile.objs                      |    2 -
>  target/i386/hvf/meson.build                        |   12 +
>  target/i386/meson.build                            |   40 +
>  target/i386/trace.h                                |    1 +
>  target/lm32/Makefile.objs                          |    4 -
>  target/lm32/meson.build                            |   15 +
>  target/m68k/Makefile.objs                          |    5 -
>  target/m68k/meson.build                            |   17 +
>  target/meson.build                                 |   23 +
>  target/microblaze/Makefile.objs                    |    3 -
>  target/microblaze/meson.build                      |   14 +
>  target/mips/Makefile.objs                          |    6 -
>  target/mips/meson.build                            |   24 +
>  target/mips/trace.h                                |    1 +
>  target/mips/translate.c                            |    2 +-
>  .../{translate_init.inc.c => translate_init.inc}   |    0
>  target/moxie/Makefile.objs                         |    2 -
>  target/moxie/meson.build                           |   14 +
>  target/nios2/Makefile.objs                         |    4 -
>  target/nios2/meson.build                           |   15 +
>  target/openrisc/Makefile.objs                      |   15 -
>  target/openrisc/disas.c                            |    2 +-
>  target/openrisc/meson.build                        |   23 +
>  target/openrisc/translate.c                        |    2 +-
>  target/ppc/Makefile.objs                           |   20 -
>  target/ppc/int_helper.c                            |    2 +-
>  target/ppc/meson.build                             |   37 +
>  target/ppc/{mfrom_table.inc.c => mfrom_table.inc}  |    0
>  target/ppc/trace.h                                 |    1 +
>  target/ppc/translate.c                             |   22 +-
>  .../ppc/translate/{dfp-impl.inc.c => dfp-impl.inc} |    0
>  .../ppc/translate/{dfp-ops.inc.c => dfp-ops.inc}   |    0
>  .../ppc/translate/{fp-impl.inc.c => fp-impl.inc}   |    0
>  target/ppc/translate/{fp-ops.inc.c => fp-ops.inc}  |    0
>  .../ppc/translate/{spe-impl.inc.c => spe-impl.inc} |    0
>  .../ppc/translate/{spe-ops.inc.c => spe-ops.inc}   |    0
>  .../ppc/translate/{vmx-impl.inc.c => vmx-impl.inc} |    0
>  .../ppc/translate/{vmx-ops.inc.c => vmx-ops.inc}   |    0
>  .../ppc/translate/{vsx-impl.inc.c => vsx-impl.inc} |    0
>  .../ppc/translate/{vsx-ops.inc.c => vsx-ops.inc}   |    0
>  .../{translate_init.inc.c => translate_init.inc}   |    0
>  target/riscv/Makefile.objs                         |   28 -
>  ...trans_privileged.inc.c => trans_privileged.inc} |    0
>  .../insn_trans/{trans_rva.inc.c => trans_rva.inc}  |    0
>  .../insn_trans/{trans_rvd.inc.c => trans_rvd.inc}  |    0
>  .../insn_trans/{trans_rvf.inc.c => trans_rvf.inc}  |    0
>  .../insn_trans/{trans_rvh.inc.c => trans_rvh.inc}  |    0
>  .../insn_trans/{trans_rvi.inc.c => trans_rvi.inc}  |    0
>  .../insn_trans/{trans_rvm.inc.c => trans_rvm.inc}  |    0
>  .../insn_trans/{trans_rvv.inc.c => trans_rvv.inc}  |    0
>  target/riscv/meson.build                           |   34 +
>  target/riscv/trace.h                               |    1 +
>  target/riscv/translate.c                           |   20 +-
>  target/rx/Makefile.objs                            |   11 -
>  target/rx/disas.c                                  |    2 +-
>  target/rx/meson.build                              |   16 +
>  target/rx/translate.c                              |    2 +-
>  target/s390x/Makefile.objs                         |   30 -
>  target/s390x/cpu_features.h                        |    2 +-
>  target/s390x/cpu_models.h                          |    2 +-
>  target/s390x/meson.build                           |   49 +
>  target/s390x/trace.h                               |    1 +
>  target/s390x/translate.c                           |    2 +-
>  .../s390x/{translate_vx.inc.c => translate_vx.inc} |    0
>  target/sh4/Makefile.objs                           |    3 -
>  target/sh4/meson.build                             |   14 +
>  target/sparc/Makefile.objs                         |    7 -
>  target/sparc/meson.build                           |   23 +
>  target/sparc/trace.h                               |    1 +
>  target/tilegx/Makefile.objs                        |    1 -
>  target/tilegx/meson.build                          |   13 +
>  target/tricore/Makefile.objs                       |    1 -
>  target/tricore/meson.build                         |   15 +
>  target/unicore32/Makefile.objs                     |    8 -
>  target/unicore32/meson.build                       |   14 +
>  target/xtensa/Makefile.objs                        |   16 -
>  target/xtensa/core-dc232b.c                        |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-dc233c.c                        |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-de212.c                         |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-fsf.c                           |    2 +-
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-sample_controller.c             |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-test_kc705_be.c                 |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/core-test_mmuhifi_c3.c               |    4 +-
>  .../{gdb-config.inc.c => gdb-config.inc}           |    0
>  .../{xtensa-modules.inc.c => xtensa-modules.inc}   |    0
>  target/xtensa/import_core.sh                       |    8 +-
>  target/xtensa/meson.build                          |   30 +
>  tcg/README                                         |    2 +-
>  tcg/aarch64/{tcg-target.inc.c => tcg-target.inc}   |    4 +-
>  tcg/arm/{tcg-target.inc.c => tcg-target.inc}       |    4 +-
>  tcg/i386/{tcg-target.inc.c => tcg-target.inc}      |    4 +-
>  tcg/mips/{tcg-target.inc.c => tcg-target.inc}      |    2 +-
>  tcg/ppc/{tcg-target.inc.c => tcg-target.inc}       |    4 +-
>  tcg/riscv/{tcg-target.inc.c => tcg-target.inc}     |    4 +-
>  tcg/s390/{tcg-target.inc.c => tcg-target.inc}      |    4 +-
>  tcg/sparc/{tcg-target.inc.c => tcg-target.inc}     |    2 +-
>  tcg/{tcg-ldst.inc.c => tcg-ldst.inc}               |    0
>  tcg/{tcg-pool.inc.c => tcg-pool.inc}               |    2 +-
>  tcg/tcg.c                                          |    6 +-
>  tcg/tci/README                                     |    4 +-
>  tcg/tci/{tcg-target.inc.c => tcg-target.inc}       |    0
>  tests/Makefile.include                             |  468 +------
>  tests/acceptance/avocado_qemu/__init__.py          |    3 +-
>  tests/acceptance/boot_linux_console.py             |    6 +-
>  tests/data/acpi/rebuild-expected-aml.sh            |    2 +-
>  tests/docker/test-static                           |   24 +
>  tests/fp/Makefile                                  |  600 --------
>  tests/fp/fp-test.c                                 |    2 +-
>  tests/fp/meson.build                               |  636 +++++++++
>  tests/fp/{wrap.inc.c => wrap.inc}                  |    0
>  tests/meson.build                                  |   18 +
>  tests/multiboot/run_test.sh                        |    2 +-
>  tests/plugin/Makefile                              |   46 -
>  tests/plugin/meson.build                           |    7 +
>  tests/qapi-schema/meson.build                      |  216 +++
>  tests/qemu-iotests/check                           |    6 +-
>  tests/qemu-iotests/meson.build                     |   10 +
>  tests/qtest/Makefile.include                       |  332 -----
>  tests/qtest/ac97-test.c                            |    2 +-
>  tests/qtest/acpi-utils.h                           |    2 +-
>  tests/qtest/ahci-test.c                            |    2 +-
>  tests/qtest/arm-cpu-features.c                     |    2 +-
>  tests/qtest/bios-tables-test.c                     |    2 +-
>  tests/qtest/boot-order-test.c                      |    2 +-
>  tests/qtest/boot-sector.c                          |    2 +-
>  tests/qtest/boot-sector.h                          |    2 +-
>  tests/qtest/boot-serial-test.c                     |    2 +-
>  tests/qtest/cdrom-test.c                           |    2 +-
>  tests/qtest/dbus-vmstate-test.c                    |    2 +-
>  tests/qtest/device-introspect-test.c               |    2 +-
>  tests/qtest/device-plug-test.c                     |    2 +-
>  tests/qtest/drive_del-test.c                       |    2 +-
>  tests/qtest/ds1338-test.c                          |    2 +-
>  tests/qtest/e1000-test.c                           |    2 +-
>  tests/qtest/eepro100-test.c                        |    2 +-
>  tests/qtest/endianness-test.c                      |    2 +-
>  tests/qtest/es1370-test.c                          |    2 +-
>  tests/qtest/fuzz/Makefile.include                  |   39 -
>  tests/qtest/fuzz/fuzz.c                            |    2 +-
>  tests/qtest/fuzz/fuzz.h                            |    2 +-
>  tests/qtest/fuzz/i440fx_fuzz.c                     |    6 +-
>  tests/qtest/fuzz/meson.build                       |   35 +
>  tests/qtest/fuzz/qos_fuzz.c                        |    2 +-
>  tests/qtest/fuzz/qtest_wrappers.c                  |    2 +-
>  tests/qtest/fuzz/virtio_net_fuzz.c                 |    5 +-
>  tests/qtest/fuzz/virtio_scsi_fuzz.c                |    8 +-
>  tests/qtest/fw_cfg-test.c                          |    2 +-
>  tests/qtest/hd-geo-test.c                          |    2 +-
>  tests/qtest/hexloader-test.c                       |    2 +-
>  tests/qtest/ide-test.c                             |    2 +-
>  tests/qtest/ipoctal232-test.c                      |    2 +-
>  tests/qtest/ivshmem-test.c                         |    2 +-
>  tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c   |    4 +-
>  tests/qtest/libqos/ahci.c                          |    6 +-
>  tests/qtest/libqos/ahci.h                          |    6 +-
>  tests/qtest/libqos/arm-imx25-pdk-machine.c         |    6 +-
>  tests/qtest/libqos/arm-n800-machine.c              |    6 +-
>  tests/qtest/libqos/arm-raspi2-machine.c            |    4 +-
>  tests/qtest/libqos/arm-sabrelite-machine.c         |    4 +-
>  tests/qtest/libqos/arm-smdkc210-machine.c          |    4 +-
>  tests/qtest/libqos/arm-virt-machine.c              |    6 +-
>  tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c    |    4 +-
>  tests/qtest/libqos/e1000e.c                        |    6 +-
>  tests/qtest/libqos/e1000e.h                        |    2 +-
>  tests/qtest/libqos/fw_cfg.c                        |    2 +-
>  tests/qtest/libqos/i2c-imx.c                       |    2 +-
>  tests/qtest/libqos/i2c-omap.c                      |    2 +-
>  tests/qtest/libqos/i2c.c                           |    2 +-
>  tests/qtest/libqos/i2c.h                           |    2 +-
>  tests/qtest/libqos/libqos-pc.c                     |    6 +-
>  tests/qtest/libqos/libqos-pc.h                     |    2 +-
>  tests/qtest/libqos/libqos-spapr.c                  |    6 +-
>  tests/qtest/libqos/libqos-spapr.h                  |    2 +-
>  tests/qtest/libqos/libqos.c                        |    4 +-
>  tests/qtest/libqos/libqos.h                        |    4 +-
>  tests/qtest/{ => libqos}/libqtest.h                |    0
>  tests/qtest/libqos/malloc-pc.c                     |    4 +-
>  tests/qtest/libqos/malloc-pc.h                     |    2 +-
>  tests/qtest/libqos/malloc-spapr.c                  |    2 +-
>  tests/qtest/libqos/malloc-spapr.h                  |    2 +-
>  tests/qtest/libqos/malloc.c                        |    2 +-
>  tests/qtest/libqos/meson.build                     |   57 +
>  tests/qtest/libqos/pci-pc.c                        |    2 +-
>  tests/qtest/libqos/pci-pc.h                        |    6 +-
>  tests/qtest/libqos/pci-spapr.c                     |    6 +-
>  tests/qtest/libqos/pci-spapr.h                     |    6 +-
>  tests/qtest/libqos/pci.c                           |    4 +-
>  tests/qtest/libqos/pci.h                           |    2 +-
>  tests/qtest/libqos/ppc64_pseries-machine.c         |    4 +-
>  tests/qtest/libqos/qgraph.c                        |    4 +-
>  tests/qtest/libqos/qgraph.h                        |    8 +-
>  tests/qtest/libqos/qgraph_internal.h               |    4 +-
>  tests/qtest/libqos/qos_external.c                  |    8 +-
>  tests/qtest/libqos/qos_external.h                  |    4 +-
>  tests/qtest/libqos/rtas.c                          |    2 +-
>  tests/qtest/libqos/rtas.h                          |    2 +-
>  tests/qtest/libqos/sdhci.c                         |    2 +-
>  tests/qtest/libqos/sdhci.h                         |    2 +-
>  tests/qtest/libqos/tpci200.c                       |    4 +-
>  tests/qtest/libqos/usb.c                           |    2 +-
>  tests/qtest/libqos/usb.h                           |    2 +-
>  tests/qtest/libqos/virtio-9p.c                     |    4 +-
>  tests/qtest/libqos/virtio-9p.h                     |    6 +-
>  tests/qtest/libqos/virtio-balloon.c                |    4 +-
>  tests/qtest/libqos/virtio-balloon.h                |    6 +-
>  tests/qtest/libqos/virtio-blk.c                    |    4 +-
>  tests/qtest/libqos/virtio-blk.h                    |    6 +-
>  tests/qtest/libqos/virtio-mmio.c                   |    8 +-
>  tests/qtest/libqos/virtio-mmio.h                   |    4 +-
>  tests/qtest/libqos/virtio-net.c                    |    4 +-
>  tests/qtest/libqos/virtio-net.h                    |    6 +-
>  tests/qtest/libqos/virtio-pci.c                    |   14 +-
>  tests/qtest/libqos/virtio-pci.h                    |    6 +-
>  tests/qtest/libqos/virtio-rng.c                    |    4 +-
>  tests/qtest/libqos/virtio-rng.h                    |    6 +-
>  tests/qtest/libqos/virtio-scsi.c                   |    4 +-
>  tests/qtest/libqos/virtio-scsi.h                   |    6 +-
>  tests/qtest/libqos/virtio-serial.c                 |    4 +-
>  tests/qtest/libqos/virtio-serial.h                 |    6 +-
>  tests/qtest/libqos/virtio.c                        |    2 +-
>  tests/qtest/libqos/virtio.h                        |    2 +-
>  tests/qtest/libqos/x86_64_pc-machine.c             |    2 +-
>  tests/qtest/libqtest-single.h                      |    2 +-
>  tests/qtest/libqtest.c                             |    2 +-
>  tests/qtest/m48t59-test.c                          |    2 +-
>  tests/qtest/machine-none-test.c                    |    2 +-
>  tests/qtest/megasas-test.c                         |    2 +-
>  tests/qtest/meson.build                            |  257 ++++
>  tests/qtest/microbit-test.c                        |    2 +-
>  tests/qtest/migration-helpers.h                    |    2 +-
>  tests/qtest/migration-test.c                       |    4 +-
>  tests/qtest/modules-test.c                         |    2 +-
>  tests/qtest/ne2000-test.c                          |    2 +-
>  tests/qtest/numa-test.c                            |    2 +-
>  tests/qtest/nvme-test.c                            |    2 +-
>  tests/qtest/pca9552-test.c                         |    2 +-
>  tests/qtest/pci-test.c                             |    2 +-
>  tests/qtest/pcnet-test.c                           |    2 +-
>  tests/qtest/pflash-cfi02-test.c                    |    2 +-
>  tests/qtest/pnv-xscom-test.c                       |    2 +-
>  tests/qtest/prom-env-test.c                        |    2 +-
>  tests/qtest/pvpanic-test.c                         |    2 +-
>  tests/qtest/pxe-test.c                             |    2 +-
>  tests/qtest/q35-test.c                             |    2 +-
>  tests/qtest/qmp-cmd-test.c                         |    2 +-
>  tests/qtest/qmp-test.c                             |    2 +-
>  tests/qtest/qom-test.c                             |    2 +-
>  tests/qtest/rtas-test.c                            |    4 +-
>  tests/qtest/sdhci-test.c                           |    2 +-
>  tests/qtest/spapr-phb-test.c                       |    2 +-
>  tests/qtest/tco-test.c                             |    2 +-
>  tests/qtest/test-filter-mirror.c                   |    2 +-
>  tests/qtest/test-filter-redirector.c               |    2 +-
>  tests/qtest/test-hmp.c                             |    2 +-
>  tests/qtest/tpm-crb-swtpm-test.c                   |    2 +-
>  tests/qtest/tpm-tis-device-swtpm-test.c            |    2 +-
>  tests/qtest/tpm-tis-swtpm-test.c                   |    2 +-
>  tests/qtest/tpm-util.c                             |    2 +-
>  tests/qtest/tulip-test.c                           |    2 +-
>  tests/qtest/virtio-rng-test.c                      |    2 +-
>  tests/qtest/virtio-test.c                          |    2 +-
>  tests/qtest/vmgenid-test.c                         |    2 +-
>  tests/qtest/vmxnet3-test.c                         |    2 +-
>  tests/qtest/wdt_ib700-test.c                       |    2 +-
>  tests/tcg/configure.sh                             |    4 +-
>  tests/test-qga.c                                   |   10 +-
>  tests/test-qgraph.c                                |    5 +-
>  tests/vm/Makefile.include                          |    6 +-
>  tests/vm/freebsd                                   |    1 +
>  tests/vm/netbsd                                    |    1 +
>  tests/vm/openbsd                                   |    1 +
>  tools/meson.build                                  |   10 +
>  tools/virtiofsd/Makefile.objs                      |   12 -
>  tools/virtiofsd/meson.build                        |   19 +
>  tools/virtiofsd/passthrough_ll.c                   |    2 +-
>  .../virtiofsd/{seccomp.c => passthrough_seccomp.c} |    2 +-
>  .../virtiofsd/{seccomp.h => passthrough_seccomp.h} |    0
>  trace/Makefile.objs                                |   59 -
>  trace/control-target.c                             |    2 +-
>  trace/control.c                                    |    2 +-
>  trace/meson.build                                  |   93 ++
>  ui/Makefile.objs                                   |   73 -
>  ui/input-keymap.c                                  |   34 +-
>  ui/meson.build                                     |  115 ++
>  ui/shader.c                                        |    6 +-
>  ui/shader/meson.build                              |   15 +
>  ui/trace.h                                         |    1 +
>  ui/vnc-enc-zrle.c                                  |   22 +-
>  ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc}        |    0
>  util/Makefile.objs                                 |   83 --
>  util/meson.build                                   |   65 +
>  util/trace.h                                       |    1 +
>  version.texi.in                                    |    2 +
>  749 files changed, 8622 insertions(+), 7202 deletions(-)
>  delete mode 100644 Makefile.target
>  delete mode 100644 accel/Makefile.objs
>  delete mode 100644 accel/kvm/Makefile.objs
>  create mode 100644 accel/kvm/meson.build
>  create mode 100644 accel/kvm/trace.h
>  create mode 100644 accel/meson.build
>  delete mode 100644 accel/stubs/Makefile.objs
>  create mode 100644 accel/stubs/meson.build
>  delete mode 100644 accel/tcg/Makefile.objs
>  rename accel/tcg/{atomic_common.inc.c => atomic_common.inc} (100%)
>  create mode 100644 accel/tcg/meson.build
>  create mode 100644 accel/tcg/trace.h
>  delete mode 100644 accel/xen/Makefile.objs
>  create mode 100644 accel/xen/meson.build
>  delete mode 100644 audio/Makefile.objs
>  create mode 100644 audio/meson.build
>  create mode 100644 audio/trace.h
>  delete mode 100644 authz/Makefile.objs
>  create mode 100644 authz/meson.build
>  create mode 100644 authz/trace.h
>  delete mode 100644 backends/Makefile.objs
>  create mode 100644 backends/meson.build
>  delete mode 100644 backends/tpm/Makefile.objs
>  create mode 100644 backends/tpm/meson.build
>  create mode 100644 backends/tpm/trace.h
>  create mode 100644 backends/trace.h
>  delete mode 100644 block/Makefile.objs
>  create mode 100644 block/meson.build
>  delete mode 100644 block/monitor/Makefile.objs
>  create mode 100644 block/monitor/meson.build
>  create mode 100644 block/trace.h
>  delete mode 100644 bsd-user/Makefile.objs
>  create mode 100644 bsd-user/meson.build
>  delete mode 100644 chardev/Makefile.objs
>  create mode 100644 chardev/meson.build
>  create mode 100644 chardev/trace.h
>  delete mode 100644 contrib/elf2dmp/Makefile.objs
>  create mode 100644 contrib/elf2dmp/meson.build
>  delete mode 100644 contrib/ivshmem-client/Makefile.objs
>  create mode 100644 contrib/ivshmem-client/meson.build
>  delete mode 100644 contrib/ivshmem-server/Makefile.objs
>  create mode 100644 contrib/ivshmem-server/meson.build
>  delete mode 100644 contrib/libvhost-user/Makefile.objs
>  create mode 100644 contrib/libvhost-user/meson.build
>  delete mode 100644 contrib/rdmacm-mux/Makefile.objs
>  create mode 100644 contrib/rdmacm-mux/meson.build
>  delete mode 100644 contrib/vhost-user-blk/Makefile.objs
>  create mode 100644 contrib/vhost-user-blk/meson.build
>  delete mode 100644 contrib/vhost-user-gpu/Makefile.objs
>  create mode 100644 contrib/vhost-user-gpu/meson.build
>  delete mode 100644 contrib/vhost-user-input/Makefile.objs
>  create mode 100644 contrib/vhost-user-input/meson.build
>  delete mode 100644 contrib/vhost-user-scsi/Makefile.objs
>  create mode 100644 contrib/vhost-user-scsi/meson.build
>  delete mode 100644 crypto/Makefile.objs
>  create mode 100644 crypto/meson.build
>  create mode 100644 crypto/trace.h
>  delete mode 100644 disas/Makefile.objs
>  delete mode 100644 disas/libvixl/Makefile.objs
>  create mode 100644 disas/libvixl/meson.build
>  create mode 100644 disas/meson.build
>  create mode 100644 docs/meson.build
>  delete mode 100644 dump/Makefile.objs
>  create mode 100644 dump/meson.build
>  rename fpu/{softfloat-specialize.inc.c => softfloat-specialize.inc} (100%)
>  delete mode 100644 fsdev/Makefile.objs
>  create mode 100644 fsdev/meson.build
>  delete mode 100644 hw/9pfs/Makefile.objs
>  create mode 100644 hw/9pfs/meson.build
>  create mode 100644 hw/9pfs/trace.h
>  delete mode 100644 hw/Makefile.objs
>  delete mode 100644 hw/acpi/Makefile.objs
>  create mode 100644 hw/acpi/meson.build
>  create mode 100644 hw/acpi/trace.h
>  delete mode 100644 hw/adc/Makefile.objs
>  create mode 100644 hw/adc/meson.build
>  delete mode 100644 hw/alpha/Makefile.objs
>  create mode 100644 hw/alpha/meson.build
>  create mode 100644 hw/alpha/trace.h
>  delete mode 100644 hw/arm/Makefile.objs
>  create mode 100644 hw/arm/meson.build
>  create mode 100644 hw/arm/trace.h
>  delete mode 100644 hw/audio/Makefile.objs
>  create mode 100644 hw/audio/meson.build
>  create mode 100644 hw/audio/trace.h
>  delete mode 100644 hw/avr/Makefile.objs
>  create mode 100644 hw/avr/meson.build
>  delete mode 100644 hw/block/Makefile.objs
>  delete mode 100644 hw/block/dataplane/Makefile.objs
>  create mode 100644 hw/block/dataplane/meson.build
>  create mode 100644 hw/block/dataplane/trace.h
>  create mode 100644 hw/block/meson.build
>  create mode 100644 hw/block/trace.h
>  delete mode 100644 hw/char/Makefile.objs
>  create mode 100644 hw/char/meson.build
>  create mode 100644 hw/char/trace.h
>  delete mode 100644 hw/core/Makefile.objs
>  create mode 100644 hw/core/meson.build
>  create mode 100644 hw/core/trace.h
>  delete mode 100644 hw/cpu/Makefile.objs
>  create mode 100644 hw/cpu/meson.build
>  delete mode 100644 hw/cris/Makefile.objs
>  create mode 100644 hw/cris/meson.build
>  delete mode 100644 hw/display/Makefile.objs
>  create mode 100644 hw/display/meson.build
>  create mode 100644 hw/display/trace.h
>  delete mode 100644 hw/dma/Makefile.objs
>  create mode 100644 hw/dma/meson.build
>  create mode 100644 hw/dma/trace.h
>  delete mode 100644 hw/gpio/Makefile.objs
>  create mode 100644 hw/gpio/meson.build
>  create mode 100644 hw/gpio/trace.h
>  delete mode 100644 hw/hppa/Makefile.objs
>  create mode 100644 hw/hppa/meson.build
>  create mode 100644 hw/hppa/trace.h
>  delete mode 100644 hw/hyperv/Makefile.objs
>  create mode 100644 hw/hyperv/meson.build
>  create mode 100644 hw/hyperv/trace.h
>  delete mode 100644 hw/i2c/Makefile.objs
>  create mode 100644 hw/i2c/meson.build
>  create mode 100644 hw/i2c/trace.h
>  delete mode 100644 hw/i386/Makefile.objs
>  delete mode 100644 hw/i386/kvm/Makefile.objs
>  create mode 100644 hw/i386/kvm/meson.build
>  create mode 100644 hw/i386/meson.build
>  create mode 100644 hw/i386/trace.h
>  delete mode 100644 hw/i386/xen/Makefile.objs
>  create mode 100644 hw/i386/xen/meson.build
>  create mode 100644 hw/i386/xen/trace.h
>  delete mode 100644 hw/ide/Makefile.objs
>  create mode 100644 hw/ide/meson.build
>  create mode 100644 hw/ide/trace.h
>  delete mode 100644 hw/input/Makefile.objs
>  create mode 100644 hw/input/meson.build
>  create mode 100644 hw/input/trace.h
>  delete mode 100644 hw/intc/Makefile.objs
>  create mode 100644 hw/intc/meson.build
>  create mode 100644 hw/intc/trace.h
>  delete mode 100644 hw/ipack/Makefile.objs
>  create mode 100644 hw/ipack/meson.build
>  delete mode 100644 hw/ipmi/Makefile.objs
>  create mode 100644 hw/ipmi/meson.build
>  delete mode 100644 hw/isa/Makefile.objs
>  create mode 100644 hw/isa/meson.build
>  create mode 100644 hw/isa/trace.h
>  delete mode 100644 hw/lm32/Makefile.objs
>  create mode 100644 hw/lm32/meson.build
>  delete mode 100644 hw/m68k/Makefile.objs
>  create mode 100644 hw/m68k/meson.build
>  delete mode 100644 hw/mem/Makefile.objs
>  create mode 100644 hw/mem/meson.build
>  create mode 100644 hw/mem/trace.h
>  create mode 100644 hw/meson.build
>  delete mode 100644 hw/microblaze/Makefile.objs
>  create mode 100644 hw/microblaze/meson.build
>  delete mode 100644 hw/mips/Makefile.objs
>  create mode 100644 hw/mips/meson.build
>  create mode 100644 hw/mips/trace.h
>  delete mode 100644 hw/misc/Makefile.objs
>  delete mode 100644 hw/misc/macio/Makefile.objs
>  create mode 100644 hw/misc/macio/meson.build
>  create mode 100644 hw/misc/macio/trace.h
>  create mode 100644 hw/misc/meson.build
>  create mode 100644 hw/misc/trace.h
>  delete mode 100644 hw/moxie/Makefile.objs
>  create mode 100644 hw/moxie/meson.build
>  delete mode 100644 hw/net/Makefile.objs
>  delete mode 100644 hw/net/can/Makefile.objs
>  create mode 100644 hw/net/can/meson.build
>  create mode 100644 hw/net/meson.build
>  create mode 100644 hw/net/trace.h
>  delete mode 100644 hw/nios2/Makefile.objs
>  create mode 100644 hw/nios2/meson.build
>  delete mode 100644 hw/nubus/Makefile.objs
>  create mode 100644 hw/nubus/meson.build
>  delete mode 100644 hw/nvram/Makefile.objs
>  create mode 100644 hw/nvram/meson.build
>  create mode 100644 hw/nvram/trace.h
>  delete mode 100644 hw/openrisc/Makefile.objs
>  create mode 100644 hw/openrisc/meson.build
>  delete mode 100644 hw/pci-bridge/Makefile.objs
>  create mode 100644 hw/pci-bridge/meson.build
>  delete mode 100644 hw/pci-host/Makefile.objs
>  create mode 100644 hw/pci-host/meson.build
>  create mode 100644 hw/pci-host/trace.h
>  delete mode 100644 hw/pci/Makefile.objs
>  create mode 100644 hw/pci/meson.build
>  create mode 100644 hw/pci/trace.h
>  delete mode 100644 hw/pcmcia/Makefile.objs
>  create mode 100644 hw/pcmcia/meson.build
>  delete mode 100644 hw/ppc/Makefile.objs
>  create mode 100644 hw/ppc/meson.build
>  create mode 100644 hw/ppc/trace.h
>  delete mode 100644 hw/rdma/Makefile.objs
>  create mode 100644 hw/rdma/meson.build
>  create mode 100644 hw/rdma/trace.h
>  create mode 100644 hw/rdma/vmw/trace.h
>  delete mode 100644 hw/riscv/Makefile.objs
>  create mode 100644 hw/riscv/meson.build
>  create mode 100644 hw/riscv/trace.h
>  delete mode 100644 hw/rtc/Makefile.objs
>  create mode 100644 hw/rtc/meson.build
>  create mode 100644 hw/rtc/trace.h
>  delete mode 100644 hw/rx/Makefile.objs
>  create mode 100644 hw/rx/meson.build
>  delete mode 100644 hw/s390x/Makefile.objs
>  create mode 100644 hw/s390x/meson.build
>  create mode 100644 hw/s390x/trace.h
>  delete mode 100644 hw/scsi/Makefile.objs
>  create mode 100644 hw/scsi/meson.build
>  create mode 100644 hw/scsi/trace.h
>  delete mode 100644 hw/sd/Makefile.objs
>  create mode 100644 hw/sd/meson.build
>  create mode 100644 hw/sd/trace.h
>  delete mode 100644 hw/semihosting/Makefile.objs
>  create mode 100644 hw/semihosting/meson.build
>  delete mode 100644 hw/sh4/Makefile.objs
>  create mode 100644 hw/sh4/meson.build
>  delete mode 100644 hw/smbios/Makefile.objs
>  create mode 100644 hw/smbios/meson.build
>  delete mode 100644 hw/sparc/Makefile.objs
>  create mode 100644 hw/sparc/meson.build
>  create mode 100644 hw/sparc/trace.h
>  delete mode 100644 hw/sparc64/Makefile.objs
>  create mode 100644 hw/sparc64/meson.build
>  create mode 100644 hw/sparc64/trace.h
>  delete mode 100644 hw/ssi/Makefile.objs
>  create mode 100644 hw/ssi/meson.build
>  create mode 100644 hw/ssi/trace.h
>  delete mode 100644 hw/timer/Makefile.objs
>  create mode 100644 hw/timer/meson.build
>  create mode 100644 hw/timer/trace.h
>  delete mode 100644 hw/tpm/Makefile.objs
>  create mode 100644 hw/tpm/meson.build
>  create mode 100644 hw/tpm/trace.h
>  delete mode 100644 hw/tricore/Makefile.objs
>  create mode 100644 hw/tricore/meson.build
>  delete mode 100644 hw/unicore32/Makefile.objs
>  create mode 100644 hw/unicore32/meson.build
>  delete mode 100644 hw/usb/Makefile.objs
>  create mode 100644 hw/usb/meson.build
>  create mode 100644 hw/usb/trace.h
>  delete mode 100644 hw/vfio/Makefile.objs
>  create mode 100644 hw/vfio/meson.build
>  create mode 100644 hw/vfio/trace.h
>  delete mode 100644 hw/virtio/Makefile.objs
>  create mode 100644 hw/virtio/meson.build
>  create mode 100644 hw/virtio/trace.h
>  delete mode 100644 hw/watchdog/Makefile.objs
>  create mode 100644 hw/watchdog/meson.build
>  create mode 100644 hw/watchdog/trace.h
>  delete mode 100644 hw/xen/Makefile.objs
>  create mode 100644 hw/xen/meson.build
>  create mode 100644 hw/xen/trace.h
>  delete mode 100644 hw/xenpv/Makefile.objs
>  create mode 100644 hw/xenpv/meson.build
>  delete mode 100644 hw/xtensa/Makefile.objs
>  create mode 100644 hw/xtensa/meson.build
>  delete mode 100644 io/Makefile.objs
>  create mode 100644 io/meson.build
>  create mode 100644 io/trace.h
>  delete mode 100644 libdecnumber/Makefile.objs
>  create mode 100644 libdecnumber/meson.build
>  delete mode 100644 linux-user/Makefile.objs
>  delete mode 100644 linux-user/alpha/Makefile.objs
>  create mode 100644 linux-user/alpha/meson.build
>  delete mode 100644 linux-user/arm/Makefile.objs
>  create mode 100644 linux-user/arm/meson.build
>  delete mode 100644 linux-user/arm/nwfpe/Makefile.objs
>  create mode 100644 linux-user/arm/nwfpe/meson.build
>  delete mode 100644 linux-user/hppa/Makefile.objs
>  create mode 100644 linux-user/hppa/meson.build
>  delete mode 100644 linux-user/i386/Makefile.objs
>  create mode 100644 linux-user/i386/meson.build
>  create mode 100644 linux-user/i386/syscall_nr.h
>  delete mode 100644 linux-user/m68k/Makefile.objs
>  create mode 100644 linux-user/m68k/meson.build
>  create mode 100644 linux-user/meson.build
>  delete mode 100644 linux-user/microblaze/Makefile.objs
>  create mode 100644 linux-user/microblaze/meson.build
>  delete mode 100644 linux-user/mips/Makefile.objs
>  create mode 100644 linux-user/mips/meson.build
>  create mode 100644 linux-user/mips/syscall_nr.h
>  delete mode 100644 linux-user/mips64/Makefile.objs
>  create mode 100644 linux-user/mips64/meson.build
>  create mode 100644 linux-user/mips64/syscall_nr.h
>  delete mode 100644 linux-user/ppc/Makefile.objs
>  create mode 100644 linux-user/ppc/meson.build
>  delete mode 100644 linux-user/s390x/Makefile.objs
>  create mode 100644 linux-user/s390x/meson.build
>  delete mode 100644 linux-user/sh4/Makefile.objs
>  create mode 100644 linux-user/sh4/meson.build
>  delete mode 100644 linux-user/sparc/Makefile.objs
>  create mode 100644 linux-user/sparc/meson.build
>  delete mode 100644 linux-user/sparc64/Makefile.objs
>  create mode 100644 linux-user/sparc64/meson.build
>  create mode 100644 linux-user/trace.h
>  delete mode 100644 linux-user/x86_64/Makefile.objs
>  create mode 100644 linux-user/x86_64/meson.build
>  create mode 100644 linux-user/x86_64/syscall_nr.h
>  delete mode 100644 linux-user/xtensa/Makefile.objs
>  create mode 100644 linux-user/xtensa/meson.build
>  rename memory_ldst.inc.c => memory_ldst.inc (100%)
>  create mode 160000 meson
>  create mode 100644 meson.build
>  create mode 100644 meson_options.txt
>  delete mode 100644 migration/Makefile.objs
>  create mode 100644 migration/meson.build
>  create mode 100644 migration/trace.h
>  delete mode 100644 monitor/Makefile.objs
>  create mode 100644 monitor/meson.build
>  create mode 100644 monitor/trace.h
>  delete mode 100644 nbd/Makefile.objs
>  create mode 100644 nbd/meson.build
>  create mode 100644 nbd/trace.h
>  delete mode 100644 net/Makefile.objs
>  delete mode 100644 net/can/Makefile.objs
>  create mode 100644 net/can/meson.build
>  create mode 100644 net/meson.build
>  create mode 100644 net/trace.h
>  create mode 100644 pc-bios/descriptors/meson.build
>  create mode 100644 pc-bios/meson.build
>  delete mode 100644 plugins/Makefile.objs
>  create mode 100644 plugins/meson.build
>  create mode 100644 po/LINGUAS
>  delete mode 100644 po/Makefile
>  create mode 100644 po/POTFILES
>  create mode 100644 po/meson.build
>  delete mode 100644 po/messages.po
>  delete mode 100644 qapi/Makefile.objs
>  create mode 100644 qapi/meson.build
>  create mode 100644 qapi/trace.h
>  delete mode 100644 qga/Makefile.objs
>  create mode 100644 qga/meson.build
>  delete mode 100644 qga/vss-win32/Makefile.objs
>  create mode 100644 qga/vss-win32/meson.build
>  delete mode 100644 qobject/Makefile.objs
>  create mode 100644 qobject/meson.build
>  delete mode 100644 qom/Makefile.objs
>  create mode 100644 qom/meson.build
>  create mode 100644 qom/trace.h
>  delete mode 100644 replay/Makefile.objs
>  create mode 100644 replay/meson.build
>  create mode 100644 scripts/check_sparse.py
>  delete mode 100755 scripts/create_config
>  mode change 100755 => 100644 scripts/decodetree.py
>  create mode 100755 scripts/grepy.sh
>  mode change 100644 => 100755 scripts/hxtool
>  mode change 100755 => 100644 scripts/minikconf.py
>  create mode 100644 scripts/mtest2make.py
>  create mode 100755 scripts/ninjatool.py
>  mode change 100755 => 100644 scripts/qapi-gen.py
>  create mode 100755 scripts/qemu-version.sh
>  mode change 100755 => 100644 scripts/tracetool.py
>  create mode 100755 scripts/undefsym.sh
>  delete mode 100644 scsi/Makefile.objs
>  create mode 100644 scsi/meson.build
>  create mode 100644 scsi/trace.h
>  delete mode 100644 softmmu/Makefile.objs
>  create mode 100644 softmmu/meson.build
>  delete mode 100644 storage-daemon/Makefile.objs
>  create mode 100644 storage-daemon/meson.build
>  delete mode 100644 storage-daemon/qapi/Makefile.objs
>  create mode 100644 storage-daemon/qapi/meson.build
>  rename qemu-storage-daemon.c => storage-daemon/qemu-storage-daemon.c (100%)
>  delete mode 100644 stubs/Makefile.objs
>  create mode 100644 stubs/meson.build
>  delete mode 100644 target/alpha/Makefile.objs
>  create mode 100644 target/alpha/meson.build
>  delete mode 100644 target/arm/Makefile.objs
>  create mode 100644 target/arm/meson.build
>  create mode 100644 target/arm/trace.h
>  rename target/arm/{translate-neon.inc.c => translate-neon.inc} (99%)
>  rename target/arm/{translate-vfp.inc.c => translate-vfp.inc} (99%)
>  delete mode 100644 target/avr/Makefile.objs
>  create mode 100644 target/avr/meson.build
>  delete mode 100644 target/cris/Makefile.objs
>  create mode 100644 target/cris/meson.build
>  rename target/cris/{translate_v10.inc.c => translate_v10.inc} (100%)
>  delete mode 100644 target/hppa/Makefile.objs
>  create mode 100644 target/hppa/meson.build
>  create mode 100644 target/hppa/trace.h
>  delete mode 100644 target/i386/Makefile.objs
>  delete mode 100644 target/i386/hvf/Makefile.objs
>  create mode 100644 target/i386/hvf/meson.build
>  create mode 100644 target/i386/meson.build
>  create mode 100644 target/i386/trace.h
>  delete mode 100644 target/lm32/Makefile.objs
>  create mode 100644 target/lm32/meson.build
>  delete mode 100644 target/m68k/Makefile.objs
>  create mode 100644 target/m68k/meson.build
>  create mode 100644 target/meson.build
>  delete mode 100644 target/microblaze/Makefile.objs
>  create mode 100644 target/microblaze/meson.build
>  delete mode 100644 target/mips/Makefile.objs
>  create mode 100644 target/mips/meson.build
>  create mode 100644 target/mips/trace.h
>  rename target/mips/{translate_init.inc.c => translate_init.inc} (100%)
>  delete mode 100644 target/moxie/Makefile.objs
>  create mode 100644 target/moxie/meson.build
>  delete mode 100644 target/nios2/Makefile.objs
>  create mode 100644 target/nios2/meson.build
>  delete mode 100644 target/openrisc/Makefile.objs
>  create mode 100644 target/openrisc/meson.build
>  delete mode 100644 target/ppc/Makefile.objs
>  create mode 100644 target/ppc/meson.build
>  rename target/ppc/{mfrom_table.inc.c => mfrom_table.inc} (100%)
>  create mode 100644 target/ppc/trace.h
>  rename target/ppc/translate/{dfp-impl.inc.c => dfp-impl.inc} (100%)
>  rename target/ppc/translate/{dfp-ops.inc.c => dfp-ops.inc} (100%)
>  rename target/ppc/translate/{fp-impl.inc.c => fp-impl.inc} (100%)
>  rename target/ppc/translate/{fp-ops.inc.c => fp-ops.inc} (100%)
>  rename target/ppc/translate/{spe-impl.inc.c => spe-impl.inc} (100%)
>  rename target/ppc/translate/{spe-ops.inc.c => spe-ops.inc} (100%)
>  rename target/ppc/translate/{vmx-impl.inc.c => vmx-impl.inc} (100%)
>  rename target/ppc/translate/{vmx-ops.inc.c => vmx-ops.inc} (100%)
>  rename target/ppc/translate/{vsx-impl.inc.c => vsx-impl.inc} (100%)
>  rename target/ppc/translate/{vsx-ops.inc.c => vsx-ops.inc} (100%)
>  rename target/ppc/{translate_init.inc.c => translate_init.inc} (100%)
>  delete mode 100644 target/riscv/Makefile.objs
>  rename target/riscv/insn_trans/{trans_privileged.inc.c => trans_privileged.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rva.inc.c => trans_rva.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvd.inc.c => trans_rvd.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvf.inc.c => trans_rvf.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvh.inc.c => trans_rvh.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvi.inc.c => trans_rvi.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvm.inc.c => trans_rvm.inc} (100%)
>  rename target/riscv/insn_trans/{trans_rvv.inc.c => trans_rvv.inc} (100%)
>  create mode 100644 target/riscv/meson.build
>  create mode 100644 target/riscv/trace.h
>  delete mode 100644 target/rx/Makefile.objs
>  create mode 100644 target/rx/meson.build
>  delete mode 100644 target/s390x/Makefile.objs
>  create mode 100644 target/s390x/meson.build
>  create mode 100644 target/s390x/trace.h
>  rename target/s390x/{translate_vx.inc.c => translate_vx.inc} (100%)
>  delete mode 100644 target/sh4/Makefile.objs
>  create mode 100644 target/sh4/meson.build
>  delete mode 100644 target/sparc/Makefile.objs
>  create mode 100644 target/sparc/meson.build
>  create mode 100644 target/sparc/trace.h
>  delete mode 100644 target/tilegx/Makefile.objs
>  create mode 100644 target/tilegx/meson.build
>  delete mode 100644 target/tricore/Makefile.objs
>  create mode 100644 target/tricore/meson.build
>  delete mode 100644 target/unicore32/Makefile.objs
>  create mode 100644 target/unicore32/meson.build
>  delete mode 100644 target/xtensa/Makefile.objs
>  rename target/xtensa/core-dc232b/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-dc232b/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-dc233c/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-dc233c/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-de212/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-de212/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-fsf/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-sample_controller/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-sample_controller/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-test_kc705_be/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-test_kc705_be/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  rename target/xtensa/core-test_mmuhifi_c3/{gdb-config.inc.c => gdb-config.inc} (100%)
>  rename target/xtensa/core-test_mmuhifi_c3/{xtensa-modules.inc.c => xtensa-modules.inc} (100%)
>  create mode 100644 target/xtensa/meson.build
>  rename tcg/aarch64/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/arm/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/i386/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/mips/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/ppc/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/riscv/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/s390/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/sparc/{tcg-target.inc.c => tcg-target.inc} (99%)
>  rename tcg/{tcg-ldst.inc.c => tcg-ldst.inc} (100%)
>  rename tcg/{tcg-pool.inc.c => tcg-pool.inc} (99%)
>  rename tcg/tci/{tcg-target.inc.c => tcg-target.inc} (100%)
>  create mode 100755 tests/docker/test-static
>  delete mode 100644 tests/fp/Makefile
>  create mode 100644 tests/fp/meson.build
>  rename tests/fp/{wrap.inc.c => wrap.inc} (100%)
>  create mode 100644 tests/meson.build
>  delete mode 100644 tests/plugin/Makefile
>  create mode 100644 tests/plugin/meson.build
>  create mode 100644 tests/qapi-schema/meson.build
>  create mode 100644 tests/qemu-iotests/meson.build
>  delete mode 100644 tests/qtest/Makefile.include
>  delete mode 100644 tests/qtest/fuzz/Makefile.include
>  create mode 100644 tests/qtest/fuzz/meson.build
>  rename tests/qtest/{ => libqos}/libqtest.h (100%)
>  create mode 100644 tests/qtest/libqos/meson.build
>  create mode 100644 tests/qtest/meson.build
>  create mode 100644 tools/meson.build
>  delete mode 100644 tools/virtiofsd/Makefile.objs
>  create mode 100644 tools/virtiofsd/meson.build
>  rename tools/virtiofsd/{seccomp.c => passthrough_seccomp.c} (99%)
>  rename tools/virtiofsd/{seccomp.h => passthrough_seccomp.h} (100%)
>  delete mode 100644 trace/Makefile.objs
>  create mode 100644 trace/meson.build
>  delete mode 100644 ui/Makefile.objs
>  create mode 100644 ui/meson.build
>  create mode 100644 ui/shader/meson.build
>  create mode 100644 ui/trace.h
>  rename ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc} (100%)
>  delete mode 100644 util/Makefile.objs
>  create mode 100644 util/meson.build
>  create mode 100644 util/trace.h
>  create mode 100644 version.texi.in
> 
> -- 
> 1.8.3.1
> 
> 

On 11/08/20 14:04, Roman Bolshakov wrote:
> 
> The line in configure assumes that meson is a python program rather than
> a wrapper:
> 
>   meson="$python $meson"

Hmm, that means we will have to use the embedded meson if the user
specifies --python.  But it's probably a good idea anyway, and not
problematic since Meson does not have any dependencies outside the
Python standard library.

> Compilation seems to partially succeed but linking of QEMU binary fails:
> 
> [3691/5594] Linking target qemu-system-aarch64
> FAILED: qemu-system-aarch64
> ...snip...
> ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
> ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
> ld: library not found for -lcapstone
> clang: error: linker command failed with exit code 1 (use -v to see invocation)

Can you include your config-host.mak?  Does it help if you do "make
dtc/all capstone/all" and then retry?

Paolo

On Tue, Aug 11, 2020 at 02:59:53PM +0200, Paolo Bonzini wrote:
> On 11/08/20 14:04, Roman Bolshakov wrote:
> > Compilation seems to partially succeed but linking of QEMU binary fails:
> > 
> > [3691/5594] Linking target qemu-system-aarch64
> > FAILED: qemu-system-aarch64
> > ...snip...
> > ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
> > ld: warning: directory not found for option '-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt'
> > ld: library not found for -lcapstone
> > clang: error: linker command failed with exit code 1 (use -v to see invocation)
> 
> Does it help if you do "make
> dtc/all capstone/all" and then retry?
>

It helps, thanks, but then linking fails with:

  [13/83] Linking target qemu-system-microblazeel
  FAILED: qemu-system-microblazeel
  ld: library not found for -lslirp

If I invoke "make slirp/all" and then build with "ninja" again it
succeeds for all targets and I can start QEMU with Cocoa UI.

> Can you include your config-host.mak?
> 

Sure, please find it below:
# Automatically generated by configure - do not modify

all:
prefix=/usr/local
bindir=/usr/local/bin
libdir=/usr/local/lib
libexecdir=/usr/local/libexec
includedir=/usr/local/include
mandir=/usr/local/share/man
sysconfdir=/usr/local/etc
qemu_confdir=/usr/local/etc/qemu
qemu_datadir=/usr/local/share/qemu
qemu_firmwarepath=${prefix}/share/qemu-firmware
qemu_docdir=/usr/local/share/doc/qemu
qemu_moddir=/usr/local/lib/qemu
qemu_localstatedir=/usr/local/var
qemu_helperdir=/usr/local/libexec
qemu_localedir=/usr/local/share/locale
qemu_icondir=/usr/local/share/icons
qemu_desktopdir=/usr/local/share/applications
libs_softmmu=-L/usr/local/Cellar/pixman/0.40.0/lib -lpixman-1 -F/System/Library/Frameworks -framework Cocoa -framework IOKit  -llzo2 -lsnappy -lfdt
GIT=git
GIT_SUBMODULES=ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc capstone slirp
GIT_UPDATE=yes
ARCH=x86_64
CONFIG_MINIKCONF_MODE=--defconfig
STRIP=strip
CONFIG_POSIX=y
CONFIG_DARWIN=y
CONFIG_TOOLS=y
CONFIG_GUEST_AGENT=y
CONFIG_SLIRP=y
CONFIG_SMBD_COMMAND="/usr/sbin/smbd"
SLIRP_CFLAGS=-I/Users/r.bolshakov/dev/qemu/slirp/src -I/Users/r.bolshakov/dev/qemu/build/slirp/src
SLIRP_LIBS=-L/Users/r.bolshakov/dev/qemu/build/slirp -lslirp
qemu-version.h: slirp/all
CONFIG_VDE=y
VDE_LIBS=-lvdeplug
CONFIG_AUDIO_DRIVERS=coreaudio sdl
CONFIG_AUDIO_COREAUDIO=y
CONFIG_AUDIO_SDL=m
ALSA_LIBS=
ALSA_CFLAGS=
PULSE_LIBS=
PULSE_CFLAGS=
COREAUDIO_LIBS=-framework CoreAudio
DSOUND_LIBS=
OSS_LIBS=
JACK_LIBS=
CONFIG_BDRV_RW_WHITELIST=
CONFIG_BDRV_RO_WHITELIST=
PKGVERSION=
SRC_PATH=/Users/r.bolshakov/dev/qemu
TARGET_DIRS=aarch64-softmmu alpha-softmmu arm-softmmu avr-softmmu cris-softmmu hppa-softmmu i386-softmmu lm32-softmmu m68k-softmmu microblaze-softmmu microblazeel-softmmu mips-softmmu mips64-softmmu mips64el-softmmu mipsel-softmmu moxie-softmmu nios2-softmmu or1k-softmmu ppc-softmmu ppc64-softmmu riscv32-softmmu riscv64-softmmu rx-softmmu s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu sparc64-softmmu tricore-softmmu unicore32-softmmu x86_64-softmmu xtensa-softmmu xtensaeb-softmmu
CONFIG_COCOA=y
CONFIG_ICONV=y
ICONV_CFLAGS=-I/usr/local/include
ICONV_LIBS=-L/usr/local/lib -liconv
CONFIG_CURL=m
CURL_CFLAGS=
CURL_LIBS=-lcurl
CONFIG_GIO=y
GIO_CFLAGS=-I/usr/local/Cellar/libffi/3.3/include -I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include -I/usr/local/Cellar/libffi/3.3/include -I/usr/local/Cellar/glib/2.64.4_2/include/gio-unix-2.0 -I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include
GIO_LIBS=-L/usr/local/Cellar/glib/2.64.4_2/lib -L/usr/local/opt/gettext/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl -L/usr/local/Cellar/glib/2.64.4_2/lib -L/usr/local/opt/gettext/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl
GDBUS_CODEGEN=/usr/local/Cellar/glib/2.64.4_2/bin/gdbus-codegen
CONFIG_TLS_PRIORITY="NORMAL"
CONFIG_GNUTLS=y
GNUTLS_CFLAGS=-I/usr/local/Cellar/gnutls/3.6.14/include -I/usr/local/Cellar/nettle/3.6/include -I/usr/local/Cellar/libtasn1/4.16.0/include -I/usr/local/Cellar/libidn2/2.3.0/include -I/usr/local/Cellar/p11-kit/0.23.20_1/include/p11-kit-1
GNUTLS_LIBS=-L/usr/local/Cellar/gnutls/3.6.14/lib -lgnutls
CONFIG_NETTLE=y
CONFIG_NETTLE_VERSION_MAJOR=3
NETTLE_CFLAGS=-I/usr/local/Cellar/nettle/3.6/include
NETTLE_LIBS=-L/usr/local/Cellar/nettle/3.6/lib -lnettle
CONFIG_TASN1=y
CONFIG_AUTH_PAM=y
HAVE_IFADDRS_H=y
HAVE_OPENPTY=y
HAVE_SYS_SIGNAL_H=y
CONFIG_VTE=y
VTE_CFLAGS=-I/usr/local/Cellar/libffi/3.3/include -I/usr/local/Cellar/vte3/0.60.3_1/include/vte-2.91 -I/usr/local/Cellar/gtk+3/3.24.21/include/gtk-3.0 -I/usr/local/Cellar/glib/2.64.4_2/include/gio-unix-2.0 -I/usr/local/Cellar/cairo/1.16.0_3/include/cairo -I/usr/local/Cellar/libepoxy/1.5.4_1/include -I/usr/local/Cellar/pango/1.44.7/include/pango-1.0 -I/usr/local/Cellar/fribidi/1.0.10/include/fribidi -I/usr/local/Cellar/harfbuzz/2.7.0/include/harfbuzz -I/usr/local/Cellar/graphite2/1.3.14/include -I/usr/local/Cellar/atk/2.36.0/include/atk-1.0 -I/usr/local/Cellar/cairo/1.16.0_3/include/cairo -I/usr/local/Cellar/pixman/0.40.0/include/pixman-1 -I/usr/local/Cellar/fontconfig/2.13.1/include -I/usr/local/opt/freetype/include/freetype2 -I/usr/local/Cellar/libpng/1.6.37/include/libpng16 -I/usr/local/Cellar/gdk-pixbuf/2.40.0_1/include/gdk-pixbuf-2.0 -I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include
VTE_LIBS=-L/usr/local/Cellar/vte3/0.60.3_1/lib -L/usr/local/Cellar/gtk+3/3.24.21/lib -L/usr/local/Cellar/pango/1.44.7/lib -L/usr/local/Cellar/harfbuzz/2.7.0/lib -L/usr/local/Cellar/atk/2.36.0/lib -L/usr/local/Cellar/cairo/1.16.0_3/lib -L/usr/local/Cellar/gdk-pixbuf/2.40.0_1/lib -L/usr/local/Cellar/glib/2.64.4_2/lib -L/usr/local/opt/gettext/lib -lvte-2.91 -lgtk-3 -lgdk-3 -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreGraphics -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl
CONFIG_VHOST_NET=y
CONFIG_VHOST_NET_USER=y
CONFIG_VHOST_CRYPTO=y
CONFIG_VHOST_USER=y
CONFIG_VHOST_USER_FS=y
INSTALL_BLOBS=yes
CONFIG_IOVEC=y
CONFIG_FDT=y
FDT_CFLAGS=-I/Users/r.bolshakov/dev/qemu/dtc/libfdt
FDT_LIBS=-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt -lfdt
HAVE_OPTRESET=y
CONFIG_TCG=y
CONFIG_MADVISE=y
CONFIG_POSIX_MADVISE=y
CONFIG_POSIX_MEMALIGN=y
CONFIG_ZLIB=y
ZLIB_CFLAGS=
ZLIB_LIBS=-lz
CONFIG_USB_LIBUSB=y
LIBUSB_CFLAGS=-I/usr/local/Cellar/libusb/1.0.23/include/libusb-1.0
LIBUSB_LIBS=-L/usr/local/Cellar/libusb/1.0.23/lib -lusb-1.0
CONFIG_USB_REDIR=y
USB_REDIR_CFLAGS=-I/usr/local/Cellar/usbredir/0.8.0/include
USB_REDIR_LIBS=-L/usr/local/Cellar/usbredir/0.8.0/lib -lusbredirparser
CONFIG_LZO=y
LZO_LIBS=-llzo2
CONFIG_SNAPPY=y
SNAPPY_LIBS=-lsnappy
CONFIG_BZIP2=y
BZIP2_LIBS=-lbz2
CONFIG_ZSTD=y
ZSTD_CFLAGS=-I/usr/local/Cellar/zstd/1.4.5//include
ZSTD_LIBS=-L/usr/local/Cellar/zstd/1.4.5//lib -lzstd
CONFIG_BSD=y
CONFIG_QOM_CAST_DEBUG=y
CONFIG_COROUTINE_BACKEND=sigaltstack
CONFIG_COROUTINE_POOL=1
CONFIG_CPUID_H=y
CONFIG_INT128=y
CONFIG_CMPXCHG128=y
CONFIG_ATOMIC64=y
CONFIG_LIBSSH=m
LIBSSH_CFLAGS=-DHAVE_LIBSSH_0_8 -I/usr/local/Cellar/libssh/0.9.4/include
LIBSSH_LIBS=-L/usr/local/Cellar/libssh/0.9.4/lib -lssh
CONFIG_LIVE_BLOCK_MIGRATION=y
CONFIG_TPM=y
TRACE_BACKENDS=log
CONFIG_TRACE_LOG=y
CONFIG_TRACE_FILE=trace
CONFIG_LIBXML2=y
LIBXML2_CFLAGS=
LIBXML2_LIBS=-lxml2
CONFIG_REPLICATION=y
CONFIG_STATIC_ASSERT=y
HAVE_UTMPX=y
CONFIG_CAPSTONE=y
CAPSTONE_CFLAGS=-I/Users/r.bolshakov/dev/qemu/capstone/include
CAPSTONE_LIBS=-L/Users/r.bolshakov/dev/qemu/build/capstone -lcapstone
CONFIG_THREAD_SETNAME_BYTHREAD=y
CONFIG_PTHREAD_SETNAME_NP_WO_TID=y
CONFIG_BOCHS=y
CONFIG_CLOOP=y
CONFIG_DMG=y
CONFIG_QCOW1=y
CONFIG_VDI=y
CONFIG_VVFAT=y
CONFIG_QED=y
CONFIG_PARALLELS=y
CONFIG_SHEEPDOG=y
HAVE_MLOCKALL=y
HAVE_GDB_BIN=/usr/local/bin/gdb
ROMS=
MAKE=make
INSTALL=install
INSTALL_DIR=install -d -m 0755
INSTALL_DATA=install -c -m 0644
INSTALL_PROG=install -c -m 0755
INSTALL_LIB=install -c -m 0644
PYTHON=/usr/local/bin/python3 -B
SPHINX_BUILD=
GENISOIMAGE=/usr/local/bin/mkisofs
MESON=/usr/local/bin/meson
CC=cc
CONFIG_IASL=iasl
HOST_CC=cc
CXX=c++
OBJCC=clang
AR=ar
ARFLAGS=rv
AS=as
CCAS=cc
CPP=cc -E
OBJCOPY=objcopy
LD=ld
RANLIB=ranlib
NM=nm
PKG_CONFIG=pkg-config
WINDRES=windres
CFLAGS=-O2 -g -std=gnu99 -Wall
CXXFLAGS=-O2 -g -std=gnu++11 -Wall
CFLAGS_NOPIE=
QEMU_CFLAGS=-I/usr/local/Cellar/pixman/0.40.0/include/pixman-1 -I/Users/r.bolshakov/dev/qemu/dtc/libfdt  -I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include -m64 -mcx16 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv  -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -fstack-protector-strong -I/usr/local/Cellar/gnutls/3.6.14/include -I/usr/local/Cellar/nettle/3.6/include -I/usr/local/Cellar/libtasn1/4.16.0/include -I/usr/local/Cellar/libidn2/2.3.0/include -I/usr/local/Cellar/p11-kit/0.23.20_1/include/p11-kit-1 -I/usr/local/Cellar/nettle/3.6/include -I/Users/r.bolshakov/dev/qemu/capstone/include
QEMU_CXXFLAGS= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include -m64 -mcx16 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wundef -Wwrite-strings -fno-strict-aliasing -fno-common -fwrapv -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -fstack-protector-strong -I/usr/local/Cellar/gnutls/3.6.14/include -I/usr/local/Cellar/nettle/3.6/include -I/usr/local/Cellar/libtasn1/4.16.0/include -I/usr/local/Cellar/libidn2/2.3.0/include -I/usr/local/Cellar/p11-kit/0.23.20_1/include/p11-kit-1 -I/usr/local/Cellar/nettle/3.6/include -I/Users/r.bolshakov/dev/qemu/capstone/include
QEMU_INCLUDES=-iquote /Users/r.bolshakov/dev/qemu/tcg/i386 -iquote . -iquote /Users/r.bolshakov/dev/qemu -iquote /Users/r.bolshakov/dev/qemu/accel/tcg -iquote /Users/r.bolshakov/dev/qemu/include -iquote /Users/r.bolshakov/dev/qemu/disas/libvixl
GLIB_CFLAGS=-I/usr/local/Cellar/glib/2.64.4_2/include -I/usr/local/Cellar/glib/2.64.4_2/include/glib-2.0 -I/usr/local/Cellar/glib/2.64.4_2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include
GLIB_LIBS=-L/usr/local/Cellar/glib/2.64.4_2/lib -L/usr/local/opt/gettext/lib -lgthread-2.0 -lglib-2.0 -lintl
QEMU_LDFLAGS=-L/Users/r.bolshakov/dev/qemu/build/dtc/libfdt -framework Hypervisor -m64 -framework CoreFoundation -framework IOKit -arch x86_64  -fstack-protector-strong
LDFLAGS_NOPIE=
LD_REL_FLAGS=
LD_I386_EMULATION=
LIBS+=-lz -L/usr/local/Cellar/glib/2.64.4_2/lib -L/usr/local/opt/gettext/lib -lgthread-2.0 -lglib-2.0 -lintl -L/usr/local/Cellar/nettle/3.6/lib -lnettle -L/usr/local/Cellar/gnutls/3.6.14/lib -lgnutls 
LIBS_TOOLS+=
PTHREAD_LIB=
EXESUF=
HOST_DSOSUF=.so
LDFLAGS_SHARED=-bundle -undefined dynamic_lookup
LIBS_QGA=
TASN1_LIBS=-L/usr/local/Cellar/libtasn1/4.16.0/lib -ltasn1
TASN1_CFLAGS=-I/usr/local/Cellar/libtasn1/4.16.0/include
POD2MAN=pod2man --utf8
DECOMPRESS_EDK2_BLOBS=y
PIXMAN_CFLAGS=-I/usr/local/Cellar/pixman/0.40.0/include/pixman-1
PIXMAN_LIBS=-L/usr/local/Cellar/pixman/0.40.0/lib -lpixman-1
qemu-version.h: dtc/all
qemu-version.h: capstone/all
LIBCAPSTONE=libcapstone.a

On Mon, 10 Aug 2020 19:06:38 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> This version is substantially less "draft-like", and the diffstat
> is actually quite large with Thursday's draft.
> 
> The changes are as follows:
> - updated oss-fuzz build script
> - various cases fixed that broke depending on present/absent dependencies
> - all build scripts handle --python correctly
> - git submodules properly updated before running meson
> - no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
> - installation matches current build system
> - fixes for virtio-vga broken merge
> - includes updated s390-ccw patch from Thomas
> - less noisy "make check"
> - tested with GitLab CI, BSD VM builds and various Docker builds
> - input-keymap files properly regenerated
> 
> Of our supported build platforms, only Mac OS and non-x86 hosts are
> still untested.  But I guess this might finally count as a v1.
> 
> This is available from https://gitlab.com/bonzini/qemu.git branch
> meson-poc-next.

Trying this branch, configure is already unhappy on Fedora 31:

funcs: do_compiler do_cc compile_object main
lines: 92 124 2341 0
cc -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -Wno-missing-braces -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
cc1: warning: ‘-Wformat-y2k’ ignored without ‘-Wformat’ [-Wformat-y2k]
cc1: warning: ‘-Wformat-security’ ignored without ‘-Wformat’ [-Wformat-security]
cc -Werror -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -Wno-missing-braces -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
cc1: error: ‘-Wformat-y2k’ ignored without ‘-Wformat’ [-Werror=format-y2k]
cc1: error: ‘-Wformat-security’ ignored without ‘-Wformat’ [-Werror=format-security]
cc1: all warnings being treated as errors

gcc --version says
gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2)

If I disable -Werror, the build succeeds.

On Tue, 11 Aug 2020 11:41:39 +0200
Cornelia Huck <cohuck@redhat.com> wrote:

> On Mon, 10 Aug 2020 19:06:38 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
> 
> > This version is substantially less "draft-like", and the diffstat
> > is actually quite large with Thursday's draft.
> > 
> > The changes are as follows:
> > - updated oss-fuzz build script
> > - various cases fixed that broke depending on present/absent dependencies
> > - all build scripts handle --python correctly
> > - git submodules properly updated before running meson
> > - no warnings from Meson master (will be 0.56.0), one from upcoming 0.55.1
> > - installation matches current build system
> > - fixes for virtio-vga broken merge
> > - includes updated s390-ccw patch from Thomas
> > - less noisy "make check"
> > - tested with GitLab CI, BSD VM builds and various Docker builds
> > - input-keymap files properly regenerated
> > 
> > Of our supported build platforms, only Mac OS and non-x86 hosts are
> > still untested.  But I guess this might finally count as a v1.
> > 
> > This is available from https://gitlab.com/bonzini/qemu.git branch
                                   ^^^^^^^^^^

> > meson-poc-next.  
> 
> Trying this branch, configure is already unhappy on Fedora 31:

(...)

I pulled from *github*, not *gitlab*... using the proper branch,
everything seems to work fine (ran make check and did some light
testing.)