* [DRAFT PATCH 000/143] Meson integration for 5.2
@ 2020-08-06 19:13 Paolo Bonzini
2020-08-06 19:13 ` [PATCH 001/143] tests: move socket_scm_helper back to tests/ Paolo Bonzini
` (147 more replies)
0 siblings, 148 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:13 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, berrange, jsnow, armbru, philmd, stefanha, alex.bennee
This the more or less final version of the Meson conversion. Due to
the sheer size of the series you have been CCed only on the cover
letter.
The series reaches the point where Makefile.target and unnest-vars
can be removed, and all builds become non-recursive. I have also
converted parts of the testsuite, notably qtest since it is needed
for fuzzing. What's left for _after_ the merge is: 1) unit tests;
2) moving the rest of installation to meson (for which I have patches);
3) moving feature detection from configure to meson.
Things I still haven't tested:
- fuzzing
- non-x86/Linux builds
- static builds
- Docker and VM builds
Things I have checked:
- x86 builds
- modules
- "make install"
- internal slirp/dtc/capstone.
It should be more or less bisectable. I have not tried building
_all_ steps, but I have tried both before and after each major one.
Build system rebuild rules seem to work reliably.
After a week or quite intense rebasing, my impression is more or less
the same as last December: Meson looks more daunting, but it is actually
much nicer to work with.
The diffstat so far is not very favorable, but remember that:
1) the series leaves quite a few nearly-obsolete bits in configure,
Makefile and rules.mak (over 200 lines only in the makefiles).
2) configure test conversion will be where meson really shines. I
included a couple examples just to show
meson: convert VNC and dependent libraries to meson
4 files changed, 44 insertions(+), 134 deletions(-)
meson: move SDL and SDL-image detection to meson
5 files changed, 30 insertions(+), 144 deletions(-)
meson: replace create-config with meson configure_file
6 files changed, 80 insertions(+), 168 deletions(-)
3) the idea behind using Makefile generators is to have stable
code written in a high-level language instead of Makefile magic
that tends to grow by accretion. So even though ninjatool is
large at 1000 lines of Python, it can already be considered mature
or even "done". It had only ~15 lines changed since the last post,
and whenever debugging meson.build issues looking at build.ninja has
always (literally!) been enough.
Available on git://github.com/bonzini/qemu branch meson-poc-next.
Paolo
Marc-André Lureau (92):
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: uncompress edk2 bios
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 block/
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: target
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 (51):
tests: move socket_scm_helper back to tests/
pc-bios/s390-ccw: simplify Makefile
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
configure: do not include $(...) variables in config-host.mak
configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson
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 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: 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
.gitignore | 4 +-
.gitlab-ci.yml | 4 +-
.gitmodules | 3 +
Makefile | 955 +------------
Makefile.objs | 218 +--
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 | 958 ++++---------
contrib/elf2dmp/Makefile.objs | 4 -
contrib/elf2dmp/meson.build | 4 +
contrib/gitdm/filetypes.txt | 2 +-
contrib/ivshmem-client/Makefile.objs | 1 -
contrib/ivshmem-client/meson.build | 3 +
contrib/ivshmem-server/Makefile.objs | 1 -
contrib/ivshmem-server/meson.build | 3 +
contrib/libvhost-user/Makefile.objs | 1 -
contrib/libvhost-user/meson.build | 2 +
contrib/rdmacm-mux/Makefile.objs | 3 -
contrib/rdmacm-mux/meson.build | 6 +
contrib/vhost-user-blk/Makefile.objs | 1 -
contrib/vhost-user-blk/meson.build | 3 +
contrib/vhost-user-gpu/Makefile.objs | 10 -
contrib/vhost-user-gpu/meson.build | 11 +
contrib/vhost-user-input/Makefile.objs | 1 -
contrib/vhost-user-input/meson.build | 3 +
contrib/vhost-user-scsi/Makefile.objs | 1 -
contrib/vhost-user-scsi/meson.build | 5 +
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 | 378 +++---
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 | 15 +
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 | 43 +
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 | 94 ++
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 | 30 +
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 | 1413 ++++++++++++++++++++
meson_options.txt | 6 +
migration/Makefile.objs | 18 -
migration/meson.build | 29 +
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/meson.build | 23 +
pc-bios/optionrom/Makefile | 67 +-
pc-bios/s390-ccw/Makefile | 105 +-
pc-bios/s390-ccw/netboot.mak | 62 -
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 | 86 ++
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/modules/module_block.py | 0
scripts/mtest2make.py | 102 ++
scripts/ninjatool.py | 1010 ++++++++++++++
scripts/qemu-version.sh | 25 +
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 | 14 +
softmmu/qtest.c | 2 +-
softmmu/vl.c | 2 +-
storage-daemon/Makefile.objs | 1 -
storage-daemon/meson.build | 13 +
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 | 48 +
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 | 451 +------
tests/acceptance/avocado_qemu/__init__.py | 3 +-
tests/data/acpi/rebuild-expected-aml.sh | 2 +-
tests/fp/Makefile | 600 ---------
tests/fp/fp-test.c | 2 +-
tests/fp/meson.build | 628 +++++++++
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 | 215 +++
tests/qemu-iotests/check | 6 +-
tests/qemu-iotests/meson.build | 8 +
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 | 34 +
tests/qtest/fuzz/qos_fuzz.c | 2 +-
tests/qtest/fuzz/virtio_net_fuzz.c | 5 +-
tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 +-
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 | 254 ++++
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 +-
tools/meson.build | 7 +
tools/virtiofsd/Makefile.objs | 12 -
tools/virtiofsd/meson.build | 17 +
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 | 99 ++
ui/Makefile.objs | 73 -
ui/meson.build | 114 ++
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 +
739 files changed, 8491 insertions(+), 7194 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/meson.build
delete mode 100644 pc-bios/s390-ccw/netboot.mak
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
create mode 100755 scripts/grepy.sh
mode change 100644 => 100755 scripts/hxtool
mode change 100644 => 100755 scripts/modules/module_block.py
create mode 100644 scripts/mtest2make.py
create mode 100755 scripts/ninjatool.py
create mode 100755 scripts/qemu-version.sh
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%)
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
^ permalink raw reply [flat|nested] 250+ messages in thread
* [PATCH 001/143] tests: move socket_scm_helper back to tests/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
@ 2020-08-06 19:13 ` Paolo Bonzini
2020-08-06 21:50 ` Philippe Mathieu-Daudé
2020-08-06 19:13 ` [PATCH 002/143] optionrom: simplify Makefile Paolo Bonzini
` (146 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:13 UTC (permalink / raw)
To: qemu-devel
This file is unrelated to qemu-iotests and was moved incorrectly
to tests/qtest/Makefile.include.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/Makefile.include | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index c7e4646..985cd14 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -879,6 +879,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
+tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
+
.PHONY: check-tests/check-block.sh
check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 002/143] optionrom: simplify Makefile
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
2020-08-06 19:13 ` [PATCH 001/143] tests: move socket_scm_helper back to tests/ Paolo Bonzini
@ 2020-08-06 19:13 ` Paolo Bonzini
2020-08-06 19:13 ` [PATCH 003/143] pc-bios/s390-ccw: " Paolo Bonzini
` (145 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:13 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Make it independent from the rules.mak, and clean up to use pattern rules.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/optionrom/Makefile | 67 ++++++++++++++++++++++++++++------------------
1 file changed, 41 insertions(+), 26 deletions(-)
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index e33a24d..51cb6ca 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -1,13 +1,16 @@
-all: build-all
+CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+SRC_DIR := $(dir $(CURRENT_MAKEFILE))
+TOPSRC_DIR := $(SRC_DIR)/../..
+VPATH = $(SRC_DIR)
+
+all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
# Dummy command so that make thinks it has done something
@true
include ../../config-host.mak
-include $(SRC_PATH)/rules.mak
-
-$(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
-.PHONY : all clean build-all
+quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
+cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2)
# Compiling with no optimization creates ROMs that are too large
ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0)
@@ -15,48 +18,60 @@ override CFLAGS += -O2
endif
override CFLAGS += -march=i486
-# Drop -fstack-protector and the like
-QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS)) $(CFLAGS_NOPIE) -ffreestanding
-QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
-QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -m16)
-ifeq ($(filter -m16, $(QEMU_CFLAGS)),)
+# Flags for dependency generation
+override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
+
+override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
+override CFLAGS += $(CFLAGS_NOPIE) -ffreestanding -I$(TOPSRC_DIR)/include
+override CFLAGS += $(call cc-option, -fno-stack-protector)
+override CFLAGS += $(call cc-option, -m16)
+
+ifeq ($(filter -m16, $(CFLAGS)),)
# Attempt to work around compilers that lack -m16 (GCC <= 4.8, clang <= ??)
# On GCC we add -fno-toplevel-reorder to keep the order of asm blocks with
# respect to the rest of the code. clang does not have -fno-toplevel-reorder,
# but it places all asm blocks at the beginning and we're relying on it for
# the option ROM header. So just force clang not to use the integrated
# assembler, which doesn't support .code16gcc.
-QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-toplevel-reorder)
-QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -no-integrated-as)
-QEMU_CFLAGS += -m32 -include $(SRC_PATH)/pc-bios/optionrom/code16gcc.h
+override CFLAGS += $(call cc-option, -fno-toplevel-reorder)
+override CFLAGS += $(call cc-option, -no-integrated-as)
+override CFLAGS += -m32 -include $(SRC_DIR)/code16gcc.h
endif
-QEMU_INCLUDES += -I$(SRC_PATH)
-
Wa = -Wa,
-ASFLAGS += -32
-QEMU_CFLAGS += $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32)
+override ASFLAGS += -32
+override CFLAGS += $(call cc-option, $(Wa)-32)
-build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
-# suppress auto-removal of intermediate files
-.SECONDARY:
+LD_I386_EMULATION ?= elf_i386
+override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
+override LDFLAGS += $(LDFLAGS_NOPIE)
+all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
+
+pvh.img: pvh.o pvh_main.o
%.o: %.S
- $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@")
+ $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
-pvh.img: pvh.o pvh_main.o
- $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@")
+%.o: %.c
+ $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")
%.img: %.o
- $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@")
+ $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@")
%.raw: %.img
- $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$(TARGET_DIR)$@")
+ $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@")
%.bin: %.raw
- $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/signrom.py $< $@,"SIGN","$(TARGET_DIR)$@")
+ $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,"SIGN","$@")
+
+include $(wildcard *.d)
clean:
rm -f *.o *.d *.raw *.img *.bin *~
+
+# suppress auto-removal of intermediate files
+.SECONDARY:
+
+.PHONY: all clean
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 003/143] pc-bios/s390-ccw: simplify Makefile
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
2020-08-06 19:13 ` [PATCH 001/143] tests: move socket_scm_helper back to tests/ Paolo Bonzini
2020-08-06 19:13 ` [PATCH 002/143] optionrom: simplify Makefile Paolo Bonzini
@ 2020-08-06 19:13 ` Paolo Bonzini
2020-08-07 12:58 ` Thomas Huth
2020-08-06 19:14 ` [PATCH 004/143] trace: switch position of headers to what Meson requires Paolo Bonzini
` (144 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:13 UTC (permalink / raw)
To: qemu-devel
Make it independent from the rules.mak, and clean up to use pattern rules.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/s390-ccw/Makefile | 105 ++++++++++++++++++++++++++++++++++---------
pc-bios/s390-ccw/netboot.mak | 62 -------------------------
2 files changed, 84 insertions(+), 83 deletions(-)
delete mode 100644 pc-bios/s390-ccw/netboot.mak
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 50bc880..8c266ab 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -1,41 +1,102 @@
-all: build-all
+CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+SRC_DIR := $(dir $(CURRENT_MAKEFILE))
+TOPSRC_DIR := $(SRC_DIR)/../..
+VPATH = $(SRC_DIR)
+
+all:
# Dummy command so that make thinks it has done something
@true
include ../../config-host.mak
-include $(SRC_PATH)/rules.mak
-$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
+quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
+cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2)
-.PHONY : all clean build-all
+override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
+override CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
+override CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
+override CFLAGS += -fno-asynchronous-unwind-tables
+override CFLAGS += $(call cc-option, -fno-stack-protector)
+LDFLAGS += -Wl,-pie -nostdlib
OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o
-QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))
-QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
-QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
-QEMU_CFLAGS += -fno-asynchronous-unwind-tables
-QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
-LDFLAGS += -Wl,-pie -nostdlib
+STRIP ?= strip
-build-all: s390-ccw.img s390-netboot.img
+$(OBJECTS): Makefile
-s390-ccw.elf: $(OBJECTS)
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
+SLOF_DIR := $(SRC_PATH)/roms/SLOF
-STRIP ?= strip
+NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \
-s390-ccw.img: s390-ccw.elf
+LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
+LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
+
+$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
+
+# libc files:
+
+LIBC_CFLAGS := $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
+ -MMD -MP -MT $@ -MF $(@:%.o=%.d)
+
+
+CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
+$(CTYPE_OBJS) : %.o : $(SLOF_DIR)/lib/libc/ctype/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
+ strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
+ memset.o memcpy.o memmove.o memcmp.o
+$(STRING_OBJS) : %.o : $(SLOF_DIR)/lib/libc/string/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
+$(STDLIB_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
+ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
+$(STDIO_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdio/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+sbrk.o: $(SLOF_DIR)/slof/sbrk.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
+
+libc.a: $(LIBCOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
+
+# libnet files:
+
+LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
+ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
+LIBNETCFLAGS := $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC) \
+ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
+
+$(LIBNETOBJS) : %.o : $(SLOF_DIR)/lib/libnet/%.c
+ $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+libnet.a: $(LIBNETOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
+
+%.elf:
+ $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@")
+
+%.img: %.elf
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
-$(OBJECTS): Makefile
+s390-ccw.elf: $(OBJECTS)
+s390-ccw.img: s390-ccw.elf
+all: s390-ccw.img
+
+ifneq ($(wildcard $(SLOF_DIR)/lib/libnet),)
+s390-netboot.elf: $(NETOBJS) libnet.a libc.a
+s390-netboot.elf: LDFLAGS += -Ttext=0x7800000
-ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),)
-include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak
-else
-s390-netboot.img:
- @echo "s390-netboot.img not built since roms/SLOF/ is not available."
+s390-netboot.img: s390-netboot.elf
+all: s390-netboot.img
endif
ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
@@ -43,3 +104,5 @@ ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
clean:
rm -f *.o *.d *.img *.elf *~ *.a
+
+.PHONY : all clean
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
deleted file mode 100644
index 577c023..0000000
--- a/pc-bios/s390-ccw/netboot.mak
+++ /dev/null
@@ -1,62 +0,0 @@
-
-SLOF_DIR := $(SRC_PATH)/roms/SLOF
-
-NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
-
-LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
-LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
-
-NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
-
-$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
-
-s390-netboot.elf: $(NETOBJS) libnet.a libc.a
- $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@")
-
-s390-netboot.img: s390-netboot.elf
- $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
-
-# libc files:
-
-LIBC_CFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
- -MMD -MP -MT $@ -MF $(@:%.o=%.d)
-
-CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
-%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
- strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
- memset.o memcpy.o memmove.o memcmp.o
-%.o : $(SLOF_DIR)/lib/libc/string/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
-%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
- printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
-%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-sbrk.o: $(SLOF_DIR)/slof/sbrk.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
-
-libc.a: $(LIBCOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
-
-# libnet files:
-
-LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
- dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
-LIBNETCFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
- -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
-
-%.o : $(SLOF_DIR)/lib/libnet/%.c
- $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-libnet.a: $(LIBNETOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 004/143] trace: switch position of headers to what Meson requires
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (2 preceding siblings ...)
2020-08-06 19:13 ` [PATCH 003/143] pc-bios/s390-ccw: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 005/143] meson: rename .inc.c files to .inc Paolo Bonzini
` (143 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Meson doesn't enjoy the same flexibility we have with Make in choosing
the include path. In particular the tracing headers are using
$(build_root)/$(<D).
In order to keep the include directives unchanged,
the simplest solution is to generate headers with patterns like
"trace/trace-audio.h" and place forwarding headers in the source tree
such that for example "audio/trace.h" includes "trace/trace-audio.h".
This patch is too ugly to be applied to the Makefiles now. It's only
a way to separate the changes to the tracing header files from the
Meson rewrite of the tracing logic.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitignore | 1 -
Makefile | 46 +++++++++++++++++++-------------
Makefile.objs | 1 -
accel/kvm/trace.h | 1 +
accel/tcg/cputlb.c | 2 +-
accel/tcg/trace.h | 1 +
accel/tcg/user-exec.c | 2 +-
audio/trace.h | 1 +
authz/trace.h | 1 +
backends/tpm/trace.h | 1 +
backends/trace.h | 1 +
block/trace.h | 1 +
chardev/trace.h | 1 +
crypto/trace.h | 1 +
dma-helpers.c | 2 +-
exec.c | 2 +-
gdbstub.c | 2 +-
hw/9pfs/trace.h | 1 +
hw/acpi/trace.h | 1 +
hw/alpha/trace.h | 1 +
hw/arm/trace.h | 1 +
hw/audio/trace.h | 1 +
hw/block/dataplane/trace.h | 1 +
hw/block/trace.h | 1 +
hw/char/trace.h | 1 +
hw/core/cpu.c | 2 +-
hw/core/trace.h | 1 +
hw/display/trace.h | 1 +
hw/dma/trace.h | 1 +
hw/gpio/trace.h | 1 +
hw/hppa/trace.h | 1 +
hw/hyperv/trace.h | 1 +
hw/i2c/trace.h | 1 +
hw/i386/trace.h | 1 +
hw/i386/xen/trace.h | 1 +
hw/ide/trace.h | 1 +
hw/input/trace.h | 1 +
hw/intc/trace.h | 1 +
hw/isa/trace.h | 1 +
hw/mem/trace.h | 1 +
hw/mips/trace.h | 1 +
hw/misc/macio/trace.h | 1 +
hw/misc/trace.h | 1 +
hw/net/trace.h | 1 +
hw/nvram/trace.h | 1 +
hw/pci-host/trace.h | 1 +
hw/pci/trace.h | 1 +
hw/ppc/trace.h | 1 +
hw/rdma/trace.h | 1 +
hw/rdma/vmw/trace.h | 1 +
hw/riscv/trace.h | 1 +
hw/rtc/trace.h | 1 +
hw/s390x/trace.h | 1 +
hw/scsi/trace.h | 1 +
hw/sd/trace.h | 1 +
hw/sparc/trace.h | 1 +
hw/sparc64/trace.h | 1 +
hw/ssi/trace.h | 1 +
hw/timer/trace.h | 1 +
hw/tpm/trace.h | 1 +
hw/usb/trace.h | 1 +
hw/vfio/trace.h | 1 +
hw/virtio/trace.h | 1 +
hw/watchdog/trace.h | 1 +
hw/xen/trace.h | 1 +
include/user/syscall-trace.h | 2 +-
io/trace.h | 1 +
job-qmp.c | 2 +-
job.c | 2 +-
linux-user/trace.h | 1 +
migration/trace.h | 1 +
monitor/trace.h | 1 +
nbd/trace.h | 1 +
net/trace.h | 1 +
qapi/trace.h | 1 +
qom/trace.h | 1 +
scripts/tracetool/format/c.py | 5 +---
scripts/tracetool/format/tcg_h.py | 2 +-
scripts/tracetool/format/tcg_helper_c.py | 2 +-
scsi/trace.h | 1 +
softmmu/balloon.c | 2 +-
softmmu/ioport.c | 2 +-
softmmu/memory.c | 2 +-
softmmu/vl.c | 2 +-
target/arm/trace.h | 1 +
target/hppa/trace.h | 1 +
target/i386/trace.h | 1 +
target/mips/trace.h | 1 +
target/ppc/trace.h | 1 +
target/riscv/trace.h | 1 +
target/s390x/trace.h | 1 +
target/sparc/trace.h | 1 +
trace/control-target.c | 2 +-
trace/control.c | 2 +-
ui/trace.h | 1 +
util/trace.h | 1 +
96 files changed, 121 insertions(+), 41 deletions(-)
create mode 100644 accel/kvm/trace.h
create mode 100644 accel/tcg/trace.h
create mode 100644 audio/trace.h
create mode 100644 authz/trace.h
create mode 100644 backends/tpm/trace.h
create mode 100644 backends/trace.h
create mode 100644 block/trace.h
create mode 100644 chardev/trace.h
create mode 100644 crypto/trace.h
create mode 100644 hw/9pfs/trace.h
create mode 100644 hw/acpi/trace.h
create mode 100644 hw/alpha/trace.h
create mode 100644 hw/arm/trace.h
create mode 100644 hw/audio/trace.h
create mode 100644 hw/block/dataplane/trace.h
create mode 100644 hw/block/trace.h
create mode 100644 hw/char/trace.h
create mode 100644 hw/core/trace.h
create mode 100644 hw/display/trace.h
create mode 100644 hw/dma/trace.h
create mode 100644 hw/gpio/trace.h
create mode 100644 hw/hppa/trace.h
create mode 100644 hw/hyperv/trace.h
create mode 100644 hw/i2c/trace.h
create mode 100644 hw/i386/trace.h
create mode 100644 hw/i386/xen/trace.h
create mode 100644 hw/ide/trace.h
create mode 100644 hw/input/trace.h
create mode 100644 hw/intc/trace.h
create mode 100644 hw/isa/trace.h
create mode 100644 hw/mem/trace.h
create mode 100644 hw/mips/trace.h
create mode 100644 hw/misc/macio/trace.h
create mode 100644 hw/misc/trace.h
create mode 100644 hw/net/trace.h
create mode 100644 hw/nvram/trace.h
create mode 100644 hw/pci-host/trace.h
create mode 100644 hw/pci/trace.h
create mode 100644 hw/ppc/trace.h
create mode 100644 hw/rdma/trace.h
create mode 100644 hw/rdma/vmw/trace.h
create mode 100644 hw/riscv/trace.h
create mode 100644 hw/rtc/trace.h
create mode 100644 hw/s390x/trace.h
create mode 100644 hw/scsi/trace.h
create mode 100644 hw/sd/trace.h
create mode 100644 hw/sparc/trace.h
create mode 100644 hw/sparc64/trace.h
create mode 100644 hw/ssi/trace.h
create mode 100644 hw/timer/trace.h
create mode 100644 hw/tpm/trace.h
create mode 100644 hw/usb/trace.h
create mode 100644 hw/vfio/trace.h
create mode 100644 hw/virtio/trace.h
create mode 100644 hw/watchdog/trace.h
create mode 100644 hw/xen/trace.h
create mode 100644 io/trace.h
create mode 100644 linux-user/trace.h
create mode 100644 migration/trace.h
create mode 100644 monitor/trace.h
create mode 100644 nbd/trace.h
create mode 100644 net/trace.h
create mode 100644 qapi/trace.h
create mode 100644 qom/trace.h
create mode 100644 scsi/trace.h
create mode 100644 target/arm/trace.h
create mode 100644 target/hppa/trace.h
create mode 100644 target/i386/trace.h
create mode 100644 target/mips/trace.h
create mode 100644 target/ppc/trace.h
create mode 100644 target/riscv/trace.h
create mode 100644 target/s390x/trace.h
create mode 100644 target/sparc/trace.h
create mode 100644 ui/trace.h
create mode 100644 util/trace.h
diff --git a/.gitignore b/.gitignore
index 2992d15..656e390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,7 +146,6 @@ docker-src.*
*~
*.ast_raw
*.depend_raw
-trace.h
trace.c
trace-ust.h
trace-ust.h
diff --git a/Makefile b/Makefile
index 13dd708..00cadeb 100644
--- a/Makefile
+++ b/Makefile
@@ -159,8 +159,8 @@ generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.c
generated-files-y += module_block.h
-TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h)
-TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c)
+TRACE_HEADERS = trace/trace-root.h
+TRACE_SOURCES = trace/trace-root.c
TRACE_DTRACE =
ifdef CONFIG_TRACE_DTRACE
TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h)
@@ -170,33 +170,37 @@ ifdef CONFIG_TRACE_UST
TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)
endif
-generated-files-y += $(TRACE_HEADERS)
-generated-files-y += $(TRACE_SOURCES)
generated-files-y += $(BUILD_DIR)/trace-events-all
generated-files-y += .git-submodule-status
trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
+trace-group-suffix = $(shell echo $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
tracetool-y = $(SRC_PATH)/scripts/tracetool.py
tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-%/trace.h: %/trace.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+define __trace_rules
+TRACE_HEADERS += trace/trace-$2.h
+TRACE_SOURCES += trace/trace-$2.c
+trace-obj-y += trace/trace-$2.o
+trace/trace-$2.h: trace/trace-$2.h-timestamp
+ @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
+trace/trace-$2.h-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \
- --group=$(call trace-group-name,$@) \
+ --group=$2 \
--format=h \
--backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
+ $$< > $$@,"GEN","$$(@:%-timestamp=%)")
-%/trace.c: %/trace.c-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-$2.c: trace/trace-$2.c-timestamp
+ @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
+trace/trace-$2.c-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \
- --group=$(call trace-group-name,$@) \
+ --group=$2 \
--format=c \
--backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
+ $$< > $$@,"GEN","$$(@:%-timestamp=%)")
+endef
%/trace-ust.h: %/trace-ust.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
@@ -222,18 +226,18 @@ tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
%/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y)
-trace-root.h: trace-root.h-timestamp
+trace/trace-root.h: trace/trace-root.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \
--group=root \
--format=h \
--backends=$(TRACE_BACKENDS) \
$< > $@,"GEN","$(@:%-timestamp=%)")
-trace-root.c: trace-root.c-timestamp
+trace/trace-root.c: trace/trace-root.c-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \
--group=root \
--format=c \
@@ -477,6 +481,12 @@ dummy := $(call unnest-vars,, \
common-obj-m \
trace-obj-y)
+dummy := $(foreach DIR,$(trace-events-subdirs),$(eval $(call __trace_rules,$(DIR),$(call trace-group-suffix,$(DIR)))))
+
+generated-files-y += $(TRACE_HEADERS)
+generated-files-y += $(TRACE_SOURCES)
+
+
include $(SRC_PATH)/tests/Makefile.include
all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules $(vhost-user-json-y)
diff --git a/Makefile.objs b/Makefile.objs
index d22b3b4..3823463 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -209,7 +209,6 @@ trace-events-subdirs += util
trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)
trace-obj-y = trace-root.o
-trace-obj-y += $(trace-events-subdirs:%=%/trace.o)
trace-obj-$(CONFIG_TRACE_UST) += trace-ust-all.o
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace-root.o
trace-obj-$(CONFIG_TRACE_DTRACE) += $(trace-events-subdirs:%=%/trace-dtrace.o)
diff --git a/accel/kvm/trace.h b/accel/kvm/trace.h
new file mode 100644
index 0000000..67c935a
--- /dev/null
+++ b/accel/kvm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-accel_kvm.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 5698292..5349ee6 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -34,7 +34,7 @@
#include "qemu/atomic.h"
#include "qemu/atomic128.h"
#include "translate-all.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "trace/mem.h"
#ifdef CONFIG_PLUGIN
#include "qemu/plugin-memory.h"
diff --git a/accel/tcg/trace.h b/accel/tcg/trace.h
new file mode 100644
index 0000000..db61fad
--- /dev/null
+++ b/accel/tcg/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-accel_tcg.h"
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index d8b027f..1d34c57 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -26,7 +26,7 @@
#include "translate-all.h"
#include "exec/helper-proto.h"
#include "qemu/atomic128.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "trace/mem.h"
#undef EAX
diff --git a/audio/trace.h b/audio/trace.h
new file mode 100644
index 0000000..4072a11
--- /dev/null
+++ b/audio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-audio.h"
diff --git a/authz/trace.h b/authz/trace.h
new file mode 100644
index 0000000..3176c12
--- /dev/null
+++ b/authz/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-authz.h"
diff --git a/backends/tpm/trace.h b/backends/tpm/trace.h
new file mode 100644
index 0000000..40c4729
--- /dev/null
+++ b/backends/tpm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-backends_tpm.h"
diff --git a/backends/trace.h b/backends/trace.h
new file mode 100644
index 0000000..77fe57f3
--- /dev/null
+++ b/backends/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-backends.h"
diff --git a/block/trace.h b/block/trace.h
new file mode 100644
index 0000000..3a436e6
--- /dev/null
+++ b/block/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-block.h"
diff --git a/chardev/trace.h b/chardev/trace.h
new file mode 100644
index 0000000..eb4f902
--- /dev/null
+++ b/chardev/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-chardev.h"
diff --git a/crypto/trace.h b/crypto/trace.h
new file mode 100644
index 0000000..a9af0f3
--- /dev/null
+++ b/crypto/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-crypto.h"
diff --git a/dma-helpers.c b/dma-helpers.c
index 2a77b5a..41ef24a 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "sysemu/block-backend.h"
#include "sysemu/dma.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "qemu/thread.h"
#include "qemu/main-loop.h"
#include "sysemu/cpus.h"
diff --git a/exec.c b/exec.c
index 6f381f9..8047bf2 100644
--- a/exec.c
+++ b/exec.c
@@ -50,7 +50,7 @@
#include "sysemu/hw_accel.h"
#include "exec/address-spaces.h"
#include "sysemu/xen-mapcache.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
#include <linux/falloc.h>
diff --git a/gdbstub.c b/gdbstub.c
index f3a318c..9dfb6e4 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
diff --git a/hw/9pfs/trace.h b/hw/9pfs/trace.h
new file mode 100644
index 0000000..6104fe2
--- /dev/null
+++ b/hw/9pfs/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_9pfs.h"
diff --git a/hw/acpi/trace.h b/hw/acpi/trace.h
new file mode 100644
index 0000000..a7f7da7
--- /dev/null
+++ b/hw/acpi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_acpi.h"
diff --git a/hw/alpha/trace.h b/hw/alpha/trace.h
new file mode 100644
index 0000000..20fe698
--- /dev/null
+++ b/hw/alpha/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_alpha.h"
diff --git a/hw/arm/trace.h b/hw/arm/trace.h
new file mode 100644
index 0000000..91337aa
--- /dev/null
+++ b/hw/arm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_arm.h"
diff --git a/hw/audio/trace.h b/hw/audio/trace.h
new file mode 100644
index 0000000..5c7516a
--- /dev/null
+++ b/hw/audio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_audio.h"
diff --git a/hw/block/dataplane/trace.h b/hw/block/dataplane/trace.h
new file mode 100644
index 0000000..240cc59
--- /dev/null
+++ b/hw/block/dataplane/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_block_dataplane.h"
diff --git a/hw/block/trace.h b/hw/block/trace.h
new file mode 100644
index 0000000..cde210a
--- /dev/null
+++ b/hw/block/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_block.h"
diff --git a/hw/char/trace.h b/hw/char/trace.h
new file mode 100644
index 0000000..c2df66a
--- /dev/null
+++ b/hw/char/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_char.h"
diff --git a/hw/core/cpu.c b/hw/core/cpu.c
index 594441a..22bc3f9 100644
--- a/hw/core/cpu.c
+++ b/hw/core/cpu.c
@@ -31,7 +31,7 @@
#include "sysemu/tcg.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "qemu/plugin.h"
CPUInterruptHandler cpu_interrupt_handler;
diff --git a/hw/core/trace.h b/hw/core/trace.h
new file mode 100644
index 0000000..23dfd61
--- /dev/null
+++ b/hw/core/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_core.h"
diff --git a/hw/display/trace.h b/hw/display/trace.h
new file mode 100644
index 0000000..4ed0e91
--- /dev/null
+++ b/hw/display/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_display.h"
diff --git a/hw/dma/trace.h b/hw/dma/trace.h
new file mode 100644
index 0000000..4bcb28b
--- /dev/null
+++ b/hw/dma/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_dma.h"
diff --git a/hw/gpio/trace.h b/hw/gpio/trace.h
new file mode 100644
index 0000000..8b13907
--- /dev/null
+++ b/hw/gpio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_gpio.h"
diff --git a/hw/hppa/trace.h b/hw/hppa/trace.h
new file mode 100644
index 0000000..4e8b52d
--- /dev/null
+++ b/hw/hppa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_hppa.h"
diff --git a/hw/hyperv/trace.h b/hw/hyperv/trace.h
new file mode 100644
index 0000000..7f2a888
--- /dev/null
+++ b/hw/hyperv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_hyperv.h"
diff --git a/hw/i2c/trace.h b/hw/i2c/trace.h
new file mode 100644
index 0000000..4843a8d
--- /dev/null
+++ b/hw/i2c/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i2c.h"
diff --git a/hw/i386/trace.h b/hw/i386/trace.h
new file mode 100644
index 0000000..37a9f67
--- /dev/null
+++ b/hw/i386/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i386.h"
diff --git a/hw/i386/xen/trace.h b/hw/i386/xen/trace.h
new file mode 100644
index 0000000..a02bf75
--- /dev/null
+++ b/hw/i386/xen/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i386_xen.h"
diff --git a/hw/ide/trace.h b/hw/ide/trace.h
new file mode 100644
index 0000000..e060e0a
--- /dev/null
+++ b/hw/ide/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ide.h"
diff --git a/hw/input/trace.h b/hw/input/trace.h
new file mode 100644
index 0000000..d1cc5d9
--- /dev/null
+++ b/hw/input/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_input.h"
diff --git a/hw/intc/trace.h b/hw/intc/trace.h
new file mode 100644
index 0000000..02394ae
--- /dev/null
+++ b/hw/intc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_intc.h"
diff --git a/hw/isa/trace.h b/hw/isa/trace.h
new file mode 100644
index 0000000..501205c
--- /dev/null
+++ b/hw/isa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_isa.h"
diff --git a/hw/mem/trace.h b/hw/mem/trace.h
new file mode 100644
index 0000000..2f2c945
--- /dev/null
+++ b/hw/mem/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_mem.h"
diff --git a/hw/mips/trace.h b/hw/mips/trace.h
new file mode 100644
index 0000000..8d1fd7c
--- /dev/null
+++ b/hw/mips/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_mips.h"
diff --git a/hw/misc/macio/trace.h b/hw/misc/macio/trace.h
new file mode 100644
index 0000000..34a3cf1
--- /dev/null
+++ b/hw/misc/macio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_misc_macio.h"
diff --git a/hw/misc/trace.h b/hw/misc/trace.h
new file mode 100644
index 0000000..1ab6923
--- /dev/null
+++ b/hw/misc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_misc.h"
diff --git a/hw/net/trace.h b/hw/net/trace.h
new file mode 100644
index 0000000..93249af
--- /dev/null
+++ b/hw/net/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_net.h"
diff --git a/hw/nvram/trace.h b/hw/nvram/trace.h
new file mode 100644
index 0000000..88fa900
--- /dev/null
+++ b/hw/nvram/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_nvram.h"
diff --git a/hw/pci-host/trace.h b/hw/pci-host/trace.h
new file mode 100644
index 0000000..93ec814
--- /dev/null
+++ b/hw/pci-host/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_pci_host.h"
diff --git a/hw/pci/trace.h b/hw/pci/trace.h
new file mode 100644
index 0000000..3dd773e
--- /dev/null
+++ b/hw/pci/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_pci.h"
diff --git a/hw/ppc/trace.h b/hw/ppc/trace.h
new file mode 100644
index 0000000..87c4198
--- /dev/null
+++ b/hw/ppc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ppc.h"
diff --git a/hw/rdma/trace.h b/hw/rdma/trace.h
new file mode 100644
index 0000000..b3fa8eb
--- /dev/null
+++ b/hw/rdma/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rdma.h"
diff --git a/hw/rdma/vmw/trace.h b/hw/rdma/vmw/trace.h
new file mode 100644
index 0000000..3ebc9fb
--- /dev/null
+++ b/hw/rdma/vmw/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rdma_vmw.h"
diff --git a/hw/riscv/trace.h b/hw/riscv/trace.h
new file mode 100644
index 0000000..8c0e3ca
--- /dev/null
+++ b/hw/riscv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_riscv.h"
diff --git a/hw/rtc/trace.h b/hw/rtc/trace.h
new file mode 100644
index 0000000..cfd5d6e
--- /dev/null
+++ b/hw/rtc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rtc.h"
diff --git a/hw/s390x/trace.h b/hw/s390x/trace.h
new file mode 100644
index 0000000..d6568b3
--- /dev/null
+++ b/hw/s390x/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_s390x.h"
diff --git a/hw/scsi/trace.h b/hw/scsi/trace.h
new file mode 100644
index 0000000..4ce2673
--- /dev/null
+++ b/hw/scsi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_scsi.h"
diff --git a/hw/sd/trace.h b/hw/sd/trace.h
new file mode 100644
index 0000000..f3d0c58
--- /dev/null
+++ b/hw/sd/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sd.h"
diff --git a/hw/sparc/trace.h b/hw/sparc/trace.h
new file mode 100644
index 0000000..625d60c
--- /dev/null
+++ b/hw/sparc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sparc.h"
diff --git a/hw/sparc64/trace.h b/hw/sparc64/trace.h
new file mode 100644
index 0000000..b6ef6e6
--- /dev/null
+++ b/hw/sparc64/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sparc64.h"
diff --git a/hw/ssi/trace.h b/hw/ssi/trace.h
new file mode 100644
index 0000000..0c1de26
--- /dev/null
+++ b/hw/ssi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ssi.h"
diff --git a/hw/timer/trace.h b/hw/timer/trace.h
new file mode 100644
index 0000000..5f72c44
--- /dev/null
+++ b/hw/timer/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_timer.h"
diff --git a/hw/tpm/trace.h b/hw/tpm/trace.h
new file mode 100644
index 0000000..9827c12
--- /dev/null
+++ b/hw/tpm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_tpm.h"
diff --git a/hw/usb/trace.h b/hw/usb/trace.h
new file mode 100644
index 0000000..f3962f2
--- /dev/null
+++ b/hw/usb/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_usb.h"
diff --git a/hw/vfio/trace.h b/hw/vfio/trace.h
new file mode 100644
index 0000000..5a343aa
--- /dev/null
+++ b/hw/vfio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_vfio.h"
diff --git a/hw/virtio/trace.h b/hw/virtio/trace.h
new file mode 100644
index 0000000..5d70970
--- /dev/null
+++ b/hw/virtio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_virtio.h"
diff --git a/hw/watchdog/trace.h b/hw/watchdog/trace.h
new file mode 100644
index 0000000..5d84957
--- /dev/null
+++ b/hw/watchdog/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_watchdog.h"
diff --git a/hw/xen/trace.h b/hw/xen/trace.h
new file mode 100644
index 0000000..adba31a
--- /dev/null
+++ b/hw/xen/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_xen.h"
diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index 79fd3e5..42e3b48 100644
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -10,7 +10,7 @@
#ifndef _SYSCALL_TRACE_H_
#define _SYSCALL_TRACE_H_
-#include "trace-root.h"
+#include "trace/trace-root.h"
/*
* These helpers just provide a common place for the various
diff --git a/io/trace.h b/io/trace.h
new file mode 100644
index 0000000..92d63a5
--- /dev/null
+++ b/io/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-io.h"
diff --git a/job-qmp.c b/job-qmp.c
index f9a5883..645601b 100644
--- a/job-qmp.c
+++ b/job-qmp.c
@@ -27,7 +27,7 @@
#include "qemu/job.h"
#include "qapi/qapi-commands-job.h"
#include "qapi/error.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
/* Get a job using its ID and acquire its AioContext */
static Job *find_job(const char *id, AioContext **aio_context, Error **errp)
diff --git a/job.c b/job.c
index 53be57a..8fecf38 100644
--- a/job.c
+++ b/job.c
@@ -29,7 +29,7 @@
#include "qemu/id.h"
#include "qemu/main-loop.h"
#include "block/aio-wait.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "qapi/qapi-events-job.h"
static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs);
diff --git a/linux-user/trace.h b/linux-user/trace.h
new file mode 100644
index 0000000..05518e4
--- /dev/null
+++ b/linux-user/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-linux_user.h"
diff --git a/migration/trace.h b/migration/trace.h
new file mode 100644
index 0000000..e1a0f4f
--- /dev/null
+++ b/migration/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-migration.h"
diff --git a/monitor/trace.h b/monitor/trace.h
new file mode 100644
index 0000000..f216e31
--- /dev/null
+++ b/monitor/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-monitor.h"
diff --git a/nbd/trace.h b/nbd/trace.h
new file mode 100644
index 0000000..233d08f
--- /dev/null
+++ b/nbd/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-nbd.h"
diff --git a/net/trace.h b/net/trace.h
new file mode 100644
index 0000000..18d42c2
--- /dev/null
+++ b/net/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-net.h"
diff --git a/qapi/trace.h b/qapi/trace.h
new file mode 100644
index 0000000..5c3fb67
--- /dev/null
+++ b/qapi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-qapi.h"
diff --git a/qom/trace.h b/qom/trace.h
new file mode 100644
index 0000000..f2895e6
--- /dev/null
+++ b/qom/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-qom.h"
diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
index 23d82ea..c390c18 100644
--- a/scripts/tracetool/format/c.py
+++ b/scripts/tracetool/format/c.py
@@ -19,10 +19,7 @@ def generate(events, backend, group):
active_events = [e for e in events
if "disable" not in e.properties]
- if group == "root":
- header = "trace-root.h"
- else:
- header = "trace.h"
+ header = "trace-" + group + ".h"
out('/* This file is autogenerated by tracetool, do not edit. */',
'',
diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py
index 33cf6a3..4d84440 100644
--- a/scripts/tracetool/format/tcg_h.py
+++ b/scripts/tracetool/format/tcg_h.py
@@ -28,7 +28,7 @@ def vcpu_transform_args(args):
def generate(events, backend, group):
if group == "root":
- header = "trace-root.h"
+ header = "trace/trace-root.h"
else:
header = "trace.h"
diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
index 2db6317..72576e6 100644
--- a/scripts/tracetool/format/tcg_helper_c.py
+++ b/scripts/tracetool/format/tcg_helper_c.py
@@ -41,7 +41,7 @@ def vcpu_transform_args(args, mode):
def generate(events, backend, group):
if group == "root":
- header = "trace-root.h"
+ header = "trace/trace-root.h"
else:
header = "trace.h"
diff --git a/scsi/trace.h b/scsi/trace.h
new file mode 100644
index 0000000..3e4d89a
--- /dev/null
+++ b/scsi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-scsi.h"
diff --git a/softmmu/balloon.c b/softmmu/balloon.c
index 354408c..b89646f 100644
--- a/softmmu/balloon.c
+++ b/softmmu/balloon.c
@@ -28,7 +28,7 @@
#include "qemu/atomic.h"
#include "sysemu/kvm.h"
#include "sysemu/balloon.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qmp/qerror.h"
diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index 04e360e..a799697 100644
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -28,7 +28,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/ioport.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
diff --git a/softmmu/memory.c b/softmmu/memory.c
index af25987..70b9310 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -24,7 +24,7 @@
#include "qemu/main-loop.h"
#include "qemu/qemu-print.h"
#include "qom/object.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 4eb9d1f..0cc86b0 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -90,7 +90,7 @@
#include "disas/disas.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "trace/control.h"
#include "qemu/plugin.h"
#include "qemu/queue.h"
diff --git a/target/arm/trace.h b/target/arm/trace.h
new file mode 100644
index 0000000..60372d8
--- /dev/null
+++ b/target/arm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_arm.h"
diff --git a/target/hppa/trace.h b/target/hppa/trace.h
new file mode 100644
index 0000000..810cc09
--- /dev/null
+++ b/target/hppa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_hppa.h"
diff --git a/target/i386/trace.h b/target/i386/trace.h
new file mode 100644
index 0000000..781e8ec
--- /dev/null
+++ b/target/i386/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_i386.h"
diff --git a/target/mips/trace.h b/target/mips/trace.h
new file mode 100644
index 0000000..f25b88c
--- /dev/null
+++ b/target/mips/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_mips.h"
diff --git a/target/ppc/trace.h b/target/ppc/trace.h
new file mode 100644
index 0000000..a9e8962
--- /dev/null
+++ b/target/ppc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_ppc.h"
diff --git a/target/riscv/trace.h b/target/riscv/trace.h
new file mode 100644
index 0000000..03a89fc
--- /dev/null
+++ b/target/riscv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_riscv.h"
diff --git a/target/s390x/trace.h b/target/s390x/trace.h
new file mode 100644
index 0000000..d7d59d4
--- /dev/null
+++ b/target/s390x/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_s390x.h"
diff --git a/target/sparc/trace.h b/target/sparc/trace.h
new file mode 100644
index 0000000..3b2f5a8
--- /dev/null
+++ b/target/sparc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_sparc.h"
diff --git a/trace/control-target.c b/trace/control-target.c
index ceb55c7..e293eee 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
#include "trace/control.h"
diff --git a/trace/control.c b/trace/control.c
index 6558b5c..c63a4de 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -27,7 +27,7 @@
#include "qemu/error-report.h"
#include "qemu/config-file.h"
#include "monitor/monitor.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
int trace_events_enabled_count;
diff --git a/ui/trace.h b/ui/trace.h
new file mode 100644
index 0000000..a89d769
--- /dev/null
+++ b/ui/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-ui.h"
diff --git a/util/trace.h b/util/trace.h
new file mode 100644
index 0000000..86ff7a3
--- /dev/null
+++ b/util/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-util.h"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (3 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 004/143] trace: switch position of headers to what Meson requires Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 8:59 ` Peter Maydell
2020-08-06 19:14 ` [PATCH 006/143] build-sys hack: ensure target directory is there Paolo Bonzini
` (142 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitignore | 2 +-
.../tcg/{atomic_common.inc.c => atomic_common.inc} | 0
accel/tcg/cputlb.c | 2 +-
accel/tcg/user-exec.c | 2 +-
contrib/gitdm/filetypes.txt | 2 +-
exec.c | 4 +--
...t-specialize.inc.c => softfloat-specialize.inc} | 0
fpu/softfloat.c | 2 +-
include/tcg/tcg.h | 2 +-
memory_ldst.inc.c => memory_ldst.inc | 0
scripts/clean-includes | 2 +-
target/arm/Makefile.objs | 40 +++++++++++-----------
.../{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 | 4 +--
target/avr/disas.c | 2 +-
target/avr/translate.c | 2 +-
target/cris/translate.c | 2 +-
.../{translate_v10.inc.c => translate_v10.inc} | 0
target/hppa/Makefile.objs | 4 +--
target/hppa/translate.c | 2 +-
target/mips/translate.c | 2 +-
.../{translate_init.inc.c => translate_init.inc} | 0
target/openrisc/Makefile.objs | 6 ++--
target/openrisc/disas.c | 2 +-
target/openrisc/translate.c | 2 +-
target/ppc/int_helper.c | 2 +-
target/ppc/{mfrom_table.inc.c => mfrom_table.inc} | 0
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 | 8 ++---
...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/translate.c | 20 +++++------
target/rx/Makefile.objs | 6 ++--
target/rx/disas.c | 2 +-
target/rx/translate.c | 2 +-
target/s390x/translate.c | 2 +-
.../s390x/{translate_vx.inc.c => translate_vx.inc} | 0
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 ++---
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/fp/fp-test.c | 2 +-
tests/fp/{wrap.inc.c => wrap.inc} | 0
ui/vnc-enc-zrle.c | 22 ++++++------
ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc} | 0
96 files changed, 137 insertions(+), 137 deletions(-)
rename accel/tcg/{atomic_common.inc.c => atomic_common.inc} (100%)
rename fpu/{softfloat-specialize.inc.c => softfloat-specialize.inc} (100%)
rename memory_ldst.inc.c => memory_ldst.inc (100%)
rename target/arm/{translate-neon.inc.c => translate-neon.inc} (99%)
rename target/arm/{translate-vfp.inc.c => translate-vfp.inc} (99%)
rename target/cris/{translate_v10.inc.c => translate_v10.inc} (100%)
rename target/mips/{translate_init.inc.c => translate_init.inc} (100%)
rename target/ppc/{mfrom_table.inc.c => mfrom_table.inc} (100%)
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%)
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%)
rename target/s390x/{translate_vx.inc.c => translate_vx.inc} (100%)
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%)
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%)
rename tests/fp/{wrap.inc.c => wrap.inc} (100%)
rename ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.inc} (100%)
diff --git a/.gitignore b/.gitignore
index 656e390..de1f20e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,4 +161,4 @@ trace-dtrace-root.h
trace-dtrace-root.dtrace
trace-ust-all.h
trace-ust-all.c
-/target/arm/decode-sve.inc.c
+/target/arm/decode-sve.inc
diff --git a/accel/tcg/atomic_common.inc.c b/accel/tcg/atomic_common.inc
similarity index 100%
rename from accel/tcg/atomic_common.inc.c
rename to accel/tcg/atomic_common.inc
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 5349ee6..ca4c982 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -2354,7 +2354,7 @@ void cpu_stq_le_data(CPUArchState *env, target_ulong ptr, uint64_t val)
#define ATOMIC_MMU_CLEANUP
#define ATOMIC_MMU_IDX get_mmuidx(oi)
-#include "atomic_common.inc.c"
+#include "atomic_common.inc"
#define DATA_SIZE 1
#include "atomic_template.h"
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 1d34c57..e219ecc 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -1189,7 +1189,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr,
#define ATOMIC_NAME(X) HELPER(glue(glue(atomic_ ## X, SUFFIX), END))
#define EXTRA_ARGS
-#include "atomic_common.inc.c"
+#include "atomic_common.inc"
#define DATA_SIZE 1
#include "atomic_template.h"
diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
index 2d5002f..e8e2628 100644
--- a/contrib/gitdm/filetypes.txt
+++ b/contrib/gitdm/filetypes.txt
@@ -42,7 +42,7 @@ order build,interface,tests,code,documentation,devel-doc,blobs
# (most common languages first
#
filetype code \.c$ # C
-filetype code \.inc.c$ # C
+filetype code \.inc$ # C
filetype code \.C$ # C++
filetype code \.cpp$ # C++
filetype code \.c\+\+$ # C++
diff --git a/exec.c b/exec.c
index 8047bf2..f5915ce 100644
--- a/exec.c
+++ b/exec.c
@@ -3659,7 +3659,7 @@ void cpu_physical_memory_unmap(void *buffer, hwaddr len,
#define TRANSLATE(...) address_space_translate(as, __VA_ARGS__)
#define RCU_READ_LOCK(...) rcu_read_lock()
#define RCU_READ_UNLOCK(...) rcu_read_unlock()
-#include "memory_ldst.inc.c"
+#include "memory_ldst.inc"
int64_t address_space_cache_init(MemoryRegionCache *cache,
AddressSpace *as,
@@ -3795,7 +3795,7 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,
#define TRANSLATE(...) address_space_translate_cached(cache, __VA_ARGS__)
#define RCU_READ_LOCK() ((void)0)
#define RCU_READ_UNLOCK() ((void)0)
-#include "memory_ldst.inc.c"
+#include "memory_ldst.inc"
/* virtual memory access for debug (includes writing to ROM) */
int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
diff --git a/fpu/softfloat-specialize.inc.c b/fpu/softfloat-specialize.inc
similarity index 100%
rename from fpu/softfloat-specialize.inc.c
rename to fpu/softfloat-specialize.inc
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 79be4f5..7fb1f3b 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -621,7 +621,7 @@ static inline float64 float64_pack_raw(FloatParts p)
| are propagated from function inputs to output. These details are target-
| specific.
*----------------------------------------------------------------------------*/
-#include "softfloat-specialize.inc.c"
+#include "softfloat-specialize.inc"
/* Canonicalize EXP and FRAC, setting CLS. */
static FloatParts sf_canonicalize(FloatParts part, const FloatFmt *parm,
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index e63450a..89fa9cf 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -636,7 +636,7 @@ struct TCGContext {
/* Track which vCPU triggers events */
CPUState *cpu; /* *_trans */
- /* These structures are private to tcg-target.inc.c. */
+ /* These structures are private to tcg-target.inc. */
#ifdef TCG_TARGET_NEED_LDST_LABELS
QSIMPLEQ_HEAD(, TCGLabelQemuLdst) ldst_labels;
#endif
diff --git a/memory_ldst.inc.c b/memory_ldst.inc
similarity index 100%
rename from memory_ldst.inc.c
rename to memory_ldst.inc
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 795b3be..ff2dbe8 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -113,7 +113,7 @@ EOT
for f in "$@"; do
case "$f" in
- *.inc.c)
+ *.inc)
# These aren't standalone C source files
echo "SKIPPING $f (not a standalone source file)"
continue
diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs
index fa39fd7..4a177ad 100644
--- a/target/arm/Makefile.objs
+++ b/target/arm/Makefile.objs
@@ -13,66 +13,66 @@ obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-target/arm/decode-sve.inc.c: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE)
+target/arm/decode-sve.inc: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --decode disas_sve -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-neon-shared.inc.c: $(SRC_PATH)/target/arm/neon-shared.decode $(DECODETREE)
+target/arm/decode-neon-shared.inc: $(SRC_PATH)/target/arm/neon-shared.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_neon_shared -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-neon-dp.inc.c: $(SRC_PATH)/target/arm/neon-dp.decode $(DECODETREE)
+target/arm/decode-neon-dp.inc: $(SRC_PATH)/target/arm/neon-dp.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_neon_dp -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-neon-ls.inc.c: $(SRC_PATH)/target/arm/neon-ls.decode $(DECODETREE)
+target/arm/decode-neon-ls.inc: $(SRC_PATH)/target/arm/neon-ls.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_neon_ls -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-vfp.inc.c: $(SRC_PATH)/target/arm/vfp.decode $(DECODETREE)
+target/arm/decode-vfp.inc: $(SRC_PATH)/target/arm/vfp.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_vfp -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-vfp-uncond.inc.c: $(SRC_PATH)/target/arm/vfp-uncond.decode $(DECODETREE)
+target/arm/decode-vfp-uncond.inc: $(SRC_PATH)/target/arm/vfp-uncond.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-a32.inc.c: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE)
+target/arm/decode-a32.inc: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_a32 -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-a32-uncond.inc.c: $(SRC_PATH)/target/arm/a32-uncond.decode $(DECODETREE)
+target/arm/decode-a32-uncond.inc: $(SRC_PATH)/target/arm/a32-uncond.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_a32_uncond -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-t32.inc.c: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE)
+target/arm/decode-t32.inc: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --static-decode disas_t32 -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/decode-t16.inc.c: $(SRC_PATH)/target/arm/t16.decode $(DECODETREE)
+target/arm/decode-t16.inc: $(SRC_PATH)/target/arm/t16.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) -w 16 --static-decode disas_t16 -o $@ $<,\
"GEN", $(TARGET_DIR)$@)
-target/arm/translate-sve.o: target/arm/decode-sve.inc.c
-target/arm/translate.o: target/arm/decode-neon-shared.inc.c
-target/arm/translate.o: target/arm/decode-neon-dp.inc.c
-target/arm/translate.o: target/arm/decode-neon-ls.inc.c
-target/arm/translate.o: target/arm/decode-vfp.inc.c
-target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c
-target/arm/translate.o: target/arm/decode-a32.inc.c
-target/arm/translate.o: target/arm/decode-a32-uncond.inc.c
-target/arm/translate.o: target/arm/decode-t32.inc.c
-target/arm/translate.o: target/arm/decode-t16.inc.c
+target/arm/translate-sve.o: target/arm/decode-sve.inc
+target/arm/translate.o: target/arm/decode-neon-shared.inc
+target/arm/translate.o: target/arm/decode-neon-dp.inc
+target/arm/translate.o: target/arm/decode-neon-ls.inc
+target/arm/translate.o: target/arm/decode-vfp.inc
+target/arm/translate.o: target/arm/decode-vfp-uncond.inc
+target/arm/translate.o: target/arm/decode-a32.inc
+target/arm/translate.o: target/arm/decode-a32-uncond.inc
+target/arm/translate.o: target/arm/decode-t32.inc
+target/arm/translate.o: target/arm/decode-t16.inc
obj-y += tlb_helper.o debug_helper.o
obj-y += translate.o op_helper.o
diff --git a/target/arm/translate-neon.inc.c b/target/arm/translate-neon.inc
similarity index 99%
rename from target/arm/translate-neon.inc.c
rename to target/arm/translate-neon.inc
index f6cb921..ac0ddcc 100644
--- a/target/arm/translate-neon.inc.c
+++ b/target/arm/translate-neon.inc
@@ -50,9 +50,9 @@ static inline int rsub_8(DisasContext *s, int x)
}
/* Include the generated Neon decoder */
-#include "decode-neon-dp.inc.c"
-#include "decode-neon-ls.inc.c"
-#include "decode-neon-shared.inc.c"
+#include "decode-neon-dp.inc"
+#include "decode-neon-ls.inc"
+#include "decode-neon-shared.inc"
/* Return the offset of a 2**SIZE piece of a NEON register, at index ELE,
* where 0 is the least significant end of the register.
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 88a2fb2..60c0716 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -100,7 +100,7 @@ static inline int msz_dtype(DisasContext *s, int msz)
* Include the generated decoder.
*/
-#include "decode-sve.inc.c"
+#include "decode-sve.inc"
/*
* Implement all of the translator functions referenced by the decoder.
diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc
similarity index 99%
rename from target/arm/translate-vfp.inc.c
rename to target/arm/translate-vfp.inc
index afa8a5f..1f518b4 100644
--- a/target/arm/translate-vfp.inc.c
+++ b/target/arm/translate-vfp.inc
@@ -27,8 +27,8 @@
*/
/* Include the generated VFP decoder */
-#include "decode-vfp.inc.c"
-#include "decode-vfp-uncond.inc.c"
+#include "decode-vfp.inc"
+#include "decode-vfp-uncond.inc"
/*
* The imm8 encodes the sign bit, enough bits to represent an exponent in
diff --git a/target/arm/translate.c b/target/arm/translate.c
index c39a929..3128fa6 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -1176,8 +1176,8 @@ static TCGv_ptr vfp_reg_ptr(bool dp, int reg)
#define ARM_CP_RW_BIT (1 << 20)
/* Include the VFP and Neon decoders */
-#include "translate-vfp.inc.c"
-#include "translate-neon.inc.c"
+#include "translate-vfp.inc"
+#include "translate-neon.inc"
static inline void iwmmxt_load_reg(TCGv_i64 var, int reg)
{
@@ -5217,10 +5217,10 @@ static int t16_pop_list(DisasContext *s, int x)
* Include the generated decoders.
*/
-#include "decode-a32.inc.c"
-#include "decode-a32-uncond.inc.c"
-#include "decode-t32.inc.c"
-#include "decode-t16.inc.c"
+#include "decode-a32.inc"
+#include "decode-a32-uncond.inc"
+#include "decode-t32.inc"
+#include "decode-t16.inc"
/* Helpers to swap operands for reverse-subtract. */
static void gen_rsb(TCGv_i32 dst, TCGv_i32 a, TCGv_i32 b)
diff --git a/target/avr/Makefile.objs b/target/avr/Makefile.objs
index 6e35ba2..81d9bcd 100644
--- a/target/avr/Makefile.objs
+++ b/target/avr/Makefile.objs
@@ -21,12 +21,12 @@
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
decode-y = $(SRC_PATH)/target/avr/insn.decode
-target/avr/decode_insn.inc.c: $(decode-y) $(DECODETREE)
+target/avr/decode_insn.inc: $(decode-y) $(DECODETREE)
$(call quiet-command, \
$(PYTHON) $(DECODETREE) -o $@ --decode decode_insn --insnwidth 16 $<, \
"GEN", $(TARGET_DIR)$@)
-target/avr/translate.o: target/avr/decode_insn.inc.c
+target/avr/translate.o: target/avr/decode_insn.inc
obj-y += translate.o cpu.o helper.o
obj-y += gdbstub.o
diff --git a/target/avr/disas.c b/target/avr/disas.c
index 8e1bac4..c45ab2c 100644
--- a/target/avr/disas.c
+++ b/target/avr/disas.c
@@ -60,7 +60,7 @@ static int append_16(DisasContext *ctx, int x)
/* Include the auto-generated decoder. */
static bool decode_insn(DisasContext *ctx, uint16_t insn);
-#include "decode_insn.inc.c"
+#include "decode_insn.inc"
#define output(mnemonic, format, ...) \
(pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \
diff --git a/target/avr/translate.c b/target/avr/translate.c
index 648dcd5..8deb126 100644
--- a/target/avr/translate.c
+++ b/target/avr/translate.c
@@ -198,7 +198,7 @@ static bool avr_have_feature(DisasContext *ctx, int feature)
}
static bool decode_insn(DisasContext *ctx, uint16_t insn);
-#include "decode_insn.inc.c"
+#include "decode_insn.inc"
/*
* Arithmetic Instructions
diff --git a/target/cris/translate.c b/target/cris/translate.c
index aaa46b5..a0d4b1c 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -3037,7 +3037,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env, DisasContext *dc)
return insn_len;
}
-#include "translate_v10.inc.c"
+#include "translate_v10.inc"
/*
* Delay slots on QEMU/CRIS.
diff --git a/target/cris/translate_v10.inc.c b/target/cris/translate_v10.inc
similarity index 100%
rename from target/cris/translate_v10.inc.c
rename to target/cris/translate_v10.inc
diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs
index 174f50a..40dcb86 100644
--- a/target/hppa/Makefile.objs
+++ b/target/hppa/Makefile.objs
@@ -4,8 +4,8 @@ obj-$(CONFIG_SOFTMMU) += machine.o
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-target/hppa/decode.inc.c: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE)
+target/hppa/decode.inc: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)
-target/hppa/translate.o: target/hppa/decode.inc.c
+target/hppa/translate.o: target/hppa/decode.inc
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 4bd22d4..31e2926 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -334,7 +334,7 @@ static int expand_shl11(DisasContext *ctx, int val)
/* Include the auto-generated decoder. */
-#include "decode.inc.c"
+#include "decode.inc"
/* We are not using a goto_tb (for whatever reason), but have updated
the iaq (for whatever reason), so don't do it again on exit. */
diff --git a/target/mips/translate.c b/target/mips/translate.c
index 9fad58e..221a42e 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -31322,7 +31322,7 @@ void mips_tcg_init(void)
#endif
}
-#include "translate_init.inc.c"
+#include "translate_init.inc"
void cpu_mips_realize_env(CPUMIPSState *env)
{
diff --git a/target/mips/translate_init.inc.c b/target/mips/translate_init.inc
similarity index 100%
rename from target/mips/translate_init.inc.c
rename to target/mips/translate_init.inc
diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs
index b5432f4..0f2fcff 100644
--- a/target/openrisc/Makefile.objs
+++ b/target/openrisc/Makefile.objs
@@ -6,10 +6,10 @@ obj-y += gdbstub.o
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-target/openrisc/decode.inc.c: \
+target/openrisc/decode.inc: \
$(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)
-target/openrisc/translate.o: target/openrisc/decode.inc.c
-target/openrisc/disas.o: target/openrisc/decode.inc.c
+target/openrisc/translate.o: target/openrisc/decode.inc
+target/openrisc/disas.o: target/openrisc/decode.inc
diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c
index ce11264..3f75316 100644
--- a/target/openrisc/disas.c
+++ b/target/openrisc/disas.c
@@ -25,7 +25,7 @@
typedef disassemble_info DisasContext;
/* Include the auto-generated decoder. */
-#include "decode.inc.c"
+#include "decode.inc"
#define output(mnemonic, format, ...) \
(info->fprintf_func(info->stream, "%-9s " format, \
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index 52323a1..a119be2 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -65,7 +65,7 @@ static inline bool is_user(DisasContext *dc)
}
/* Include the auto-generated decoder. */
-#include "decode.inc.c"
+#include "decode.inc"
static TCGv cpu_sr;
static TCGv cpu_regs[32];
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index d8bd3c2..eff3c0d 100644
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -398,7 +398,7 @@ target_ulong helper_divso(CPUPPCState *env, target_ulong arg1,
target_ulong helper_602_mfrom(target_ulong arg)
{
if (likely(arg < 602)) {
-#include "mfrom_table.inc.c"
+#include "mfrom_table.inc"
return mfrom_ROM_table[arg];
} else {
return 0;
diff --git a/target/ppc/mfrom_table.inc.c b/target/ppc/mfrom_table.inc
similarity index 100%
rename from target/ppc/mfrom_table.inc.c
rename to target/ppc/mfrom_table.inc
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 4ce3d66..95d9080 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -6900,15 +6900,15 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high)
tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high));
}
-#include "translate/fp-impl.inc.c"
+#include "translate/fp-impl.inc"
-#include "translate/vmx-impl.inc.c"
+#include "translate/vmx-impl.inc"
-#include "translate/vsx-impl.inc.c"
+#include "translate/vsx-impl.inc"
-#include "translate/dfp-impl.inc.c"
+#include "translate/dfp-impl.inc"
-#include "translate/spe-impl.inc.c"
+#include "translate/spe-impl.inc"
/* Handles lfdp, lxsd, lxssp */
static void gen_dform39(DisasContext *ctx)
@@ -7587,19 +7587,19 @@ GEN_HANDLER2_E(treclaim, "treclaim", 0x1F, 0x0E, 0x1D, 0x03E0F800, \
GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F, 0x03FFF800, \
PPC_NONE, PPC2_TM),
-#include "translate/fp-ops.inc.c"
+#include "translate/fp-ops.inc"
-#include "translate/vmx-ops.inc.c"
+#include "translate/vmx-ops.inc"
-#include "translate/vsx-ops.inc.c"
+#include "translate/vsx-ops.inc"
-#include "translate/dfp-ops.inc.c"
+#include "translate/dfp-ops.inc"
-#include "translate/spe-ops.inc.c"
+#include "translate/spe-ops.inc"
};
#include "helper_regs.h"
-#include "translate_init.inc.c"
+#include "translate_init.inc"
/*****************************************************************************/
/* Misc PowerPC helpers */
diff --git a/target/ppc/translate/dfp-impl.inc.c b/target/ppc/translate/dfp-impl.inc
similarity index 100%
rename from target/ppc/translate/dfp-impl.inc.c
rename to target/ppc/translate/dfp-impl.inc
diff --git a/target/ppc/translate/dfp-ops.inc.c b/target/ppc/translate/dfp-ops.inc
similarity index 100%
rename from target/ppc/translate/dfp-ops.inc.c
rename to target/ppc/translate/dfp-ops.inc
diff --git a/target/ppc/translate/fp-impl.inc.c b/target/ppc/translate/fp-impl.inc
similarity index 100%
rename from target/ppc/translate/fp-impl.inc.c
rename to target/ppc/translate/fp-impl.inc
diff --git a/target/ppc/translate/fp-ops.inc.c b/target/ppc/translate/fp-ops.inc
similarity index 100%
rename from target/ppc/translate/fp-ops.inc.c
rename to target/ppc/translate/fp-ops.inc
diff --git a/target/ppc/translate/spe-impl.inc.c b/target/ppc/translate/spe-impl.inc
similarity index 100%
rename from target/ppc/translate/spe-impl.inc.c
rename to target/ppc/translate/spe-impl.inc
diff --git a/target/ppc/translate/spe-ops.inc.c b/target/ppc/translate/spe-ops.inc
similarity index 100%
rename from target/ppc/translate/spe-ops.inc.c
rename to target/ppc/translate/spe-ops.inc
diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.inc
similarity index 100%
rename from target/ppc/translate/vmx-impl.inc.c
rename to target/ppc/translate/vmx-impl.inc
diff --git a/target/ppc/translate/vmx-ops.inc.c b/target/ppc/translate/vmx-ops.inc
similarity index 100%
rename from target/ppc/translate/vmx-ops.inc.c
rename to target/ppc/translate/vmx-ops.inc
diff --git a/target/ppc/translate/vsx-impl.inc.c b/target/ppc/translate/vsx-impl.inc
similarity index 100%
rename from target/ppc/translate/vsx-impl.inc.c
rename to target/ppc/translate/vsx-impl.inc
diff --git a/target/ppc/translate/vsx-ops.inc.c b/target/ppc/translate/vsx-ops.inc
similarity index 100%
rename from target/ppc/translate/vsx-ops.inc.c
rename to target/ppc/translate/vsx-ops.inc
diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc
similarity index 100%
rename from target/ppc/translate_init.inc.c
rename to target/ppc/translate_init.inc
diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs
index ff38df6..1a66d8a 100644
--- a/target/riscv/Makefile.objs
+++ b/target/riscv/Makefile.objs
@@ -14,15 +14,15 @@ decode16-y = $(SRC_PATH)/target/riscv/insn16.decode
decode16-$(TARGET_RISCV32) += $(SRC_PATH)/target/riscv/insn16-32.decode
decode16-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn16-64.decode
-target/riscv/decode_insn32.inc.c: $(decode32-y) $(DECODETREE)
+target/riscv/decode_insn32.inc: $(decode32-y) $(DECODETREE)
$(call quiet-command, \
$(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \
$(decode32-y), "GEN", $(TARGET_DIR)$@)
-target/riscv/decode_insn16.inc.c: $(decode16-y) $(DECODETREE)
+target/riscv/decode_insn16.inc: $(decode16-y) $(DECODETREE)
$(call quiet-command, \
$(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn16 \
--insnwidth 16 $(decode16-y), "GEN", $(TARGET_DIR)$@)
-target/riscv/translate.o: target/riscv/decode_insn32.inc.c \
- target/riscv/decode_insn16.inc.c
+target/riscv/translate.o: target/riscv/decode_insn32.inc \
+ target/riscv/decode_insn16.inc
diff --git a/target/riscv/insn_trans/trans_privileged.inc.c b/target/riscv/insn_trans/trans_privileged.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_privileged.inc.c
rename to target/riscv/insn_trans/trans_privileged.inc
diff --git a/target/riscv/insn_trans/trans_rva.inc.c b/target/riscv/insn_trans/trans_rva.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rva.inc.c
rename to target/riscv/insn_trans/trans_rva.inc
diff --git a/target/riscv/insn_trans/trans_rvd.inc.c b/target/riscv/insn_trans/trans_rvd.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvd.inc.c
rename to target/riscv/insn_trans/trans_rvd.inc
diff --git a/target/riscv/insn_trans/trans_rvf.inc.c b/target/riscv/insn_trans/trans_rvf.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvf.inc.c
rename to target/riscv/insn_trans/trans_rvf.inc
diff --git a/target/riscv/insn_trans/trans_rvh.inc.c b/target/riscv/insn_trans/trans_rvh.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvh.inc.c
rename to target/riscv/insn_trans/trans_rvh.inc
diff --git a/target/riscv/insn_trans/trans_rvi.inc.c b/target/riscv/insn_trans/trans_rvi.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvi.inc.c
rename to target/riscv/insn_trans/trans_rvi.inc
diff --git a/target/riscv/insn_trans/trans_rvm.inc.c b/target/riscv/insn_trans/trans_rvm.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvm.inc.c
rename to target/riscv/insn_trans/trans_rvm.inc
diff --git a/target/riscv/insn_trans/trans_rvv.inc.c b/target/riscv/insn_trans/trans_rvv.inc
similarity index 100%
rename from target/riscv/insn_trans/trans_rvv.inc.c
rename to target/riscv/insn_trans/trans_rvv.inc
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index 9632e79..aa7f56d 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -583,7 +583,7 @@ static int ex_rvc_shifti(DisasContext *ctx, int imm)
}
/* Include the auto-generated decoder for 32 bit insn */
-#include "decode_insn32.inc.c"
+#include "decode_insn32.inc"
static bool gen_arith_imm_fn(DisasContext *ctx, arg_i *a,
void (*func)(TCGv, TCGv, target_long))
@@ -718,17 +718,17 @@ static bool gen_shift(DisasContext *ctx, arg_r *a,
}
/* Include insn module translation function */
-#include "insn_trans/trans_rvi.inc.c"
-#include "insn_trans/trans_rvm.inc.c"
-#include "insn_trans/trans_rva.inc.c"
-#include "insn_trans/trans_rvf.inc.c"
-#include "insn_trans/trans_rvd.inc.c"
-#include "insn_trans/trans_rvh.inc.c"
-#include "insn_trans/trans_rvv.inc.c"
-#include "insn_trans/trans_privileged.inc.c"
+#include "insn_trans/trans_rvi.inc"
+#include "insn_trans/trans_rvm.inc"
+#include "insn_trans/trans_rva.inc"
+#include "insn_trans/trans_rvf.inc"
+#include "insn_trans/trans_rvd.inc"
+#include "insn_trans/trans_rvh.inc"
+#include "insn_trans/trans_rvv.inc"
+#include "insn_trans/trans_privileged.inc"
/* Include the auto-generated decoder for 16 bit insn */
-#include "decode_insn16.inc.c"
+#include "decode_insn16.inc"
static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode)
{
diff --git a/target/rx/Makefile.objs b/target/rx/Makefile.objs
index a0018d5..eddc62a 100644
--- a/target/rx/Makefile.objs
+++ b/target/rx/Makefile.objs
@@ -2,10 +2,10 @@ obj-y += translate.o op_helper.o helper.o cpu.o gdbstub.o disas.o
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-target/rx/decode.inc.c: \
+target/rx/decode.inc: \
$(SRC_PATH)/target/rx/insns.decode $(DECODETREE)
$(call quiet-command,\
$(PYTHON) $(DECODETREE) --varinsnwidth 32 -o $@ $<, "GEN", $(TARGET_DIR)$@)
-target/rx/translate.o: target/rx/decode.inc.c
-target/rx/disas.o: target/rx/decode.inc.c
+target/rx/translate.o: target/rx/decode.inc
+target/rx/disas.o: target/rx/decode.inc
diff --git a/target/rx/disas.c b/target/rx/disas.c
index 6dee7a0..6450892 100644
--- a/target/rx/disas.c
+++ b/target/rx/disas.c
@@ -100,7 +100,7 @@ static int bdsp_s(DisasContext *ctx, int d)
}
/* Include the auto-generated decoder. */
-#include "decode.inc.c"
+#include "decode.inc"
static void dump_bytes(DisasContext *ctx)
{
diff --git a/target/rx/translate.c b/target/rx/translate.c
index 61e8665..272619c 100644
--- a/target/rx/translate.c
+++ b/target/rx/translate.c
@@ -124,7 +124,7 @@ static int bdsp_s(DisasContext *ctx, int d)
}
/* Include the auto-generated decoder. */
-#include "decode.inc.c"
+#include "decode.inc"
void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags)
{
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 4f6f1e3..4c6452f 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -5120,7 +5120,7 @@ static DisasJumpType op_mpcifc(DisasContext *s, DisasOps *o)
}
#endif
-#include "translate_vx.inc.c"
+#include "translate_vx.inc"
/* ====================================================================== */
/* The "Cc OUTput" generators. Given the generated output (and in some cases
diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.inc
similarity index 100%
rename from target/s390x/translate_vx.inc.c
rename to target/s390x/translate_vx.inc
diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index 7851bcb..bc4c866 100644
--- a/target/xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
@@ -35,13 +35,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_dc232b
-#include "core-dc232b/xtensa-modules.inc.c"
+#include "core-dc232b/xtensa-modules.inc"
static XtensaConfig dc232b __attribute__((unused)) = {
.name = "dc232b",
.gdb_regmap = {
.reg = {
-#include "core-dc232b/gdb-config.inc.c"
+#include "core-dc232b/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-dc232b/gdb-config.inc.c b/target/xtensa/core-dc232b/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-dc232b/gdb-config.inc.c
rename to target/xtensa/core-dc232b/gdb-config.inc
diff --git a/target/xtensa/core-dc232b/xtensa-modules.inc.c b/target/xtensa/core-dc232b/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-dc232b/xtensa-modules.inc.c
rename to target/xtensa/core-dc232b/xtensa-modules.inc
diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c
index f8204f7..8341925 100644
--- a/target/xtensa/core-dc233c.c
+++ b/target/xtensa/core-dc233c.c
@@ -34,13 +34,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_dc233c
-#include "core-dc233c/xtensa-modules.inc.c"
+#include "core-dc233c/xtensa-modules.inc"
static XtensaConfig dc233c __attribute__((unused)) = {
.name = "dc233c",
.gdb_regmap = {
.reg = {
-#include "core-dc233c/gdb-config.inc.c"
+#include "core-dc233c/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-dc233c/gdb-config.inc.c b/target/xtensa/core-dc233c/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-dc233c/gdb-config.inc.c
rename to target/xtensa/core-dc233c/gdb-config.inc
diff --git a/target/xtensa/core-dc233c/xtensa-modules.inc.c b/target/xtensa/core-dc233c/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-dc233c/xtensa-modules.inc.c
rename to target/xtensa/core-dc233c/xtensa-modules.inc
diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c
index a061158..eda095d 100644
--- a/target/xtensa/core-de212.c
+++ b/target/xtensa/core-de212.c
@@ -34,13 +34,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_de212
-#include "core-de212/xtensa-modules.inc.c"
+#include "core-de212/xtensa-modules.inc"
static XtensaConfig de212 __attribute__((unused)) = {
.name = "de212",
.gdb_regmap = {
.reg = {
-#include "core-de212/gdb-config.inc.c"
+#include "core-de212/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-de212/gdb-config.inc.c b/target/xtensa/core-de212/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-de212/gdb-config.inc.c
rename to target/xtensa/core-de212/gdb-config.inc
diff --git a/target/xtensa/core-de212/xtensa-modules.inc.c b/target/xtensa/core-de212/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-de212/xtensa-modules.inc.c
rename to target/xtensa/core-de212/xtensa-modules.inc
diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c
index 1221a29..3398f3b 100644
--- a/target/xtensa/core-fsf.c
+++ b/target/xtensa/core-fsf.c
@@ -34,7 +34,7 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_fsf
-#include "core-fsf/xtensa-modules.inc.c"
+#include "core-fsf/xtensa-modules.inc"
static XtensaConfig fsf __attribute__((unused)) = {
.name = "fsf",
diff --git a/target/xtensa/core-fsf/xtensa-modules.inc.c b/target/xtensa/core-fsf/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-fsf/xtensa-modules.inc.c
rename to target/xtensa/core-fsf/xtensa-modules.inc
diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sample_controller.c
index a1d220b..1523ef5 100644
--- a/target/xtensa/core-sample_controller.c
+++ b/target/xtensa/core-sample_controller.c
@@ -34,13 +34,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_sample_controller
-#include "core-sample_controller/xtensa-modules.inc.c"
+#include "core-sample_controller/xtensa-modules.inc"
static XtensaConfig sample_controller __attribute__((unused)) = {
.name = "sample_controller",
.gdb_regmap = {
.reg = {
-#include "core-sample_controller/gdb-config.inc.c"
+#include "core-sample_controller/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-sample_controller/gdb-config.inc.c b/target/xtensa/core-sample_controller/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-sample_controller/gdb-config.inc.c
rename to target/xtensa/core-sample_controller/gdb-config.inc
diff --git a/target/xtensa/core-sample_controller/xtensa-modules.inc.c b/target/xtensa/core-sample_controller/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-sample_controller/xtensa-modules.inc.c
rename to target/xtensa/core-sample_controller/xtensa-modules.inc
diff --git a/target/xtensa/core-test_kc705_be.c b/target/xtensa/core-test_kc705_be.c
index ab73c38..60e9a7d 100644
--- a/target/xtensa/core-test_kc705_be.c
+++ b/target/xtensa/core-test_kc705_be.c
@@ -34,13 +34,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_test_kc705_be
-#include "core-test_kc705_be/xtensa-modules.inc.c"
+#include "core-test_kc705_be/xtensa-modules.inc"
static XtensaConfig test_kc705_be __attribute__((unused)) = {
.name = "test_kc705_be",
.gdb_regmap = {
.reg = {
-#include "core-test_kc705_be/gdb-config.inc.c"
+#include "core-test_kc705_be/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-test_kc705_be/gdb-config.inc.c b/target/xtensa/core-test_kc705_be/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-test_kc705_be/gdb-config.inc.c
rename to target/xtensa/core-test_kc705_be/gdb-config.inc
diff --git a/target/xtensa/core-test_kc705_be/xtensa-modules.inc.c b/target/xtensa/core-test_kc705_be/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-test_kc705_be/xtensa-modules.inc.c
rename to target/xtensa/core-test_kc705_be/xtensa-modules.inc
diff --git a/target/xtensa/core-test_mmuhifi_c3.c b/target/xtensa/core-test_mmuhifi_c3.c
index 089ed7d..0a297f5 100644
--- a/target/xtensa/core-test_mmuhifi_c3.c
+++ b/target/xtensa/core-test_mmuhifi_c3.c
@@ -35,13 +35,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_test_mmuhifi_c3
-#include "core-test_mmuhifi_c3/xtensa-modules.inc.c"
+#include "core-test_mmuhifi_c3/xtensa-modules.inc"
static XtensaConfig test_mmuhifi_c3 __attribute__((unused)) = {
.name = "test_mmuhifi_c3",
.gdb_regmap = {
.reg = {
-#include "core-test_mmuhifi_c3/gdb-config.inc.c"
+#include "core-test_mmuhifi_c3/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-test_mmuhifi_c3/gdb-config.inc.c b/target/xtensa/core-test_mmuhifi_c3/gdb-config.inc
similarity index 100%
rename from target/xtensa/core-test_mmuhifi_c3/gdb-config.inc.c
rename to target/xtensa/core-test_mmuhifi_c3/gdb-config.inc
diff --git a/target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc.c b/target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc
similarity index 100%
rename from target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc.c
rename to target/xtensa/core-test_mmuhifi_c3/xtensa-modules.inc
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index 8f844cf..a2e422b 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -23,7 +23,7 @@ tar -xf "$OVERLAY" -C "$TARGET" --strip-components=2 \
xtensa/config/core-isa.h \
xtensa/config/core-matmap.h
tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \
- sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c
+ sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc
#
# Fix up known issues in the xtensa-modules.c
#
@@ -35,7 +35,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
-e '/^#include "ansidecl.h"/d' \
-e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \
-e 's/#include <xtensa-isa.h>/#include "xtensa-isa.h"/' \
- > "$TARGET"/xtensa-modules.inc.c
+ > "$TARGET"/xtensa-modules.inc
cat <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
@@ -49,13 +49,13 @@ cat <<EOF > "${TARGET}.c"
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_$NAME
-#include "core-$NAME/xtensa-modules.inc.c"
+#include "core-$NAME/xtensa-modules.inc"
static XtensaConfig $NAME __attribute__((unused)) = {
.name = "$NAME",
.gdb_regmap = {
.reg = {
-#include "core-$NAME/gdb-config.inc.c"
+#include "core-$NAME/gdb-config.inc"
}
},
.isa_internal = &xtensa_modules,
diff --git a/tcg/README b/tcg/README
index a64f678..fdf6ee5 100644
--- a/tcg/README
+++ b/tcg/README
@@ -652,7 +652,7 @@ function tcg_gen_xxx(args).
4) Backend
-tcg-target.h contains the target specific definitions. tcg-target.inc.c
+tcg-target.h contains the target specific definitions. tcg-target.inc
contains the target specific code; it is #included by tcg/tcg.c, rather
than being a standalone C file.
diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc
similarity index 99%
rename from tcg/aarch64/tcg-target.inc.c
rename to tcg/aarch64/tcg-target.inc
index 760b0e7..000f7e6 100644
--- a/tcg/aarch64/tcg-target.inc.c
+++ b/tcg/aarch64/tcg-target.inc
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory for details.
*/
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#include "qemu/bitops.h"
/* We're going to re-use TCGType in setting of the SF bit, which controls
@@ -1542,7 +1542,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d,
}
#ifdef CONFIG_SOFTMMU
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* TCGMemOpIdx oi, uintptr_t ra)
diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc
similarity index 99%
rename from tcg/arm/tcg-target.inc.c
rename to tcg/arm/tcg-target.inc
index 6aa7757..42c2601 100644
--- a/tcg/arm/tcg-target.inc.c
+++ b/tcg/arm/tcg-target.inc
@@ -23,7 +23,7 @@
*/
#include "elf.h"
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
int arm_arch = __ARM_ARCH;
@@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args,
}
#ifdef CONFIG_SOFTMMU
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc
similarity index 99%
rename from tcg/i386/tcg-target.inc.c
rename to tcg/i386/tcg-target.inc
index ae02282..c8d5ff7 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
@@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n)
}
#if defined(CONFIG_SOFTMMU)
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc
similarity index 99%
rename from tcg/mips/tcg-target.inc.c
rename to tcg/mips/tcg-target.inc
index 4d32ebc..5459818 100644
--- a/tcg/mips/tcg-target.inc.c
+++ b/tcg/mips/tcg-target.inc
@@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
}
#if defined(CONFIG_SOFTMMU)
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
static void * const qemu_ld_helpers[16] = {
[MO_UB] = helper_ret_ldub_mmu,
diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc
similarity index 99%
rename from tcg/ppc/tcg-target.inc.c
rename to tcg/ppc/tcg-target.inc
index c8d1e76..7f13849 100644
--- a/tcg/ppc/tcg-target.inc.c
+++ b/tcg/ppc/tcg-target.inc
@@ -23,7 +23,7 @@
*/
#include "elf.h"
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#if defined _CALL_DARWIN || defined __APPLE__
#define TCG_TARGET_CALL_DARWIN
@@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] = {
};
#if defined (CONFIG_SOFTMMU)
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc
similarity index 99%
rename from tcg/riscv/tcg-target.inc.c
rename to tcg/riscv/tcg-target.inc
index 3c11ab8..d666c79 100644
--- a/tcg/riscv/tcg-target.inc.c
+++ b/tcg/riscv/tcg-target.inc
@@ -27,7 +27,7 @@
* THE SOFTWARE.
*/
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
@@ -919,7 +919,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
*/
#if defined(CONFIG_SOFTMMU)
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* TCGMemOpIdx oi, uintptr_t ra)
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc
similarity index 99%
rename from tcg/s390/tcg-target.inc.c
rename to tcg/s390/tcg-target.inc
index b07e9ff..c313a08 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc
@@ -29,7 +29,7 @@
#error "unsupported code generation mode"
#endif
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#include "elf.h"
/* ??? The translation blocks produced by TCG are generally small enough to
@@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
}
#if defined(CONFIG_SOFTMMU)
-#include "../tcg-ldst.inc.c"
+#include "../tcg-ldst.inc"
/* We're expecting to use a 20-bit negative offset on the tlb memory ops. */
QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0);
diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc
similarity index 99%
rename from tcg/sparc/tcg-target.inc.c
rename to tcg/sparc/tcg-target.inc
index 65fddb3..e6aecd9 100644
--- a/tcg/sparc/tcg-target.inc.c
+++ b/tcg/sparc/tcg-target.inc
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "../tcg-pool.inc.c"
+#include "../tcg-pool.inc"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
diff --git a/tcg/tcg-ldst.inc.c b/tcg/tcg-ldst.inc
similarity index 100%
rename from tcg/tcg-ldst.inc.c
rename to tcg/tcg-ldst.inc
diff --git a/tcg/tcg-pool.inc.c b/tcg/tcg-pool.inc
similarity index 99%
rename from tcg/tcg-pool.inc.c
rename to tcg/tcg-pool.inc
index 4eaa84b..7390173 100644
--- a/tcg/tcg-pool.inc.c
+++ b/tcg/tcg-pool.inc
@@ -118,7 +118,7 @@ static inline void new_pool_l8(TCGContext *s, int rtype, tcg_insn_unit *label,
new_pool_insert(s, n);
}
-/* To be provided by cpu/tcg-target.inc.c. */
+/* To be provided by cpu/tcg-target.inc. */
static void tcg_out_nop_fill(tcg_insn_unit *p, int count);
static int tcg_out_pool_finalize(TCGContext *s)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 1362bc6..5af2ce4 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -65,7 +65,7 @@
#include "exec/log.h"
#include "sysemu/sysemu.h"
-/* Forward declarations for functions declared in tcg-target.inc.c and
+/* Forward declarations for functions declared in tcg-target.inc and
used here. */
static void tcg_target_init(TCGContext *s);
static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode);
@@ -101,7 +101,7 @@ static void tcg_register_jit_int(void *buf, size_t size,
size_t debug_frame_size)
__attribute__((unused));
-/* Forward declarations for functions declared and used in tcg-target.inc.c. */
+/* Forward declarations for functions declared and used in tcg-target.inc. */
static const char *target_parse_constraint(TCGArgConstraint *ct,
const char *ct_str, TCGType type);
static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
@@ -341,7 +341,7 @@ static void set_jmp_reset_offset(TCGContext *s, int which)
assert(s->tb_jmp_reset_offset[which] == off);
}
-#include "tcg-target.inc.c"
+#include "tcg-target.inc"
/* compare a pointer @ptr and a tb_tc @s */
static int ptr_cmp_tb_tc(const void *ptr, const struct tb_tc *s)
diff --git a/tcg/tci/README b/tcg/tci/README
index 386c3c7..63ce297 100644
--- a/tcg/tci/README
+++ b/tcg/tci/README
@@ -21,7 +21,7 @@ This is what TCI (Tiny Code Interpreter) does.
2) Implementation
Like each TCG host frontend, TCI implements the code generator in
-tcg-target.inc.c, tcg-target.h. Both files are in directory tcg/tci.
+tcg-target.inc, tcg-target.h. Both files are in directory tcg/tci.
The additional file tcg/tci.c adds the interpreter.
@@ -123,7 +123,7 @@ u1 = linux-user-test works
would also improve speed for hosts which support byte alignment).
* A better disassembler for the pseudo code would be nice (a very primitive
- disassembler is included in tcg-target.inc.c).
+ disassembler is included in tcg-target.inc).
* It might be useful to have a runtime option which selects the native TCG
or TCI, so QEMU would have to include two TCGs. Today, selecting TCI
diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc
similarity index 100%
rename from tcg/tci/tcg-target.inc.c
rename to tcg/tci/tcg-target.inc
diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c
index 43ef962..6fe2402 100644
--- a/tests/fp/fp-test.c
+++ b/tests/fp/fp-test.c
@@ -116,7 +116,7 @@ static void usage_complete(int argc, char *argv[])
}
/* keep wrappers separate but do not bother defining headers for all of them */
-#include "wrap.inc.c"
+#include "wrap.inc"
static void not_implemented(void)
{
diff --git a/tests/fp/wrap.inc.c b/tests/fp/wrap.inc
similarity index 100%
rename from tests/fp/wrap.inc.c
rename to tests/fp/wrap.inc
diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c
index b4f71e3..98d5002 100644
--- a/ui/vnc-enc-zrle.c
+++ b/ui/vnc-enc-zrle.c
@@ -199,56 +199,56 @@ static void zrle_write_u8(VncState *vs, uint8_t value)
#define ZRLE_BPP 8
#define ZYWRLE_ENDIAN ENDIAN_NO
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZRLE_BPP
#define ZRLE_BPP 15
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZRLE_BPP
#define ZRLE_BPP 16
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZRLE_BPP
#define ZRLE_BPP 32
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#define ZRLE_COMPACT_PIXEL 24a
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZRLE_COMPACT_PIXEL
#define ZRLE_COMPACT_PIXEL 24b
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle.inc.c"
+#include "vnc-enc-zrle.inc"
#undef ZRLE_COMPACT_PIXEL
#undef ZRLE_BPP
diff --git a/ui/vnc-enc-zrle.inc.c b/ui/vnc-enc-zrle.inc
similarity index 100%
rename from ui/vnc-enc-zrle.inc.c
rename to ui/vnc-enc-zrle.inc
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 006/143] build-sys hack: ensure target directory is there
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (4 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 005/143] meson: rename .inc.c files to .inc Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64 Paolo Bonzini
` (141 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
By removing some unnest-vars calls, we miss some directory creation
that may be required by some/dir/object.d.
This will go away once everything is converted to Meson.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rules.mak | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules.mak b/rules.mak
index 694865b..56ba540 100644
--- a/rules.mak
+++ b/rules.mak
@@ -66,6 +66,7 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
$(filter-out %.o %.mo,$1))
%.o: %.c
+ @mkdir -p $(dir $@)
$(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
$(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \
-c -o $@ $<,"CC","$(TARGET_DIR)$@")
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (5 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 006/143] build-sys hack: ensure target directory is there Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:06 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile Paolo Bonzini
` (140 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Just make EFI_AARCH64 a variable in the makefile that defaults to the efi
firmware included with QEMU. It can be redefined on the "make" command
line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 -------------------
tests/vm/Makefile.include | 2 ++
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 2acc4d1..1c17a0f 100755
--- a/configure
+++ b/configure
@@ -418,7 +418,6 @@ prefix="/usr/local"
mandir="\${prefix}/share/man"
datadir="\${prefix}/share"
firmwarepath="\${prefix}/share/qemu-firmware"
-efi_aarch64=""
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
libdir="\${prefix}/lib"
@@ -1109,8 +1108,6 @@ for opt do
;;
--firmwarepath=*) firmwarepath="$optarg"
;;
- --efi-aarch64=*) efi_aarch64="$optarg"
- ;;
--host=*|--build=*|\
--disable-dependency-tracking|\
--sbindir=*|--sharedstatedir=*|\
@@ -3650,20 +3647,6 @@ EOF
fi
fi
-############################################
-# efi-aarch64 probe
-# Check for efi files needed by aarch64 VMs.
-# By default we will use the efi included with QEMU.
-# Allow user to override the path for efi also.
-if ! test -f "$efi_aarch64"; then
- if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then
- # valid after build
- efi_aarch64=$PWD/pc-bios/edk2-aarch64-code.fd
- else
- efi_aarch64=""
- fi
-fi
-
##########################################
# libcap-ng library probe
if test "$cap_ng" != "no" ; then
@@ -6861,7 +6844,6 @@ if test "$docs" != "no"; then
echo "sphinx-build $sphinx_build"
fi
echo "genisoimage $genisoimage"
-echo "efi_aarch64 $efi_aarch64"
echo "python_yaml $python_yaml"
echo "slirp support $slirp $(echo_version $slirp $slirp_version)"
if test "$slirp" != "no" ; then
@@ -7963,7 +7945,6 @@ echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
-echo "EFI_AARCH64=$efi_aarch64" >> $config_host_mak
echo "PYTHON_YAML=$python_yaml" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index f21948c..29f5a1f 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -10,6 +10,8 @@ IMAGES += ubuntu.aarch64 centos.aarch64
endif
endif
+EFI_AARCH64 = $(wildcard $(SRC_PATH)/pc-bios/edk2-aarch64-code.fd)
+
IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (6 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64 Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:11 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 009/143] configure: do not include $(...) variables in config-host.mak Paolo Bonzini
` (139 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
No need to do it in the configure file if it is only used for a help message.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 9 ---------
tests/vm/Makefile.include | 4 +++-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index 1c17a0f..625c14c 100755
--- a/configure
+++ b/configure
@@ -959,13 +959,6 @@ do
fi
done
-# Check for existence of python3 yaml, needed to
-# import yaml config files into vm-build.
-python_yaml="no"
-if $(python3 -c "import yaml" 2> /dev/null); then
- python_yaml="yes"
-fi
-
: ${smbd=${SMBD-/usr/sbin/smbd}}
# Default objcc to clang if available, otherwise use CC
@@ -6844,7 +6837,6 @@ if test "$docs" != "no"; then
echo "sphinx-build $sphinx_build"
fi
echo "genisoimage $genisoimage"
-echo "python_yaml $python_yaml"
echo "slirp support $slirp $(echo_version $slirp $slirp_version)"
if test "$slirp" != "no" ; then
echo "smbd $smbd"
@@ -7945,7 +7937,6 @@ echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
-echo "PYTHON_YAML=$python_yaml" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
echo "IASL=$iasl" >> $config_host_mak
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index 29f5a1f..70263b2 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -17,6 +17,8 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
.PRECIOUS: $(IMAGE_FILES)
+HAVE_PYTHON_YAML = $(shell $(PYTHON) -c "import yaml" 2> /dev/null && echo yes)
+
# 'vm-help' target was historically named 'vm-test'
vm-help vm-test:
@echo "vm-help: Test QEMU in preconfigured virtual machines"
@@ -56,7 +58,7 @@ endif
@echo " QEMU_LOCAL=1 - Use QEMU binary local to this build."
@echo " QEMU=/path/to/qemu - Change path to QEMU binary"
@echo " QEMU_IMG=/path/to/qemu-img - Change path to qemu-img tool"
-ifeq ($(PYTHON_YAML),yes)
+ifeq ($(HAVE_PYTHON_YAML),yes)
@echo " QEMU_CONFIG=/path/conf.yml - Change path to VM configuration .yml file."
else
@echo " (install python3-yaml to enable support for yaml file to configure a VM.)"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 009/143] configure: do not include $(...) variables in config-host.mak
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (7 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:09 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 010/143] configure: expand path variables for meson configure Paolo Bonzini
` (138 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
This ensures that Meson will be able to reuse the results of
the tests that are performed in the configure script.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/configure b/configure
index 625c14c..c4843f9 100755
--- a/configure
+++ b/configure
@@ -610,8 +610,8 @@ QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv -std=gnu99 $QEMU_CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
-QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include"
-QEMU_INCLUDES="$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl"
+QEMU_INCLUDES="-iquote . -iquote ${source_path} -iquote ${source_path}/accel/tcg -iquote ${source_path}/include"
+QEMU_INCLUDES="$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
fi
@@ -911,7 +911,7 @@ Linux)
linux="yes"
linux_user="yes"
kvm="yes"
- QEMU_INCLUDES="-isystem \$(SRC_PATH)/linux-headers -isystem $PWD/linux-headers $QEMU_INCLUDES"
+ QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES"
supported_os="yes"
libudev="yes"
;;
@@ -4397,8 +4397,8 @@ EOF
if [ "$pwd_is_source_path" != "y" ] ; then
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
fi
- fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
- fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"
+ fdt_cflags="-I${source_path}/dtc/libfdt"
+ fdt_ldflags="-L$PWD/dtc/libfdt"
fdt_libs="$fdt_libs"
elif test "$fdt" = "yes" ; then
# Not a git build & no libfdt found, prompt for system install
@@ -5385,13 +5385,13 @@ case "$capstone" in
git_submodules="${git_submodules} capstone"
fi
mkdir -p capstone
- QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include"
+ QEMU_CFLAGS="$QEMU_CFLAGS -I${source_path}/capstone/include"
if test "$mingw32" = "yes"; then
LIBCAPSTONE=capstone.lib
else
LIBCAPSTONE=libcapstone.a
fi
- libs_cpu="-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu"
+ libs_cpu="-L$PWD/capstone -lcapstone $libs_cpu"
;;
system)
@@ -6414,8 +6414,8 @@ case "$slirp" in
git_submodules="${git_submodules} slirp"
fi
mkdir -p slirp
- slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"
- slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
+ slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src"
+ slirp_libs="-L$PWD/slirp -lslirp"
if test "$mingw32" = "yes" ; then
slirp_libs="$slirp_libs -lws2_32 -liphlpapi"
fi
@@ -7909,19 +7909,19 @@ if test "$secret_keyring" = "yes" ; then
fi
if test "$tcg_interpreter" = "yes"; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/tci $QEMU_INCLUDES"
elif test "$ARCH" = "sparc64" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/sparc $QEMU_INCLUDES"
elif test "$ARCH" = "s390x" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/s390 $QEMU_INCLUDES"
elif test "$ARCH" = "x86_64" || test "$ARCH" = "x32" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/i386 $QEMU_INCLUDES"
elif test "$ARCH" = "ppc64" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/ppc $QEMU_INCLUDES"
elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then
- QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES"
+ QEMU_INCLUDES="-I${source_path}/tcg/riscv $QEMU_INCLUDES"
else
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
echo "HELPERS=$helpers" >> $config_host_mak
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 010/143] configure: expand path variables for meson configure
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (8 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 009/143] configure: do not include $(...) variables in config-host.mak Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 011/143] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson Paolo Bonzini
` (137 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/configure b/configure
index c4843f9..29cde6a 100755
--- a/configure
+++ b/configure
@@ -415,16 +415,7 @@ LDFLAGS_SHARED="-shared"
modules="no"
module_upgrades="no"
prefix="/usr/local"
-mandir="\${prefix}/share/man"
-datadir="\${prefix}/share"
firmwarepath="\${prefix}/share/qemu-firmware"
-qemu_docdir="\${prefix}/share/doc/qemu"
-bindir="\${prefix}/bin"
-libdir="\${prefix}/lib"
-libexecdir="\${prefix}/libexec"
-includedir="\${prefix}/include"
-sysconfdir="\${prefix}/etc"
-local_statedir="\${prefix}/var"
confsuffix="/qemu"
slirp=""
oss_lib=""
@@ -979,12 +970,6 @@ if test "$mingw32" = "yes" ; then
LIBS="-liberty $LIBS"
fi
prefix="c:/Program Files/QEMU"
- mandir="\${prefix}"
- datadir="\${prefix}"
- qemu_docdir="\${prefix}"
- bindir="\${prefix}"
- sysconfdir="\${prefix}"
- local_statedir=
confsuffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga"
fi
@@ -1638,6 +1623,26 @@ for opt do
esac
done
+libdir="${libdir:-$prefix/lib}"
+libexecdir="${libexecdir:-$prefix/libexec}"
+includedir="${includedir:-$prefix/include}"
+
+if test "$mingw32" = "yes" ; then
+ mandir="$prefix"
+ datadir="$prefix"
+ qemu_docdir="$prefix"
+ bindir="$prefix"
+ sysconfdir="$prefix"
+ local_statedir=
+else
+ mandir="${mandir:-$prefix/share/man}"
+ datadir="${datadir:-$prefix/share}"
+ qemu_docdir="${qemu_docdir:-$prefix/share/doc/qemu}"
+ bindir="${bindir:-$prefix/bin}"
+ sysconfdir="${sysconfdir:-$prefix/etc}"
+ local_statedir="${local_statedir:-$prefix/var}"
+fi
+
case "$cpu" in
ppc)
CPU_CFLAGS="-m32"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 011/143] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (9 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 010/143] configure: expand path variables for meson configure Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 012/143] configure: integrate Meson in the build system Paolo Bonzini
` (136 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Split between CFLAGS/QEMU_CFLAGS and CXXFLAGS/QEMU_CXXFLAGS so that
we will use CFLAGS and CXXFLAGS for flags that we do not want to
pass to add_project_arguments.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 42 ++++++++++++++++++++++--------------------
rules.mak | 4 ++--
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index 29cde6a..c65cf77 100755
--- a/configure
+++ b/configure
@@ -107,15 +107,12 @@ update_cxxflags() {
# options which some versions of GCC's C++ compiler complain about
# because they only make sense for C programs.
QEMU_CXXFLAGS="$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS"
-
+ CXXFLAGS=$(echo "$CFLAGS" | sed s/-std=gnu99/-std=gnu++03/)
for arg in $QEMU_CFLAGS; do
case $arg in
-Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\
-Wold-style-declaration|-Wold-style-definition|-Wredundant-decls)
;;
- -std=gnu99)
- QEMU_CXXFLAGS=${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }"-std=gnu++98"
- ;;
*)
QEMU_CXXFLAGS=${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg
;;
@@ -131,7 +128,7 @@ compile_object() {
compile_prog() {
local_cflags="$1"
local_ldflags="$2"
- do_cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $QEMU_LDFLAGS $local_ldflags
+ do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $QEMU_LDFLAGS $local_ldflags
}
# symbolically link $1 to $2. Portable version of "ln -sf".
@@ -597,15 +594,14 @@ ARFLAGS="${ARFLAGS-rv}"
# left shift of signed integers is well defined and has the expected
# 2s-complement style results. (Both clang and gcc agree that it
# provides these semantics.)
-QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv -std=gnu99 $QEMU_CFLAGS"
+QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv $QEMU_CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
QEMU_INCLUDES="-iquote . -iquote ${source_path} -iquote ${source_path}/accel/tcg -iquote ${source_path}/include"
QEMU_INCLUDES="$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl"
-if test "$debug_info" = "yes"; then
- CFLAGS="-g $CFLAGS"
-fi
+CFLAGS=-std=gnu99
+
# running configure in the source tree?
# we know that's the case if configure is there.
@@ -886,7 +882,6 @@ SunOS)
QEMU_CFLAGS="-D_XOPEN_SOURCE=600 $QEMU_CFLAGS"
# needed for TIOCWIN* defines in termios.h
QEMU_CFLAGS="-D__EXTENSIONS__ $QEMU_CFLAGS"
- QEMU_CFLAGS="-std=gnu99 $QEMU_CFLAGS"
solarisnetlibs="-lsocket -lnsl -lresolv"
LIBS="$solarisnetlibs $LIBS"
libs_qga="$solarisnetlibs $libs_qga"
@@ -2184,21 +2179,21 @@ fi
if test "$static" = "yes"; then
if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then
- QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
- QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS"
+ CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+ LDFLAGS="-static-pie $QEMU_LDFLAGS"
pie="yes"
elif test "$pie" = "yes"; then
error_exit "-static-pie not available due to missing toolchain support"
else
- QEMU_LDFLAGS="-static $QEMU_LDFLAGS"
+ LDFLAGS="-static $QEMU_LDFLAGS"
pie="no"
fi
elif test "$pie" = "no"; then
- QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
- QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
+ CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
+ LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
- QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
- QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
+ CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+ LDFLAGS="-pie $QEMU_LDFLAGS"
pie="yes"
elif test "$pie" = "yes"; then
error_exit "PIE not available due to missing toolchain support"
@@ -3981,7 +3976,7 @@ EOF
if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then
if cc_has_warning_flag "-Wno-unknown-attributes"; then
glib_cflags="-Wno-unknown-attributes $glib_cflags"
- CFLAGS="-Wno-unknown-attributes $CFLAGS"
+ QEMU_CFLAGS="-Wno-unknown-attributes $CFLAGS"
fi
fi
@@ -6506,10 +6501,16 @@ if test "$gcov" = "yes" ; then
QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
elif test "$fortify_source" = "yes" ; then
- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
-elif test "$debug" = "no"; then
+ QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+ debug=no
+fi
+if test "$debug" = "no"; then
CFLAGS="-O2 $CFLAGS"
fi
+if test "$debug_info" = "yes"; then
+ CFLAGS="-g $CFLAGS"
+ LDFLAGS="-g $LDFLAGS"
+fi
if test "$have_asan" = "yes"; then
QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS"
@@ -7961,6 +7962,7 @@ echo "NM=$nm" >> $config_host_mak
echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak
echo "WINDRES=$windres" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
+echo "CXXFLAGS=$CXXFLAGS" >> $config_host_mak
echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
diff --git a/rules.mak b/rules.mak
index 56ba540..e79a400 100644
--- a/rules.mak
+++ b/rules.mak
@@ -88,12 +88,12 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
%.o: %.cc
$(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
- $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \
+ $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \
-c -o $@ $<,"CXX","$(TARGET_DIR)$@")
%.o: %.cpp
$(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
- $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \
+ $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \
-c -o $@ $<,"CXX","$(TARGET_DIR)$@")
%.o: %.m
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 012/143] configure: integrate Meson in the build system
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (10 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 011/143] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 013/143] configure: generate Meson cross file Paolo Bonzini
` (135 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
The Meson build system is integrated in the existing configure/make steps
by invoking Meson from the configure script and converting Meson's build.ninja
rules to an included Makefile.
build.ninja already provides tags/ctags/cscope rules, so they are removed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 28 +-
configure | 38 +-
meson.build | 20 +
scripts/ninjatool.py | 1010 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 1078 insertions(+), 18 deletions(-)
create mode 100644 meson.build
create mode 100755 scripts/ninjatool.py
diff --git a/Makefile b/Makefile
index 00cadeb..c0c3b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,15 @@ git-submodule-update:
endif
endif
+export NINJA=./ninjatool
+Makefile.ninja: build.ninja ninjatool
+ ./ninjatool -t ninja2make --clean --omit dist uninstall < $< > $@
+-include Makefile.ninja
+
+ninjatool: ninjatool.stamp
+ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak
+ $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@
+
.git-submodule-status: git-submodule-update config-host.mak
# Check that we're not trying to do an out-of-tree build from
@@ -68,6 +77,8 @@ CONFIG_ALL=y
-include config-all-devices.mak
-include config-all-disas.mak
+build.ninja: meson-private/coredata.dat
+meson-private/coredata.dat: config-host.mak
config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
@echo $@ is out-of-date, running configure
@./config.status
@@ -933,6 +944,8 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
install-includedir:
$(INSTALL_DIR) "$(DESTDIR)$(includedir)"
+# Needed by "meson install"
+export DESTDIR
install: all $(if $(BUILD_DOCS),install-doc) \
install-datadir install-localstatedir install-includedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
@@ -1006,21 +1019,6 @@ endif
done
$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
-.PHONY: ctags
-ctags:
- rm -f tags
- find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} +
-
-.PHONY: TAGS
-TAGS:
- rm -f TAGS
- find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} +
-
-cscope:
- rm -f "$(SRC_PATH)"/cscope.*
- find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PATH)/cscope.files"
- cscope -b -i"$(SRC_PATH)/cscope.files"
-
# opengl shader programs
ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclude.pl
@mkdir -p $(dir $@)
diff --git a/configure b/configure
index c65cf77..f2822b7 100755
--- a/configure
+++ b/configure
@@ -506,6 +506,7 @@ fuzzing="no"
rng_none="no"
secret_keyring=""
libdaxctl=""
+meson=meson
supported_cpu="no"
supported_os="no"
@@ -1002,6 +1003,8 @@ for opt do
;;
--sphinx-build=*) sphinx_build="$optarg"
;;
+ --meson=*) meson="$optarg"
+ ;;
--gcov=*) gcov_tool="$optarg"
;;
--smbd=*) smbd="$optarg"
@@ -1767,6 +1770,7 @@ Advanced options (experts only):
--install=INSTALL use specified install [$install]
--python=PYTHON use specified python [$python]
--sphinx-build=SPHINX use specified sphinx-build [$sphinx_build]
+ --meson=MESON use specified meson [$meson]
--smbd=SMBD use specified smbd [$smbd]
--with-git=GIT use specified git [$git]
--static enable static build [$static]
@@ -1961,6 +1965,12 @@ then
error_exit "Python not found. Use --python=/path/to/python"
fi
+if ! has "$meson"
+then
+ error_exit "Meson not found. Use --meson=/path/to/meson"
+fi
+meson=$(command -v $meson)
+
# Note that if the Python conditional here evaluates True we will exit
# with status 1 which is a shell 'false' value.
if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then
@@ -6504,13 +6514,13 @@ elif test "$fortify_source" = "yes" ; then
QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
debug=no
fi
-if test "$debug" = "no"; then
- CFLAGS="-O2 $CFLAGS"
-fi
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"
fi
+if test "$debug" = "no"; then
+ CFLAGS="-O2 $CFLAGS"
+fi
if test "$have_asan" = "yes"; then
QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS"
@@ -7943,6 +7953,7 @@ echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
+echo "MESON=$meson" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
echo "IASL=$iasl" >> $config_host_mak
@@ -8571,6 +8582,27 @@ echo "# Automatically generated by configure - do not modify" > "$iotests_common
echo >> "$iotests_common_env"
echo "export PYTHON='$python'" >> "$iotests_common_env"
+rm -rf meson-private/ meson-logs/ meson-info/
+NINJA=$PWD/ninjatool $python $meson setup \
+ --prefix "$prefix" \
+ --libdir "$libdir" \
+ --libexecdir "$libexecdir" \
+ --bindir "$bindir" \
+ --includedir "$includedir" \
+ --datadir "$datadir" \
+ --mandir "$mandir" \
+ --sysconfdir "$sysconfdir" \
+ --localstatedir "$local_statedir" \
+ -Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2; fi) \
+ -Ddebug=$(if test "$debug_info" = yes; then echo true; else echo false; fi) \
+ -Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
+ -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
+ "$PWD" "$source_path"
+
+if test "$?" -ne 0 ; then
+ error_exit "meson setup failed"
+fi
+
# Save the configure command line for later reuse.
cat <<EOD >config.status
#!/bin/sh
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..8499709
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,20 @@
+project('qemu', ['c', 'cpp'], meson_version: '>=0.55.0',
+ default_options: ['warning_level=1', 'c_std=gnu99', 'cpp_std=gnu++03', 'b_lundef=false'],
+ version: run_command('head', meson.source_root() / 'VERSION').stdout().strip())
+
+not_found = dependency('', required: false)
+keyval = import('unstable-keyval')
+config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
+
+add_project_arguments(config_host['QEMU_CFLAGS'].split(),
+ language: ['c', 'objc'])
+add_project_arguments(config_host['QEMU_CXXFLAGS'].split(),
+ language: 'cpp')
+add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(),
+ language: ['c', 'cpp', 'objc'])
+add_project_arguments(config_host['QEMU_INCLUDES'].split(),
+ language: ['c', 'cpp', 'objc'])
+
+configure_file(input: files('scripts/ninjatool.py'),
+ output: 'ninjatool',
+ configuration: config_host)
diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
new file mode 100755
index 0000000..e27413f
--- /dev/null
+++ b/scripts/ninjatool.py
@@ -0,0 +1,1010 @@
+#! /bin/sh
+
+# Python module for parsing and processing .ninja files.
+#
+# Author: Paolo Bonzini
+#
+# Copyright (C) 2019 Red Hat, Inc.
+
+
+# We don't want to put "#! @PYTHON@" as the shebang and
+# make the file executable, so instead we make this a
+# Python/shell polyglot. The first line below starts a
+# multiline string literal for Python, while it is just
+# ":" for bash. The closing of the multiline string literal
+# is never parsed by bash since it exits before.
+
+'''':
+case "$0" in
+ /*) me=$0 ;;
+ *) me=$(command -v "$0") ;;
+esac
+python="@PYTHON@"
+case $python in
+ @*) python=python3 ;;
+esac
+exec $python "$me" "$@"
+exit 1
+'''
+
+
+from collections import namedtuple, defaultdict
+import sys
+import os
+import re
+import json
+import argparse
+import shutil
+
+
+class InvalidArgumentError(Exception):
+ pass
+
+# faster version of os.path.normpath: do nothing unless there is a double
+# slash or a "." or ".." component. The filter does not have to be super
+# precise, but it has to be fast. os.path.normpath is the hottest function
+# for ninja2make without this optimization!
+if os.path.sep == '/':
+ def normpath(path, _slow_re=re.compile('/[./]')):
+ return os.path.normpath(path) if _slow_re.search(path) or path[0] == '.' else path
+else:
+ normpath = os.path.normpath
+
+
+# ---- lexer and parser ----
+
+PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}"
+
+SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+")
+IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$")
+STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.")
+TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.")
+VAR_RE=re.compile(r'\$\$|\$\{([^}]*)\}')
+
+BUILD = 1
+POOL = 2
+RULE = 3
+DEFAULT = 4
+EQUALS = 5
+COLON = 6
+PIPE = 7
+PIPE2 = 8
+IDENT = 9
+INCLUDE = 10
+INDENT = 11
+EOL = 12
+
+
+class LexerError(Exception):
+ pass
+
+
+class ParseError(Exception):
+ pass
+
+
+class NinjaParserEvents(object):
+ def __init__(self, parser):
+ self.parser = parser
+
+ def dollar_token(self, word, in_path=False):
+ return '$$' if word == '$' else word
+
+ def variable_expansion_token(self, varname):
+ return '${%s}' % varname
+
+ def variable(self, name, arg):
+ pass
+
+ def begin_file(self):
+ pass
+
+ def end_file(self):
+ pass
+
+ def end_scope(self):
+ pass
+
+ def begin_pool(self, name):
+ pass
+
+ def begin_rule(self, name):
+ pass
+
+ def begin_build(self, out, iout, rule, in_, iin, orderdep):
+ pass
+
+ def default(self, targets):
+ pass
+
+
+class NinjaParser(object):
+
+ InputFile = namedtuple('InputFile', 'filename iter lineno')
+
+ def __init__(self, filename, input):
+ self.stack = []
+ self.top = None
+ self.iter = None
+ self.lineno = None
+ self.match_keyword = False
+ self.push(filename, input)
+
+ def file_changed(self):
+ self.iter = self.top.iter
+ self.lineno = self.top.lineno
+ if self.top.filename is not None:
+ os.chdir(os.path.dirname(self.top.filename) or '.')
+
+ def push(self, filename, input):
+ if self.top:
+ self.top.lineno = self.lineno
+ self.top.iter = self.iter
+ self.stack.append(self.top)
+ self.top = self.InputFile(filename=filename or 'stdin',
+ iter=self._tokens(input), lineno=0)
+ self.file_changed()
+
+ def pop(self):
+ if len(self.stack):
+ self.top = self.stack[-1]
+ self.stack.pop()
+ self.file_changed()
+ else:
+ self.top = self.iter = None
+
+ def next_line(self, input):
+ line = next(input).rstrip()
+ self.lineno += 1
+ while len(line) and line[-1] == '$':
+ line = line[0:-1] + next(input).strip()
+ self.lineno += 1
+ return line
+
+ def print_token(self, tok):
+ if tok == EOL:
+ return "end of line"
+ if tok == BUILD:
+ return '"build"'
+ if tok == POOL:
+ return '"pool"'
+ if tok == RULE:
+ return '"rule"'
+ if tok == DEFAULT:
+ return '"default"'
+ if tok == EQUALS:
+ return '"="'
+ if tok == COLON:
+ return '":"'
+ if tok == PIPE:
+ return '"|"'
+ if tok == PIPE2:
+ return '"||"'
+ if tok == INCLUDE:
+ return '"include"'
+ if tok == IDENT:
+ return 'identifier'
+ return '"%s"' % tok
+
+ def error(self, msg):
+ raise LexerError("%s:%d: %s" % (self.stack[-1].filename, self.lineno, msg))
+
+ def parse_error(self, msg):
+ raise ParseError("%s:%d: %s" % (self.stack[-1].filename, self.lineno, msg))
+
+ def expected(self, expected, tok):
+ msg = "found %s, expected " % (self.print_token(tok), )
+ for i, exp_tok in enumerate(expected):
+ if i > 0:
+ msg = msg + (' or ' if i == len(expected) - 1 else ', ')
+ msg = msg + self.print_token(exp_tok)
+ self.parse_error(msg)
+
+ def _variable_tokens(self, value):
+ for m in STRING_RE.finditer(value):
+ match = m.group(1)
+ if not match:
+ self.error("unexpected '%s'" % (m.group(0), ))
+ yield match
+
+ def _tokens(self, input):
+ while True:
+ try:
+ line = self.next_line(input)
+ except StopIteration:
+ return
+ for m in TOPLEVEL_RE.finditer(line):
+ match = m.group(1)
+ if not match:
+ self.error("unexpected '%s'" % (m.group(0), ))
+ if match == ':':
+ yield COLON
+ continue
+ if match == '|':
+ yield PIPE
+ continue
+ if match == '||':
+ yield PIPE2
+ continue
+ if match[0] == ' ':
+ yield INDENT
+ continue
+ if match[0] == '=':
+ yield EQUALS
+ value = line[m.start() + 1:].lstrip()
+ yield from self._variable_tokens(value)
+ break
+ if match[0] == '#':
+ break
+
+ # identifier
+ if self.match_keyword:
+ if match == 'build':
+ yield BUILD
+ continue
+ if match == 'pool':
+ yield POOL
+ continue
+ if match == 'rule':
+ yield RULE
+ continue
+ if match == 'default':
+ yield DEFAULT
+ continue
+ if match == 'include':
+ filename = line[m.start() + 8:].strip()
+ self.push(filename, open(filename, 'r'))
+ break
+ if match == 'subninja':
+ self.error('subninja is not supported')
+ yield match
+ yield EOL
+
+ def parse(self, events):
+ global_var = True
+
+ def look_for(*expected):
+ # The last token in the token stream is always EOL. This
+ # is exploited to avoid catching StopIteration everywhere.
+ tok = next(self.iter)
+ if tok not in expected:
+ self.expected(expected, tok)
+ return tok
+
+ def look_for_ident(*expected):
+ tok = next(self.iter)
+ if isinstance(tok, str):
+ if not IDENT_RE.match(tok):
+ self.parse_error('variable expansion not allowed')
+ elif tok not in expected:
+ self.expected(expected + (IDENT,), tok)
+ return tok
+
+ def parse_assignment_rhs(gen, expected, in_path):
+ tokens = []
+ for tok in gen:
+ if not isinstance(tok, str):
+ if tok in expected:
+ break
+ self.expected(expected + (IDENT,), tok)
+ if tok[0] != '$':
+ tokens.append(tok)
+ elif tok == '$ ' or tok == '$$' or tok == '$:':
+ tokens.append(events.dollar_token(tok[1], in_path))
+ else:
+ var = tok[2:-1] if tok[1] == '{' else tok[1:]
+ tokens.append(events.variable_expansion_token(var))
+ else:
+ # gen must have raised StopIteration
+ tok = None
+
+ if tokens:
+ # Fast path avoiding str.join()
+ value = tokens[0] if len(tokens) == 1 else ''.join(tokens)
+ else:
+ value = None
+ return value, tok
+
+ def look_for_path(*expected):
+ # paths in build rules are parsed one space-separated token
+ # at a time and expanded
+ token = next(self.iter)
+ if not isinstance(token, str):
+ return None, token
+ # Fast path if there are no dollar and variable expansion
+ if SIMPLE_PATH_RE.match(token):
+ return token, None
+ gen = self._variable_tokens(token)
+ return parse_assignment_rhs(gen, expected, True)
+
+ def parse_assignment(tok):
+ name = tok
+ assert isinstance(name, str)
+ look_for(EQUALS)
+ value, tok = parse_assignment_rhs(self.iter, (EOL,), False)
+ assert tok == EOL
+ events.variable(name, value)
+
+ def parse_build():
+ # parse outputs
+ out = []
+ iout = []
+ while True:
+ value, tok = look_for_path(COLON, PIPE)
+ if value is None:
+ break
+ out.append(value)
+ if tok == PIPE:
+ while True:
+ value, tok = look_for_path(COLON)
+ if value is None:
+ break
+ iout.append(value)
+
+ # parse rule
+ assert tok == COLON
+ rule = look_for_ident()
+
+ # parse inputs and dependencies
+ in_ = []
+ iin = []
+ orderdep = []
+ while True:
+ value, tok = look_for_path(PIPE, PIPE2, EOL)
+ if value is None:
+ break
+ in_.append(value)
+ if tok == PIPE:
+ while True:
+ value, tok = look_for_path(PIPE2, EOL)
+ if value is None:
+ break
+ iin.append(value)
+ if tok == PIPE2:
+ while True:
+ value, tok = look_for_path(EOL)
+ if value is None:
+ break
+ orderdep.append(value)
+ assert tok == EOL
+ events.begin_build(out, iout, rule, in_, iin, orderdep)
+ nonlocal global_var
+ global_var = False
+
+ def parse_pool():
+ # pool declarations are ignored. Just gobble all the variables
+ ident = look_for_ident()
+ look_for(EOL)
+ events.begin_pool(ident)
+ nonlocal global_var
+ global_var = False
+
+ def parse_rule():
+ ident = look_for_ident()
+ look_for(EOL)
+ events.begin_rule(ident)
+ nonlocal global_var
+ global_var = False
+
+ def parse_default():
+ idents = []
+ while True:
+ ident = look_for_ident(EOL)
+ if ident == EOL:
+ break
+ idents.append(ident)
+ events.default(idents)
+
+ def parse_declaration(tok):
+ if tok == EOL:
+ return
+
+ nonlocal global_var
+ if tok == INDENT:
+ if global_var:
+ self.parse_error('indented line outside rule or edge')
+ tok = look_for_ident(EOL)
+ if tok == EOL:
+ return
+ parse_assignment(tok)
+ return
+
+ if not global_var:
+ events.end_scope()
+ global_var = True
+ if tok == POOL:
+ parse_pool()
+ elif tok == BUILD:
+ parse_build()
+ elif tok == RULE:
+ parse_rule()
+ elif tok == DEFAULT:
+ parse_default()
+ elif isinstance(tok, str):
+ parse_assignment(tok)
+ else:
+ self.expected((POOL, BUILD, RULE, INCLUDE, DEFAULT, IDENT), tok)
+
+ events.begin_file()
+ while self.iter:
+ try:
+ self.match_keyword = True
+ token = next(self.iter)
+ self.match_keyword = False
+ parse_declaration(token)
+ except StopIteration:
+ self.pop()
+ events.end_file()
+
+
+# ---- variable handling ----
+
+def expand(x, rule_vars=None, build_vars=None, global_vars=None):
+ if x is None:
+ return None
+ changed = True
+ have_dollar_replacement = False
+ while changed:
+ changed = False
+ matches = list(VAR_RE.finditer(x))
+ if not matches:
+ break
+
+ # Reverse the match so that expanding later matches does not
+ # invalidate m.start()/m.end() for earlier ones. Do not reduce $$ to $
+ # until all variables are dealt with.
+ for m in reversed(matches):
+ name = m.group(1)
+ if not name:
+ have_dollar_replacement = True
+ continue
+ changed = True
+ if build_vars and name in build_vars:
+ value = build_vars[name]
+ elif rule_vars and name in rule_vars:
+ value = rule_vars[name]
+ elif name in global_vars:
+ value = global_vars[name]
+ else:
+ value = ''
+ x = x[:m.start()] + value + x[m.end():]
+ return x.replace('$$', '$') if have_dollar_replacement else x
+
+
+class Scope(object):
+ def __init__(self, events):
+ self.events = events
+
+ def on_left_scope(self):
+ pass
+
+ def on_variable(self, key, value):
+ pass
+
+
+class BuildScope(Scope):
+ def __init__(self, events, out, iout, rule, in_, iin, orderdep, rule_vars):
+ super().__init__(events)
+ self.rule = rule
+ self.out = [events.expand_and_normalize(x) for x in out]
+ self.in_ = [events.expand_and_normalize(x) for x in in_]
+ self.iin = [events.expand_and_normalize(x) for x in iin]
+ self.orderdep = [events.expand_and_normalize(x) for x in orderdep]
+ self.iout = [events.expand_and_normalize(x) for x in iout]
+ self.rule_vars = rule_vars
+ self.build_vars = dict()
+ self._define_variable('out', ' '.join(self.out))
+ self._define_variable('in', ' '.join(self.in_))
+
+ def expand(self, x):
+ return self.events.expand(x, self.rule_vars, self.build_vars)
+
+ def on_left_scope(self):
+ self.events.variable('out', self.build_vars['out'])
+ self.events.variable('in', self.build_vars['in'])
+ self.events.end_build(self, self.out, self.iout, self.rule, self.in_,
+ self.iin, self.orderdep)
+
+ def _define_variable(self, key, value):
+ # The value has been expanded already, quote it for further
+ # expansion from rule variables
+ value = value.replace('$', '$$')
+ self.build_vars[key] = value
+
+ def on_variable(self, key, value):
+ # in and out are at the top of the lookup order and cannot
+ # be overridden. Also, unlike what the manual says, build
+ # variables only lookup global variables. They never lookup
+ # rule variables, earlier build variables, or in/out.
+ if key not in ('in', 'in_newline', 'out'):
+ self._define_variable(key, self.events.expand(value))
+
+
+class RuleScope(Scope):
+ def __init__(self, events, name, vars_dict):
+ super().__init__(events)
+ self.name = name
+ self.vars_dict = vars_dict
+ self.generator = False
+
+ def on_left_scope(self):
+ self.events.end_rule(self, self.name)
+
+ def on_variable(self, key, value):
+ self.vars_dict[key] = value
+ if key == 'generator':
+ self.generator = True
+
+
+class NinjaParserEventsWithVars(NinjaParserEvents):
+ def __init__(self, parser):
+ super().__init__(parser)
+ self.rule_vars = defaultdict(lambda: dict())
+ self.global_vars = dict()
+ self.scope = None
+
+ def variable(self, name, value):
+ if self.scope:
+ self.scope.on_variable(name, value)
+ else:
+ self.global_vars[name] = self.expand(value)
+
+ def begin_build(self, out, iout, rule, in_, iin, orderdep):
+ if rule != 'phony' and rule not in self.rule_vars:
+ self.parser.parse_error("undefined rule '%s'" % rule)
+
+ self.scope = BuildScope(self, out, iout, rule, in_, iin, orderdep, self.rule_vars[rule])
+
+ def begin_pool(self, name):
+ # pool declarations are ignored. Just gobble all the variables
+ self.scope = Scope(self)
+
+ def begin_rule(self, name):
+ if name in self.rule_vars:
+ self.parser.parse_error("duplicate rule '%s'" % name)
+ self.scope = RuleScope(self, name, self.rule_vars[name])
+
+ def end_scope(self):
+ self.scope.on_left_scope()
+ self.scope = None
+
+ # utility functions:
+
+ def expand(self, x, rule_vars=None, build_vars=None):
+ return expand(x, rule_vars, build_vars, self.global_vars)
+
+ def expand_and_normalize(self, x):
+ return normpath(self.expand(x))
+
+ # extra events not present in the superclass:
+
+ def end_build(self, scope, out, iout, rule, in_, iin, orderdep):
+ pass
+
+ def end_rule(self, scope, name):
+ pass
+
+
+# ---- test client that just prints back whatever it parsed ----
+
+class Writer(NinjaParserEvents):
+ ARGS = argparse.ArgumentParser(description='Rewrite input build.ninja to stdout.')
+
+ def __init__(self, output, parser, args):
+ super().__init__(parser)
+ self.output = output
+ self.indent = ''
+ self.had_vars = False
+
+ def dollar_token(self, word, in_path=False):
+ return '$' + word
+
+ def print(self, *args, **kwargs):
+ if len(args):
+ self.output.write(self.indent)
+ print(*args, **kwargs, file=self.output)
+
+ def variable(self, name, value):
+ self.print('%s = %s' % (name, value))
+ self.had_vars = True
+
+ def begin_scope(self):
+ self.indent = ' '
+ self.had_vars = False
+
+ def end_scope(self):
+ if self.had_vars:
+ self.print()
+ self.indent = ''
+ self.had_vars = False
+
+ def begin_pool(self, name):
+ self.print('pool %s' % name)
+ self.begin_scope()
+
+ def begin_rule(self, name):
+ self.print('rule %s' % name)
+ self.begin_scope()
+
+ def begin_build(self, outputs, implicit_outputs, rule, inputs, implicit, order_only):
+ all_outputs = list(outputs)
+ all_inputs = list(inputs)
+
+ if implicit:
+ all_inputs.append('|')
+ all_inputs.extend(implicit)
+ if order_only:
+ all_inputs.append('||')
+ all_inputs.extend(order_only)
+ if implicit_outputs:
+ all_outputs.append('|')
+ all_outputs.extend(implicit_outputs)
+
+ self.print('build %s: %s' % (' '.join(all_outputs),
+ ' '.join([rule] + all_inputs)))
+ self.begin_scope()
+
+ def default(self, targets):
+ self.print('default %s' % ' '.join(targets))
+
+
+# ---- emit compile_commands.json ----
+
+class Compdb(NinjaParserEventsWithVars):
+ ARGS = argparse.ArgumentParser(description='Emit compile_commands.json.')
+ ARGS.add_argument('rules', nargs='*',
+ help='The ninja rules to emit compilation commands for.')
+
+ def __init__(self, output, parser, args):
+ super().__init__(parser)
+ self.output = output
+ self.rules = args.rules
+ self.sep = ''
+
+ def begin_file(self):
+ self.output.write('[')
+ self.directory = os.getcwd()
+
+ def print_entry(self, **entry):
+ entry['directory'] = self.directory
+ self.output.write(self.sep + json.dumps(entry))
+ self.sep = ',\n'
+
+ def begin_build(self, out, iout, rule, in_, iin, orderdep):
+ if in_ and rule in self.rules:
+ super().begin_build(out, iout, rule, in_, iin, orderdep)
+ else:
+ self.scope = Scope(self)
+
+ def end_build(self, scope, out, iout, rule, in_, iin, orderdep):
+ self.print_entry(command=scope.expand('${command}'), file=in_[0])
+
+ def end_file(self):
+ self.output.write(']\n')
+
+
+# ---- clean output files ----
+
+class Clean(NinjaParserEventsWithVars):
+ ARGS = argparse.ArgumentParser(description='Remove output build files.')
+ ARGS.add_argument('-g', dest='generator', action='store_true',
+ help='clean generated files too')
+
+ def __init__(self, output, parser, args):
+ super().__init__(parser)
+ self.dry_run = args.dry_run
+ self.verbose = args.verbose or args.dry_run
+ self.generator = args.generator
+
+ def begin_file(self):
+ print('Cleaning... ', end=(None if self.verbose else ''), flush=True)
+ self.cnt = 0
+
+ def end_file(self):
+ print('%d files' % self.cnt)
+
+ def do_clean(self, *files):
+ for f in files:
+ if self.dry_run:
+ if os.path.exists(f):
+ self.cnt += 1
+ print('Would remove ' + f)
+ continue
+ else:
+ try:
+ if os.path.isdir(f):
+ shutil.rmtree(f)
+ else:
+ os.unlink(f)
+ self.cnt += 1
+ if self.verbose:
+ print('Removed ' + f)
+ except FileNotFoundError:
+ pass
+
+ def end_build(self, scope, out, iout, rule, in_, iin, orderdep):
+ if rule == 'phony':
+ return
+ if self.generator:
+ rspfile = scope.expand('${rspfile}')
+ if rspfile:
+ self.do_clean(rspfile)
+ if self.generator or not scope.expand('${generator}'):
+ self.do_clean(*out, *iout)
+ depfile = scope.expand('${depfile}')
+ if depfile:
+ self.do_clean(depfile)
+
+
+# ---- convert build.ninja to makefile ----
+
+class Ninja2Make(NinjaParserEventsWithVars):
+ ARGS = argparse.ArgumentParser(description='Convert build.ninja to a Makefile.')
+ ARGS.add_argument('--clean', dest='emit_clean', action='store_true',
+ help='Emit clean/distclean rules.')
+ ARGS.add_argument('--doublecolon', action='store_true',
+ help='Emit double-colon rules for phony targets.')
+ ARGS.add_argument('--omit', metavar='TARGET', nargs='+',
+ help='Targets to omit.')
+
+ def __init__(self, output, parser, args):
+ super().__init__(parser)
+ self.output = output
+
+ self.emit_clean = args.emit_clean
+ self.doublecolon = args.doublecolon
+ self.omit = set(args.omit)
+
+ if self.emit_clean:
+ self.omit.update(['clean', 'distclean'])
+
+ # Lists of targets are kept in memory and emitted only at the
+ # end because appending is really inefficient in GNU make.
+ # We only do it when it's O(#rules) or O(#variables), but
+ # never when it could be O(#targets).
+ self.depfiles = list()
+ self.rspfiles = list()
+ self.build_vars = defaultdict(lambda: dict())
+ self.rule_targets = defaultdict(lambda: list())
+ self.num_stamp = defaultdict(lambda: 0)
+ self.all_outs = set()
+ self.all_ins = set()
+ self.all_phony = set()
+ self.seen_default = False
+
+ def print(self, *args, **kwargs):
+ print(*args, **kwargs, file=self.output)
+
+ def dollar_token(self, word, in_path=False):
+ if in_path and word == ' ':
+ self.parser.parse_error('Make does not support spaces in filenames')
+ return '$$' if word == '$' else word
+
+ def print_phony(self, outs, ins):
+ targets = ' '.join(outs).replace('$', '$$')
+ deps = ' '.join(ins).replace('$', '$$')
+ deps = deps.strip()
+ if self.doublecolon:
+ self.print(targets + '::' + (' ' if deps else '') + deps + ';@:')
+ else:
+ self.print(targets + ':' + (' ' if deps else '') + deps)
+ self.all_phony.update(outs)
+
+ def begin_file(self):
+ self.print(r'# This is an automatically generated file, and it shows.')
+ self.print(r'ninja-default:')
+ self.print(r'.PHONY: ninja-default')
+ if self.emit_clean:
+ self.print(r'ninja-clean:: ninja-clean-start; $(if $V,,@)rm -f ${ninja-depfiles}')
+ self.print(r'ninja-clean-start:; $(if $V,,@echo Cleaning...)')
+ self.print(r'ninja-distclean:: clean; $(if $V,,@)rm -f ${ninja-rspfiles}')
+ self.print(r'.PHONY: ninja-clean ninja-clean-start ninja-distclean')
+ self.print_phony(['clean'], ['ninja-clean'])
+ self.print_phony(['distclean'], ['ninja-distclean'])
+ self.print(r'vpath')
+ self.print(r'NULL :=')
+ self.print(r'SPACE := ${NULL} #')
+ self.print(r'MAKEFLAGS += -rR')
+ self.print(r'define NEWLINE')
+ self.print(r'')
+ self.print(r'endef')
+ self.print(r'.var.in_newline = $(subst $(SPACE),$(NEWLINE),${.var.in})')
+ self.print(r"ninja-command = $(if $V,,$(if ${.var.description},@printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.command}")
+ self.print(r"ninja-command-restat = $(if $V,,$(if ${.var.description},@printf '%s\n' '$(subst ','\'',${.var.description})' && ))${.var.command} && if test -e $(firstword ${.var.out}); then printf '%s\n' ${.var.out} > $@; fi")
+
+ def mangle_vars_for_make(self, x):
+ matches = list(VAR_RE.finditer(x))
+
+ # Reverse the match so that expanding later matches does not
+ # invalidate m.span() for earlier ones.
+ matches.reverse()
+ for m in matches:
+ match = m.group(1)
+ if not match:
+ continue
+ value = '${.var.' + match + '}'
+ x = x[:m.start()] + value + x[m.end():]
+ return x
+
+ def end_file(self):
+ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+ return [int(text) if text.isdigit() else text.lower()
+ for text in _nsre.split(s)]
+
+ self.print()
+ self.print('ninja-outputdirs :=')
+ for rule in self.rule_vars:
+ if rule == 'phony':
+ continue
+ self.print('ninja-targets-%s := %s' % (rule, ' '.join(self.rule_targets[rule])))
+ for name, value in self.rule_vars[rule].items():
+ self.print('$(ninja-targets-%s): .var.%s = %s' % (rule, name, self.mangle_vars_for_make(value)))
+ self.print('ninja-outputdirs += $(sort $(dir ${ninja-targets-%s}))' % rule)
+ self.print()
+ self.print('dummy := $(shell mkdir -p . $(sort $(ninja-outputdirs)))')
+ self.print('ninja-depfiles :=' + ' '.join(self.depfiles))
+ self.print('ninja-rspfiles :=' + ' '.join(self.rspfiles))
+ self.print('-include ${ninja-depfiles}')
+ self.print()
+ for targets in self.build_vars:
+ for name, value in self.build_vars[targets].items():
+ self.print('%s: .var.%s := %s' % (targets, name, value))
+ self.print()
+ if not self.seen_default:
+ default_targets = sorted(self.all_outs - self.all_ins, key=natural_sort_key)
+ self.print('ninja-default: ' + ' '.join(default_targets))
+
+ # This is a hack... Meson declares input meson.build files as
+ # phony, because Ninja does not have an equivalent of Make's
+ # "path/to/file:" declaration that ignores "path/to/file" even
+ # if it is absent. However, Makefile.ninja wants to depend on
+ # build.ninja, which in turn depends on these phony targets which
+ # would cause Makefile.ninja to be rebuilt in a loop.
+ phony_targets = sorted(self.all_phony - self.all_ins, key=natural_sort_key)
+ self.print('.PHONY: ' + ' '.join(phony_targets))
+
+ def variable(self, name, value):
+ super().variable(name, value)
+ if self.scope is None:
+ self.global_vars[name] = self.expand(value)
+ self.print('.var.%s := %s' % (name, self.global_vars[name]))
+
+ def begin_build(self, out, iout, rule, in_, iin, orderdep):
+ if any(x in self.omit for x in out):
+ self.scope = Scope(self)
+ return
+
+ super().begin_build(out, iout, rule, in_, iin, orderdep)
+ self.current_targets = ' '.join(self.scope.out + self.scope.iout).replace('$', '$$')
+
+ def end_build(self, scope, out, iout, rule, in_, iin, orderdep):
+ self.rule_targets[rule] += self.scope.out
+ self.rule_targets[rule] += self.scope.iout
+
+ self.all_outs.update(self.scope.iout)
+ self.all_outs.update(self.scope.out)
+ self.all_ins.update(self.scope.in_)
+ self.all_ins.update(self.scope.iin)
+
+ targets = self.current_targets
+ self.current_targets = None
+ if rule == 'phony':
+ # Phony rules treat order-only dependencies as normal deps
+ self.print_phony(out + iout, in_ + iin + orderdep)
+ return
+
+ inputs = ' '.join(in_ + iin).replace('$', '$$')
+ orderonly = ' '.join(orderdep).replace('$', '$$')
+
+ rspfile = scope.expand('${rspfile}')
+ if rspfile:
+ rspfile_content = scope.expand('${rspfile_content}')
+ with open(rspfile, 'w') as f:
+ f.write(rspfile_content)
+ inputs += ' ' + rspfile
+ self.rspfiles.append(rspfile)
+
+ restat = 'restat' in self.scope.build_vars or 'restat' in self.rule_vars[rule]
+ if restat:
+ if len(out) == 1:
+ stamp = out[0] + '.stamp'
+ else:
+ stamp = '%s%d.stamp' %(rule, self.num_stamp[rule])
+ self.num_stamp[rule] += 1
+ self.print('%s: %s; @:' % (targets, stamp))
+ self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, inputs, orderonly))
+ self.rule_targets[rule].append(stamp)
+ self.build_vars[stamp] = self.scope.build_vars
+ else:
+ self.print('%s: %s | %s; ${ninja-command}' % (targets, inputs, orderonly))
+ self.build_vars[targets] = self.scope.build_vars
+
+ depfile = scope.expand('${depfile}')
+ if depfile:
+ self.depfiles.append(depfile)
+
+ def end_rule(self, scope, name):
+ if self.emit_clean:
+ # Note that the generator pseudo-variable could also be attached
+ # to a build block rather than a rule. This is not handled here
+ # in order to reduce the number of "rm" invocations. However,
+ # "ninjatool.py -t clean" does that correctly.
+ self.print('ninja-%s:: ; $(if $V,,@)rm -rf ${ninja-targets-%s}' % (
+ 'distclean' if scope.generator else 'clean',
+ name))
+
+ def default(self, targets):
+ self.print("ninja-default: " + ' '.join(targets))
+ self.seen_default = True
+
+
+# ---- command line parsing ----
+
+# we cannot use subparsers because tools are chosen through the "-t"
+# option.
+
+class ToolAction(argparse.Action):
+ def __init__(self, option_strings, dest, choices, metavar='TOOL', nargs=None, **kwargs):
+ if nargs is not None:
+ raise ValueError("nargs not allowed")
+ super().__init__(option_strings, dest, required=True, choices=choices,
+ metavar=metavar, **kwargs)
+
+ def __call__(self, parser, namespace, value, option_string):
+ tool = self.choices[value]
+ setattr(namespace, self.dest, tool)
+ tool.ARGS.prog = '%s %s %s' % (parser.prog, option_string, value)
+
+
+class ToolHelpAction(argparse.Action):
+ def __init__(self, option_strings, dest, nargs=None, **kwargs):
+ if nargs is not None:
+ raise ValueError("nargs not allowed")
+ super().__init__(option_strings, dest, nargs=0, **kwargs)
+
+ def __call__(self, parser, namespace, values, option_string=None):
+ if namespace.tool:
+ namespace.tool.ARGS.print_help()
+ else:
+ parser.print_help()
+ parser.exit()
+
+
+tools = {
+ 'test': Writer,
+ 'ninja2make': Ninja2Make,
+ 'compdb': Compdb,
+ 'clean': Clean,
+}
+
+parser = argparse.ArgumentParser(description='Process and transform build.ninja files.',
+ add_help=False)
+parser.add_argument('-C', metavar='DIR', dest='dir', default='.',
+ help='change to DIR before doing anything else')
+parser.add_argument('-f', metavar='FILE', dest='file', default='build.ninja',
+ help='specify input build file [default=build.ninja]')
+parser.add_argument('-n', dest='dry_run', action='store_true',
+ help='do not actually do anything')
+parser.add_argument('-v', dest='verbose', action='store_true',
+ help='be more verbose')
+
+parser.add_argument('-t', dest='tool', choices=tools, action=ToolAction,
+ help='choose the tool to run')
+parser.add_argument('-h', '--help', action=ToolHelpAction,
+ help='show this help message and exit')
+
+if len(sys.argv) >= 2 and sys.argv[1] == '--version':
+ print('1.8')
+ sys.exit(0)
+
+args, tool_args = parser.parse_known_args()
+args.tool.ARGS.parse_args(tool_args, args)
+
+os.chdir(args.dir)
+with open(args.file, 'r') as f:
+ parser = NinjaParser(args.file, f)
+ try:
+ events = args.tool(sys.stdout, parser, args)
+ except InvalidArgumentError as e:
+ parser.error(str(e))
+ parser.parse(events)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 013/143] configure: generate Meson cross file
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (11 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 012/143] configure: integrate Meson in the build system Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 014/143] build-sys hack: link with whole .fa archives Paolo Bonzini
` (134 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/configure b/configure
index f2822b7..13db149 100755
--- a/configure
+++ b/configure
@@ -8582,6 +8582,49 @@ echo "# Automatically generated by configure - do not modify" > "$iotests_common
echo >> "$iotests_common_env"
echo "export PYTHON='$python'" >> "$iotests_common_env"
+cross="config-meson.cross"
+cross_arg=
+
+if test -n "$cross_prefix"; then
+ echo "# Automatically generated by configure - do not modify" > $cross
+ echo "[binaries]" >> $cross
+ echo "c = '$cc'" >> $cross
+ echo "cpp = '$cxx'" >> $cross
+ echo "ar = '$ar'" >> $cross
+ echo "nm = '$nm'" >> $cross
+ echo "pkgconfig = '$pkg_config_exe'" >> $cross
+ echo "ranlib = '$ranlib'" >> $cross
+ echo "strip = '$strip'" >> $cross
+ echo "windres = '$windres'" >> $cross
+
+ echo "[properties]" >> $cross
+ echo "root = '$prefix'" >> $cross
+
+ echo "[host_machine]" >> $cross
+if test "$mingw32" = "yes" ; then
+ echo "system = 'windows'" >> $cross
+fi
+case "$ARCH" in
+ i386|x86_64)
+ echo "cpu_family = 'x86'" >> $cross
+ ;;
+ ppc64le)
+ echo "cpu_family = 'ppc64'" >> $cross
+ ;;
+ *)
+ echo "cpu_family = '$ARCH'" >> $cross
+ ;;
+esac
+ echo "cpu = '$cpu'" >> $cross
+if test "$bigendian" = "yes" ; then
+ echo "endian = 'big'" >> $cross
+else
+ echo "endian = 'little'" >> $cross
+fi
+
+ cross_arg="--cross-file=$cross"
+fi
+
rm -rf meson-private/ meson-logs/ meson-info/
NINJA=$PWD/ninjatool $python $meson setup \
--prefix "$prefix" \
@@ -8597,11 +8640,13 @@ NINJA=$PWD/ninjatool $python $meson setup \
-Ddebug=$(if test "$debug_info" = yes; then echo true; else echo false; fi) \
-Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
+ $cross_arg \
"$PWD" "$source_path"
if test "$?" -ne 0 ; then
error_exit "meson setup failed"
fi
+touch ninjatool.stamp
# Save the configure command line for later reuse.
cat <<EOD >config.status
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 014/143] build-sys hack: link with whole .fa archives
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (12 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 013/143] configure: generate Meson cross file Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 015/143] build-sys: add meson submodule Paolo Bonzini
` (133 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
In order to link the *-obj-y files into tests, we will make static
libraries of them in Meson, and then link them as whole archives
into the tests. To separate regular static libraries from link-whole
libraries, give them a different file extension.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rules.mak | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/rules.mak b/rules.mak
index e79a400..5ab42de 100644
--- a/rules.mak
+++ b/rules.mak
@@ -39,6 +39,13 @@ find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2)))
defined-symbols = $(call find-symbols,$1,awk '$$2!="U"{print $$1}')
undefined-symbols = $(call find-symbols,$1,awk '$$2=="U"{print $$1}')
+WL := -Wl,
+ifdef CONFIG_DARWIN
+whole-archive = $(WL)-force_load,$1
+else
+whole-archive = $(WL)--whole-archive $1 $(WL)--no-whole-archive
+endif
+
# All the .mo objects in -m variables are also added into corresponding -y
# variable in unnest-vars, but filtered out here, when LINK is called.
#
@@ -54,11 +61,12 @@ undefined-symbols = $(call find-symbols,$1,awk '$$2=="U"{print $$1}')
# This is necessary because the exectuable itself may not use the function, in
# which case the function would not be linked in. Then the DSO loading will
# fail because of the missing symbol.
-process-archive-undefs = $(filter-out %.a %.mo,$1) \
+process-archive-undefs = $(filter-out %.a %.fa %.mo,$1) \
$(addprefix $(WL_U), \
- $(filter $(call defined-symbols,$(filter %.a, $1)), \
+ $(filter $(call defined-symbols,$(filter %.a %.fa, $1)), \
$(call undefined-symbols,$(filter %.mo,$1)))) \
- $(filter %.a,$1)
+ $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \
+ $(filter %.a,$1)
extract-libs = $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs)))
expand-objs = $(strip $(sort $(filter %.o,$1)) \
@@ -122,7 +130,7 @@ LD_REL := $(CC) -nostdlib $(LD_REL_FLAGS)
modules:
%$(EXESUF): %.o
- $(call LINK,$(filter %.o %.a %.mo, $^))
+ $(call LINK,$(filter %.o %.a %.mo %.fa, $^))
%.a:
$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@")
@@ -378,7 +386,7 @@ define unnest-vars
$(error $o added in $v but $o-objs is not set)))
$(shell mkdir -p ./ $(sort $(dir $($v))))
# Include all the .d files
- $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$($v))))
+ $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.o,$($v)))))
$(eval $v := $(filter-out %/,$($v))))
endef
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 015/143] build-sys: add meson submodule
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (13 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 014/143] build-sys hack: link with whole .fa archives Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 10:37 ` Alex Bennée
2020-08-06 19:14 ` [PATCH 016/143] meson: move summary to meson.build Paolo Bonzini
` (132 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitmodules | 3 +++
configure | 44 +++++++++++++++++++++++++++++++++++++++++---
meson | 1 +
scripts/archive-source.sh | 3 ++-
4 files changed, 47 insertions(+), 4 deletions(-)
create mode 160000 meson
diff --git a/.gitmodules b/.gitmodules
index 9c0501a..ce97939 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
[submodule "roms/qboot"]
path = roms/qboot
url = https://github.com/bonzini/qboot
+[submodule "meson"]
+ path = meson
+ url = https://github.com/mesonbuild/meson/
diff --git a/configure b/configure
index 13db149..d87d544 100755
--- a/configure
+++ b/configure
@@ -174,6 +174,25 @@ path_of() {
return 1
}
+version_ge () {
+ local_ver1=`echo $1 | tr . ' '`
+ local_ver2=`echo $2 | tr . ' '`
+ while true; do
+ set x $local_ver1
+ local_first=${2-0}
+ # shift 2 does nothing if there are less than 2 arguments
+ shift; shift
+ local_ver1=$*
+ set x $local_ver2
+ # the second argument finished, the first must be greater or equal
+ test $# = 1 && return 0
+ test $local_first -lt $2 && return 1
+ test $local_first -gt $2 && return 0
+ shift; shift
+ local_ver2=$*
+ done
+}
+
have_backend () {
echo "$trace_backends" | grep "$1" >/dev/null
}
@@ -1965,9 +1984,28 @@ then
error_exit "Python not found. Use --python=/path/to/python"
fi
-if ! has "$meson"
-then
- error_exit "Meson not found. Use --meson=/path/to/meson"
+if test -z "$meson" ; then
+ if has meson && version_ge "$(meson --version)" 0.55.0; then
+ meson=meson
+ elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
+ meson=git
+ elif test -e "${source_path}/meson/meson.py" ; then
+ meson=internal
+ fi
+fi
+
+case "$meson" in
+ git | internal)
+ if test "$meson" = git; then
+ git_submodules="${git_submodules} meson"
+ (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update meson)
+ fi
+ meson="${source_path}/meson/meson.py"
+ ;;
+esac
+
+if ! has "$meson" ; then
+ error_exit "Meson not found. Use --meson=/path/to/meson|git|internal"
fi
meson=$(command -v $meson)
diff --git a/meson b/meson
new file mode 160000
index 0000000..d0c68dc
--- /dev/null
+++ b/meson
@@ -0,0 +1 @@
+Subproject commit d0c68dc11507a47b9b85de508e023d9590d60565
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index fb5d6b3..c6169db 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -26,7 +26,8 @@ sub_file="${sub_tdir}/submodule.tar"
# independent of what the developer currently has initialized
# in their checkout, because the build environment is completely
# different to the host OS.
-submodules="dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
+submodules="dtc slirp meson ui/keycodemapdb"
+submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
sub_deinit=""
function cleanup() {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 016/143] meson: move summary to meson.build
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (14 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 015/143] build-sys: add meson submodule Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 017/143] meson: enable pie Paolo Bonzini
` (131 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 235 ---------------------------------------------------------
meson.build | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 245 insertions(+), 235 deletions(-)
diff --git a/configure b/configure
index d87d544..3083187 100755
--- a/configure
+++ b/configure
@@ -527,8 +527,6 @@ secret_keyring=""
libdaxctl=""
meson=meson
-supported_cpu="no"
-supported_os="no"
bogus_os="no"
malloc_trim=""
@@ -767,35 +765,27 @@ ARCH=
# Note that this case should only have supported host CPUs, not guests.
case "$cpu" in
ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64)
- supported_cpu="yes"
;;
ppc64le)
ARCH="ppc64"
- supported_cpu="yes"
;;
i386|i486|i586|i686|i86pc|BePC)
cpu="i386"
- supported_cpu="yes"
;;
x86_64|amd64)
cpu="x86_64"
- supported_cpu="yes"
;;
armv*b|armv*l|arm)
cpu="arm"
- supported_cpu="yes"
;;
aarch64)
cpu="aarch64"
- supported_cpu="yes"
;;
mips*)
cpu="mips"
- supported_cpu="yes"
;;
sparc|sun4[cdmuv])
cpu="sparc"
- supported_cpu="yes"
;;
*)
# This will result in either an error or falling back to TCI later
@@ -823,7 +813,6 @@ MINGW32*)
audio_drv_list=""
fi
supported_os="yes"
- pie="no"
;;
GNU/kFreeBSD)
bsd="yes"
@@ -841,7 +830,6 @@ FreeBSD)
libs_qga="-lutil $libs_qga"
netmap="" # enable netmap autodetect
HOST_VARIANT_DIR="freebsd"
- supported_os="yes"
;;
DragonFly)
bsd="yes"
@@ -858,7 +846,6 @@ NetBSD)
audio_possible_drivers="oss sdl"
oss_lib="-lossaudio"
HOST_VARIANT_DIR="netbsd"
- supported_os="yes"
;;
OpenBSD)
bsd="yes"
@@ -866,7 +853,6 @@ OpenBSD)
audio_drv_list="try-sdl"
audio_possible_drivers="sdl"
HOST_VARIANT_DIR="openbsd"
- supported_os="yes"
;;
Darwin)
bsd="yes"
@@ -887,7 +873,6 @@ Darwin)
# won't work when we're compiling with gcc as a C compiler.
QEMU_CFLAGS="-DOS_OBJECT_USE_OBJC=0 $QEMU_CFLAGS"
HOST_VARIANT_DIR="darwin"
- supported_os="yes"
;;
SunOS)
solaris="yes"
@@ -918,7 +903,6 @@ Linux)
linux_user="yes"
kvm="yes"
QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES"
- supported_os="yes"
libudev="yes"
;;
esac
@@ -6855,225 +6839,6 @@ QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS"
QEMU_LDFLAGS="$fdt_ldflags $QEMU_LDFLAGS"
libs_softmmu="$pixman_libs $libs_softmmu"
-echo "Install prefix $prefix"
-echo "BIOS directory $(eval echo $qemu_datadir)"
-echo "firmware path $(eval echo $firmwarepath)"
-echo "binary directory $(eval echo $bindir)"
-echo "library directory $(eval echo $libdir)"
-echo "module directory $(eval echo $qemu_moddir)"
-echo "libexec directory $(eval echo $libexecdir)"
-echo "include directory $(eval echo $includedir)"
-echo "config directory $(eval echo $sysconfdir)"
-if test "$mingw32" = "no" ; then
-echo "local state directory $(eval echo $local_statedir)"
-echo "Manual directory $(eval echo $mandir)"
-echo "ELF interp prefix $interp_prefix"
-else
-echo "local state directory queried at runtime"
-echo "Windows SDK $win_sdk"
-fi
-echo "Build directory $(pwd)"
-echo "Source path $source_path"
-echo "GIT binary $git"
-echo "GIT submodules $git_submodules"
-echo "C compiler $cc"
-echo "Host C compiler $host_cc"
-echo "C++ compiler $cxx"
-echo "Objective-C compiler $objcc"
-echo "ARFLAGS $ARFLAGS"
-echo "CFLAGS $CFLAGS"
-echo "QEMU_CFLAGS $QEMU_CFLAGS"
-echo "QEMU_LDFLAGS $QEMU_LDFLAGS"
-echo "make $make"
-echo "install $install"
-echo "python $python ($python_version)"
-if test "$docs" != "no"; then
- echo "sphinx-build $sphinx_build"
-fi
-echo "genisoimage $genisoimage"
-echo "slirp support $slirp $(echo_version $slirp $slirp_version)"
-if test "$slirp" != "no" ; then
- echo "smbd $smbd"
-fi
-echo "module support $modules"
-echo "alt path mod load $module_upgrades"
-echo "host CPU $cpu"
-echo "host big endian $bigendian"
-echo "target list $target_list"
-echo "gprof enabled $gprof"
-echo "sparse enabled $sparse"
-echo "strip binaries $strip_opt"
-echo "profiler $profiler"
-echo "static build $static"
-echo "safe stack $safe_stack"
-if test "$darwin" = "yes" ; then
- echo "Cocoa support $cocoa"
-fi
-echo "SDL support $sdl $(echo_version $sdl $sdlversion)"
-echo "SDL image support $sdl_image"
-echo "GTK support $gtk $(echo_version $gtk $gtk_version)"
-echo "GTK GL support $gtk_gl"
-echo "VTE support $vte $(echo_version $vte $vteversion)"
-echo "TLS priority $tls_priority"
-echo "GNUTLS support $gnutls"
-echo "libgcrypt $gcrypt"
-if test "$gcrypt" = "yes"
-then
- echo " hmac $gcrypt_hmac"
- echo " XTS $gcrypt_xts"
-fi
-echo "nettle $nettle $(echo_version $nettle $nettle_version)"
-if test "$nettle" = "yes"
-then
- echo " XTS $nettle_xts"
-fi
-echo "libtasn1 $tasn1"
-echo "PAM $auth_pam"
-echo "iconv support $iconv"
-echo "curses support $curses"
-echo "virgl support $virglrenderer $(echo_version $virglrenderer $virgl_version)"
-echo "curl support $curl"
-echo "mingw32 support $mingw32"
-echo "Audio drivers $audio_drv_list"
-echo "Block whitelist (rw) $block_drv_rw_whitelist"
-echo "Block whitelist (ro) $block_drv_ro_whitelist"
-echo "VirtFS support $virtfs"
-echo "Multipath support $mpath"
-echo "VNC support $vnc"
-if test "$vnc" = "yes" ; then
- echo "VNC SASL support $vnc_sasl"
- echo "VNC JPEG support $vnc_jpeg"
- echo "VNC PNG support $vnc_png"
-fi
-echo "xen support $xen"
-if test "$xen" = "yes" ; then
- echo "xen ctrl version $xen_ctrl_version"
-fi
-echo "brlapi support $brlapi"
-echo "Documentation $docs"
-echo "PIE $pie"
-echo "vde support $vde"
-echo "netmap support $netmap"
-echo "Linux AIO support $linux_aio"
-echo "Linux io_uring support $linux_io_uring"
-echo "ATTR/XATTR support $attr"
-echo "Install blobs $blobs"
-echo "KVM support $kvm"
-echo "HAX support $hax"
-echo "HVF support $hvf"
-echo "WHPX support $whpx"
-echo "TCG support $tcg"
-if test "$tcg" = "yes" ; then
- echo "TCG debug enabled $debug_tcg"
- echo "TCG interpreter $tcg_interpreter"
-fi
-echo "malloc trim support $malloc_trim"
-echo "RDMA support $rdma"
-echo "PVRDMA support $pvrdma"
-echo "fdt support $fdt"
-echo "membarrier $membarrier"
-echo "preadv support $preadv"
-echo "fdatasync $fdatasync"
-echo "madvise $madvise"
-echo "posix_madvise $posix_madvise"
-echo "posix_memalign $posix_memalign"
-echo "libcap-ng support $cap_ng"
-echo "vhost-net support $vhost_net"
-echo "vhost-crypto support $vhost_crypto"
-echo "vhost-scsi support $vhost_scsi"
-echo "vhost-vsock support $vhost_vsock"
-echo "vhost-user support $vhost_user"
-echo "vhost-user-fs support $vhost_user_fs"
-echo "vhost-vdpa support $vhost_vdpa"
-echo "Trace backends $trace_backends"
-if have_backend "simple"; then
-echo "Trace output file $trace_file-<pid>"
-fi
-echo "spice support $spice $(echo_version $spice $spice_protocol_version/$spice_server_version)"
-echo "rbd support $rbd"
-echo "xfsctl support $xfs"
-echo "smartcard support $smartcard"
-echo "libusb $libusb"
-echo "usb net redir $usb_redir"
-echo "OpenGL support $opengl"
-echo "OpenGL dmabufs $opengl_dmabuf"
-echo "libiscsi support $libiscsi"
-echo "libnfs support $libnfs"
-echo "build guest agent $guest_agent"
-echo "QGA VSS support $guest_agent_with_vss"
-echo "QGA w32 disk info $guest_agent_ntddscsi"
-echo "QGA MSI support $guest_agent_msi"
-echo "seccomp support $seccomp"
-echo "coroutine backend $coroutine"
-echo "coroutine pool $coroutine_pool"
-echo "debug stack usage $debug_stack_usage"
-echo "mutex debugging $debug_mutex"
-echo "crypto afalg $crypto_afalg"
-echo "GlusterFS support $glusterfs"
-echo "gcov $gcov_tool"
-echo "gcov enabled $gcov"
-echo "TPM support $tpm"
-echo "libssh support $libssh"
-echo "QOM debugging $qom_cast_debug"
-echo "Live block migration $live_block_migration"
-echo "lzo support $lzo"
-echo "snappy support $snappy"
-echo "bzip2 support $bzip2"
-echo "lzfse support $lzfse"
-echo "zstd support $zstd"
-echo "NUMA host support $numa"
-echo "libxml2 $libxml2"
-echo "tcmalloc support $tcmalloc"
-echo "jemalloc support $jemalloc"
-echo "avx2 optimization $avx2_opt"
-echo "avx512f optimization $avx512f_opt"
-echo "replication support $replication"
-echo "bochs support $bochs"
-echo "cloop support $cloop"
-echo "dmg support $dmg"
-echo "qcow v1 support $qcow1"
-echo "vdi support $vdi"
-echo "vvfat support $vvfat"
-echo "qed support $qed"
-echo "parallels support $parallels"
-echo "sheepdog support $sheepdog"
-echo "capstone $capstone"
-echo "libpmem support $libpmem"
-echo "libdaxctl support $libdaxctl"
-echo "libudev $libudev"
-echo "default devices $default_devices"
-echo "plugin support $plugins"
-echo "fuzzing support $fuzzing"
-echo "gdb $gdb_bin"
-echo "rng-none $rng_none"
-echo "Linux keyring $secret_keyring"
-
-if test "$supported_cpu" = "no"; then
- echo
- echo "WARNING: SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!"
- echo
- echo "CPU host architecture $cpu support is not currently maintained."
- echo "The QEMU project intends to remove support for this host CPU in"
- echo "a future release if nobody volunteers to maintain it and to"
- echo "provide a build host for our continuous integration setup."
- echo "configure has succeeded and you can continue to build, but"
- echo "if you care about QEMU on this platform you should contact"
- echo "us upstream at qemu-devel@nongnu.org."
-fi
-
-if test "$supported_os" = "no"; then
- echo
- echo "WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEASES!"
- echo
- echo "Host OS $targetos support is not currently maintained."
- echo "The QEMU project intends to remove support for this host OS in"
- echo "a future release if nobody volunteers to maintain it and to"
- echo "provide a build host for our continuous integration setup."
- echo "configure has succeeded and you can continue to build, but"
- echo "if you care about QEMU on this platform you should contact"
- echo "us upstream at qemu-devel@nongnu.org."
-fi
-
config_host_mak="config-host.mak"
echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
diff --git a/meson.build b/meson.build
index 8499709..48baf20 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,251 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(),
add_project_arguments(config_host['QEMU_INCLUDES'].split(),
language: ['c', 'cpp', 'objc'])
+python = import('python').find_installation(config_host['PYTHON'].split()[0])
+
+if host_machine.system() == 'darwin'
+ add_languages('objc', required: false)
+endif
+
configure_file(input: files('scripts/ninjatool.py'),
output: 'ninjatool',
configuration: config_host)
+
+supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux']
+supported_cpus = ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv64', 'x86', 'x86_64',
+ 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64']
+
+cpu = host_machine.cpu_family()
+targetos = host_machine.system()
+
+summary_info = {}
+summary_info += {'Install prefix': config_host['prefix']}
+summary_info += {'BIOS directory': config_host['qemu_datadir']}
+summary_info += {'firmware path': config_host['qemu_firmwarepath']}
+summary_info += {'binary directory': config_host['bindir']}
+summary_info += {'library directory': config_host['libdir']}
+summary_info += {'module directory': config_host['qemu_moddir']}
+summary_info += {'libexec directory': config_host['libexecdir']}
+summary_info += {'include directory': config_host['includedir']}
+summary_info += {'config directory': config_host['sysconfdir']}
+if targetos != 'windows'
+ summary_info += {'local state directory': config_host['qemu_localstatedir']}
+ summary_info += {'Manual directory': config_host['mandir']}
+else
+ summary_info += {'local state directory': 'queried at runtime'}
+endif
+summary_info += {'Build directory': meson.current_build_dir()}
+summary_info += {'Source path': meson.current_source_dir()}
+summary_info += {'GIT binary': config_host['GIT']}
+summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
+summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]}
+summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]}
+summary_info += {'C++ compiler': meson.get_compiler('cpp', native: true).cmd_array()[0]}
+if host_machine.system() == 'darwin'
+ summary_info += {'Objective-C compiler': meson.get_compiler('objc', native: true).cmd_array()[0]}
+endif
+summary_info += {'ARFLAGS': config_host['ARFLAGS']}
+summary_info += {'CFLAGS': config_host['CFLAGS']}
+summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
+summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
+summary_info += {'make': config_host['MAKE']}
+summary_info += {'install': config_host['INSTALL']}
+summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())}
+summary_info += {'sphinx-build': config_host['SPHINX_BUILD']}
+summary_info += {'genisoimage': config_host['GENISOIMAGE']}
+# TODO: add back version
+summary_info += {'slirp support': config_host.has_key('CONFIG_SLIRP')}
+if config_host.has_key('CONFIG_SLIRP')
+ summary_info += {'smbd': config_host['CONFIG_SMBD_COMMAND']}
+endif
+summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
+if config_host.has_key('CONFIG_MODULES')
+ summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')}
+endif
+summary_info += {'host CPU': cpu}
+summary_info += {'host endianness': build_machine.endian()}
+summary_info += {'target list': config_host['TARGET_DIRS']}
+summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
+summary_info += {'sparse enabled': meson.get_compiler('c').cmd_array().contains('cgcc')}
+summary_info += {'strip binaries': get_option('strip')}
+summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')}
+summary_info += {'static build': config_host.has_key('CONFIG_TOOLS')}
+if targetos == 'darwin'
+ summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
+endif
+# TODO: add back version
+summary_info += {'SDL support': config_host.has_key('CONFIG_SDL')}
+summary_info += {'SDL image support': config_host.has_key('CONFIG_SDL_IMAGE')}
+# TODO: add back version
+summary_info += {'GTK support': config_host.has_key('CONFIG_GTK')}
+summary_info += {'GTK GL support': config_host.has_key('CONFIG_GTK_GL')}
+# TODO: add back version
+summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
+summary_info += {'TLS priority': config_host['CONFIG_TLS_PRIORITY']}
+summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
+# TODO: add back version
+summary_info += {'libgcrypt': config_host.has_key('CONFIG_GCRYPT')}
+if config_host.has_key('CONFIG_GCRYPT')
+ summary_info += {' hmac': config_host.has_key('CONFIG_GCRYPT_HMAC')}
+ summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+endif
+# TODO: add back version
+summary_info += {'nettle': config_host.has_key('CONFIG_NETTLE')}
+if config_host.has_key('CONFIG_NETTLE')
+ summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+endif
+summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
+summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
+summary_info += {'iconv support': config_host.has_key('CONFIG_ICONV')}
+summary_info += {'curses support': config_host.has_key('CONFIG_CURSES')}
+# TODO: add back version
+summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
+summary_info += {'curl support': config_host.has_key('CONFIG_CURL')}
+summary_info += {'mingw32 support': targetos == 'windows'}
+summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
+summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
+summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
+summary_info += {'VirtFS support': config_host.has_key('CONFIG_VIRTFS')}
+summary_info += {'Multipath support': config_host.has_key('CONFIG_MPATH')}
+summary_info += {'VNC support': config_host.has_key('CONFIG_VNC')}
+if config_host.has_key('CONFIG_VNC')
+ summary_info += {'VNC SASL support': config_host.has_key('CONFIG_VNC_SASL')}
+ summary_info += {'VNC JPEG support': config_host.has_key('CONFIG_VNC_JPEG')}
+ summary_info += {'VNC PNG support': config_host.has_key('CONFIG_VNC_PNG')}
+endif
+summary_info += {'xen support': config_host.has_key('CONFIG_XEN_BACKEND')}
+if config_host.has_key('CONFIG_XEN_BACKEND')
+ summary_info += {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}
+endif
+summary_info += {'brlapi support': config_host.has_key('CONFIG_BRLAPI')}
+summary_info += {'Documentation': config_host.has_key('BUILD_DOCS')}
+summary_info += {'PIE': get_option('b_pie')}
+summary_info += {'vde support': config_host.has_key('CONFIG_VDE')}
+summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
+summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
+summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')}
+summary_info += {'ATTR/XATTR support': config_host.has_key('CONFIG_ATTR')}
+summary_info += {'Install blobs': config_host.has_key('INSTALL_BLOBS')}
+# TODO: add back KVM/HAX/HVF/WHPX/TCG
+#summary_info += {'KVM support': have_kvm'}
+#summary_info += {'HAX support': have_hax'}
+#summary_info += {'HVF support': have_hvf'}
+#summary_info += {'WHPX support': have_whpx'}
+#summary_info += {'TCG support': have_tcg'}
+#if get_option('tcg')
+# summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
+# summary_info += {'TCG interpreter': config_host.has_key('CONFIG_TCG_INTERPRETER')}
+#endif
+summary_info += {'malloc trim support': config_host.has_key('CONFIG_MALLOC_TRIM')}
+summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
+summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
+summary_info += {'fdt support': config_host.has_key('CONFIG_FDT')}
+summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')}
+summary_info += {'preadv support': config_host.has_key('CONFIG_PREADV')}
+summary_info += {'fdatasync': config_host.has_key('CONFIG_FDATASYNC')}
+summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')}
+summary_info += {'posix_madvise': config_host.has_key('CONFIG_POSIX_MADVISE')}
+summary_info += {'posix_memalign': config_host.has_key('CONFIG_POSIX_MEMALIGN')}
+summary_info += {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP_NG')}
+summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
+summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
+summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
+summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
+summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_KERNEL')}
+summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
+summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
+summary_info += {'Trace backends': config_host['TRACE_BACKENDS']}
+if config_host['TRACE_BACKENDS'].split().contains('simple')
+ summary_info += {'Trace output file': config_host['TRACE_FILE'] + '-<pid>'}
+endif
+# TODO: add back protocol and server version
+summary_info += {'spice support': config_host.has_key('CONFIG_SPICE')}
+summary_info += {'rbd support': config_host.has_key('CONFIG_RBD')}
+summary_info += {'xfsctl support': config_host.has_key('CONFIG_XFS')}
+summary_info += {'smartcard support': config_host.has_key('CONFIG_SMARTCARD')}
+summary_info += {'libusb': config_host.has_key('CONFIG_USB_LIBUSB')}
+summary_info += {'usb net redir': config_host.has_key('CONFIG_USB_REDIR')}
+summary_info += {'OpenGL support': config_host.has_key('CONFIG_OPENGL')}
+summary_info += {'OpenGL dmabufs': config_host.has_key('CONFIG_OPENGL_DMABUF')}
+summary_info += {'libiscsi support': config_host.has_key('CONFIG_LIBISCSI')}
+summary_info += {'libnfs support': config_host.has_key('CONFIG_LIBNFS')}
+summary_info += {'build guest agent': config_host.has_key('CONFIG_GUEST_AGENT')}
+if targetos == 'windows'
+ summary_info += {'Windows SDK': config_host['WIN_SDK']}
+ summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')}
+ summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
+ summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI_ENABLED')}
+endif
+summary_info += {'seccomp support': config_host.has_key('CONFIG_SECCOMP')}
+summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
+summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1'}
+summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
+summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
+summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
+summary_info += {'GlusterFS support': config_host.has_key('CONFIG_GLUSTERFS')}
+summary_info += {'gcov': config_host.has_key('CONFIG_GCOV')}
+summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
+summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
+summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
+summary_info += {'Live block migration': config_host.has_key('CONFIG_LIVE_BLOCK_MIGRATION')}
+summary_info += {'lzo support': config_host.has_key('CONFIG_LZO')}
+summary_info += {'snappy support': config_host.has_key('CONFIG_SNAPPY')}
+summary_info += {'bzip2 support': config_host.has_key('CONFIG_BZIP2')}
+summary_info += {'lzfse support': config_host.has_key('CONFIG_LZFSE')}
+summary_info += {'zstd support': config_host.has_key('CONFIG_ZSTD')}
+summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
+summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')}
+summary_info += {'tcmalloc support': config_host.has_key('CONFIG_TCMALLOC')}
+summary_info += {'jemalloc support': config_host.has_key('CONFIG_JEMALLOC')}
+summary_info += {'avx2 optimization': config_host.has_key('CONFIG_AVX2_OPT')}
+summary_info += {'avx512f optimization': config_host.has_key('CONFIG_AVX512F_OPT')}
+summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
+summary_info += {'bochs support': config_host.has_key('CONFIG_BOCHS')}
+summary_info += {'cloop support': config_host.has_key('CONFIG_CLOOP')}
+summary_info += {'dmg support': config_host.has_key('CONFIG_DMG')}
+summary_info += {'qcow v1 support': config_host.has_key('CONFIG_QCOW1')}
+summary_info += {'vdi support': config_host.has_key('CONFIG_VDI')}
+summary_info += {'vvfat support': config_host.has_key('CONFIG_VVFAT')}
+summary_info += {'qed support': config_host.has_key('CONFIG_QED')}
+summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
+summary_info += {'sheepdog support': config_host.has_key('CONFIG_SHEEPDOG')}
+summary_info += {'capstone': config_host.has_key('CONFIG_CAPSTONE')}
+summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
+summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
+summary_info += {'libudev': config_host.has_key('CONFIG_LIBUDEV')}
+summary_info += {'default devices': config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'}
+summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')}
+summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
+if config_host.has_key('HAVE_GDB_BIN')
+ summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
+endif
+summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
+summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
+summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
+summary(summary_info, bool_yn: true)
+
+if not supported_cpus.contains(cpu)
+ message()
+ warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!')
+ message()
+ message('CPU host architecture ' + cpu + ' support is not currently maintained.')
+ message('The QEMU project intends to remove support for this host CPU in')
+ message('a future release if nobody volunteers to maintain it and to')
+ message('provide a build host for our continuous integration setup.')
+ message('configure has succeeded and you can continue to build, but')
+ message('if you care about QEMU on this platform you should contact')
+ message('us upstream at qemu-devel@nongnu.org.')
+endif
+
+if not supported_oses.contains(targetos)
+ message()
+ warning('WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEASES!')
+ message()
+ message('Host OS ' + targetos + 'support is not currently maintained.')
+ message('The QEMU project intends to remove support for this host OS in')
+ message('a future release if nobody volunteers to maintain it and to')
+ message('provide a build host for our continuous integration setup.')
+ message('configure has succeeded and you can continue to build, but')
+ message('if you care about QEMU on this platform you should contact')
+ message('us upstream at qemu-devel@nongnu.org.')
+endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 017/143] meson: enable pie
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (15 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 016/143] meson: move summary to meson.build Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 018/143] meson: use coverage option Paolo Bonzini
` (130 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure b/configure
index 3083187..23b990e 100755
--- a/configure
+++ b/configure
@@ -8443,6 +8443,7 @@ NINJA=$PWD/ninjatool $python $meson setup \
-Ddebug=$(if test "$debug_info" = yes; then echo true; else echo false; fi) \
-Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
+ -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
$cross_arg \
"$PWD" "$source_path"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 018/143] meson: use coverage option
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (16 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 017/143] meson: enable pie Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 019/143] meson: add sparse support Paolo Bonzini
` (129 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 14 --------------
Makefile.target | 16 ----------------
configure | 9 ++-------
docs/devel/testing.rst | 7 +++----
meson.build | 2 +-
5 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index c0c3b8b..18f6aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -765,14 +765,6 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
"GEN","$@")
-ifdef CONFIG_GCOV
-.PHONY: clean-coverage
-clean-coverage:
- $(call quiet-command, \
- find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \
- "CLEAN", "coverage files")
-endif
-
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
@@ -1275,9 +1267,6 @@ endif
echo '')
@echo 'Cleaning targets:'
$(call print-help,clean,Remove most generated files but keep the config)
-ifdef CONFIG_GCOV
- $(call print-help,clean-coverage,Remove coverage files)
-endif
$(call print-help,distclean,Remove all generated files)
$(call print-help,dist,Build a distributable tarball)
@echo ''
@@ -1288,9 +1277,6 @@ endif
@echo ''
@echo 'Documentation targets:'
$(call print-help,html info pdf txt,Build documentation in specified format)
-ifdef CONFIG_GCOV
- $(call print-help,coverage-report,Create code coverage report)
-endif
@echo ''
ifdef CONFIG_WIN32
@echo 'Windows targets:'
diff --git a/Makefile.target b/Makefile.target
index ffa2657..d61a6a9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -269,19 +269,3 @@ endif
generated-files-y += config-target.h
Makefile: $(generated-files-y)
-
-# Reports/Analysis
-#
-# The target specific coverage report only cares about target specific
-# blobs and not the shared code.
-#
-
-%/coverage-report.html:
- @mkdir -p $*
- $(call quiet-command,\
- gcovr -r $(SRC_PATH) --object-directory $(CURDIR) \
- -p --html --html-details -o $@, \
- "GEN", "coverage-report.html")
-
-.PHONY: coverage-report
-coverage-report: $(CURDIR)/reports/coverage/coverage-report.html
diff --git a/configure b/configure
index 23b990e..bdd35d2 100755
--- a/configure
+++ b/configure
@@ -424,7 +424,6 @@ tcg_interpreter="no"
bigendian="no"
mingw32="no"
gcov="no"
-gcov_tool="gcov"
EXESUF=""
DSOSUF=".so"
LDFLAGS_SHARED="-shared"
@@ -1008,8 +1007,6 @@ for opt do
;;
--meson=*) meson="$optarg"
;;
- --gcov=*) gcov_tool="$optarg"
- ;;
--smbd=*) smbd="$optarg"
;;
--extra-cflags=*)
@@ -1816,7 +1813,6 @@ Advanced options (experts only):
--with-coroutine=BACKEND coroutine backend. Supported options:
ucontext, sigaltstack, windows
--enable-gcov enable test coverage analysis with gcov
- --gcov=GCOV use specified gcov [$gcov_tool]
--disable-blobs disable installing provided firmware blobs
--with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
--with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
@@ -6530,8 +6526,7 @@ fi
write_c_skeleton
if test "$gcov" = "yes" ; then
- QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
- QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+ :
elif test "$fortify_source" = "yes" ; then
QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
debug=no
@@ -7804,7 +7799,6 @@ echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak
echo "POD2MAN=$POD2MAN" >> $config_host_mak
if test "$gcov" = "yes" ; then
echo "CONFIG_GCOV=y" >> $config_host_mak
- echo "GCOV=$gcov_tool" >> $config_host_mak
fi
if test "$libudev" != "no"; then
@@ -8444,6 +8438,7 @@ NINJA=$PWD/ninjatool $python $meson setup \
-Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
+ -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
$cross_arg \
"$PWD" "$source_path"
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index c1ff243..a426469 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -164,13 +164,12 @@ instrumenting the tested code. To use it, configure QEMU with
``--enable-gcov`` option and build. Then run ``make check`` as usual.
If you want to gather coverage information on a single test the ``make
-clean-coverage`` target can be used to delete any existing coverage
+clean-gcda`` target can be used to delete any existing coverage
information before running a single test.
You can generate a HTML coverage report by executing ``make
-coverage-report`` which will create
-./reports/coverage/coverage-report.html. If you want to create it
-elsewhere simply execute ``make /foo/bar/baz/coverage-report.html``.
+coverage-html`` which will create
+``meson-logs/coveragereport/index.html``.
Further analysis can be conducted by running the ``gcov`` command
directly on the various .gcda output files. Please read the ``gcov``
diff --git a/meson.build b/meson.build
index 48baf20..ed61853 100644
--- a/meson.build
+++ b/meson.build
@@ -197,7 +197,7 @@ summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_US
summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
summary_info += {'GlusterFS support': config_host.has_key('CONFIG_GLUSTERFS')}
-summary_info += {'gcov': config_host.has_key('CONFIG_GCOV')}
+summary_info += {'gcov': get_option('b_coverage')}
summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 019/143] meson: add sparse support
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (17 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 018/143] meson: use coverage option Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 020/143] meson: add testsuite Makefile generator Paolo Bonzini
` (128 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Do not use cgcc; instead, extract compilation commands from compile_commands.json
and invoke sparse directly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 +
configure | 8 ++------
meson.build | 7 +++++++
scripts/check_sparse.py | 25 +++++++++++++++++++++++++
4 files changed, 35 insertions(+), 6 deletions(-)
create mode 100644 scripts/check_sparse.py
diff --git a/Makefile b/Makefile
index 18f6aa7..9a75047 100644
--- a/Makefile
+++ b/Makefile
@@ -1245,6 +1245,7 @@ endif
$(call print-help,install,Install QEMU, documentation and tools)
$(call print-help,ctags/TAGS,Generate tags file for editors)
$(call print-help,cscope,Generate cscope index)
+ $(call print-help,sparse,Run sparse on the QEMU source)
@echo ''
@$(if $(TARGET_DIRS), \
echo 'Architecture specific targets:'; \
diff --git a/configure b/configure
index bdd35d2..6ee1359 100755
--- a/configure
+++ b/configure
@@ -2986,7 +2986,7 @@ fi
##########################################
# Sparse probe
if test "$sparse" != "no" ; then
- if has cgcc; then
+ if has sparse; then
sparse=yes
else
if test "$sparse" = "yes" ; then
@@ -7777,11 +7777,7 @@ echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak
if test "$sparse" = "yes" ; then
- echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
- echo "CPP := REAL_CC=\"\$(CPP)\" cgcc" >> $config_host_mak
- echo "CXX := REAL_CC=\"\$(CXX)\" cgcc" >> $config_host_mak
- echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
- echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
+ echo "SPARSE_CFLAGS = -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
fi
echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
diff --git a/meson.build b/meson.build
index ed61853..9749c3d 100644
--- a/meson.build
+++ b/meson.build
@@ -17,6 +17,13 @@ add_project_arguments(config_host['QEMU_INCLUDES'].split(),
python = import('python').find_installation(config_host['PYTHON'].split()[0])
+if 'SPARSE_CFLAGS' in config_host
+ run_target('sparse',
+ command: [find_program('scripts/check_sparse.py'),
+ config_host['SPARSE_CFLAGS'].split(),
+ 'compile_commands.json'])
+endif
+
if host_machine.system() == 'darwin'
add_languages('objc', required: false)
endif
diff --git a/scripts/check_sparse.py b/scripts/check_sparse.py
new file mode 100644
index 0000000..0de7aa5
--- /dev/null
+++ b/scripts/check_sparse.py
@@ -0,0 +1,25 @@
+#! /usr/bin/env python3
+
+# Invoke sparse based on the contents of compile_commands.json
+
+import json
+import subprocess
+import sys
+import shlex
+
+def extract_cflags(shcmd):
+ cflags = shlex.split(shcmd)
+ return [x for x in cflags
+ if x.startswith('-D') or x.startswith('-I') or x.startswith('-W')
+ or x.startswith('-std=')]
+
+cflags = sys.argv[1:-1]
+with open(sys.argv[-1], 'r') as fd:
+ compile_commands = json.load(fd)
+
+for cmd in compile_commands:
+ cmd = ['sparse'] + cflags + extract_cflags(cmd['command']) + [cmd['file']]
+ print(' '.join((shlex.quote(x) for x in cmd)))
+ r = subprocess.run(cmd)
+ if r.returncode != 0:
+ sys.exit(r.returncode)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 020/143] meson: add testsuite Makefile generator
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (18 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 019/143] meson: add sparse support Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 10:48 ` Alex Bennée
2020-08-06 19:14 ` [PATCH 021/143] libqemuutil, qapi, trace: convert to meson Paolo Bonzini
` (127 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Rules to execute tests are generated by a simple Python program
that integrates into the existing "make check" mechanism. This
provides familiarity for developers, and also allows piecewise
conversion of the testsuite Makefiles to meson.
The generated rules are based on QEMU's existing test harness
Makefile and TAP parser.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 4 ++
scripts/mtest2make.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile.include | 1 -
3 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 scripts/mtest2make.py
diff --git a/Makefile b/Makefile
index 9a75047..6248fd0 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,10 @@ ninjatool: ninjatool.stamp
ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak
$(MESON) setup --reconfigure . $(SRC_PATH) && touch $@
+Makefile.mtest: build.ninja scripts/mtest2make.py
+ $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@
+-include Makefile.mtest
+
.git-submodule-status: git-submodule-update config-host.mak
# Check that we're not trying to do an out-of-tree build from
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
new file mode 100644
index 0000000..e978303
--- /dev/null
+++ b/scripts/mtest2make.py
@@ -0,0 +1,102 @@
+#! /usr/bin/env python3
+
+# Create Makefile targets to run tests, from Meson's test introspection data.
+#
+# Author: Paolo Bonzini <pbonzini@redhat.com>
+
+from collections import defaultdict
+import json
+import os
+import shlex
+import sys
+
+class Suite(object):
+ def __init__(self):
+ self.tests = list()
+ self.slow_tests = list()
+ self.executables = set()
+
+print('''
+SPEED = quick
+
+# $1 = test command, $2 = test name
+.test-human-tap = $1 < /dev/null | ./scripts/tap-driver.pl --test-name="$2" $(if $(V),, --show-failures-only)
+.test-human-exitcode = $1 < /dev/null
+.test-tap-tap = $1 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $2/" || true
+.test-tap-exitcode = printf "%s\\n" 1..1 "`$1 < /dev/null > /dev/null || echo "not "`ok 1 $2"
+.test.print = echo $(if $(V),'$1','Running test $2') >&3
+.test.env = MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))}
+
+# $1 = test name, $2 = test target (human or tap)
+.test.run = $(call .test.print,$(.test.cmd.$1),$(.test.name.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.cmd.$1),$(.test.name.$1))
+
+define .test.human_k
+ @exec 3>&1; rc=0; $(foreach TEST, $1, $(call .test.run,$(TEST),human) || rc=$$?;) \\
+ exit $$rc
+endef
+define .test.human_no_k
+ $(foreach TEST, $1, @exec 3>&1; $(call .test.run,$(TEST),human)
+)
+endef
+.test.human = \\
+ $(if $(findstring k, $(MAKEFLAGS)), $(.test.human_k), $(.test.human_no_k))
+
+define .test.tap
+ @exec 3>&1; { $(foreach TEST, $1, $(call .test.run,$(TEST),tap); ) } \\
+ | ./scripts/tap-merge.pl | tee "$@" \\
+ | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only)
+endef
+''')
+
+suites = defaultdict(Suite)
+i = 0
+for test in json.load(sys.stdin):
+ env = ' '.join(('%s=%s' % (shlex.quote(k), shlex.quote(v))
+ for k, v in test['env'].items()))
+ executable = os.path.relpath(test['cmd'][0])
+ if test['workdir'] is not None:
+ test['cmd'][0] = os.path.relpath(test['cmd'][0], test['workdir'])
+ else:
+ test['cmd'][0] = executable
+ cmd = '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in test['cmd'])))
+ if test['workdir'] is not None:
+ cmd = '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd)
+ driver = test['protocol'] if 'protocol' in test else 'exitcode'
+
+ i += 1
+ print('.test.name.%d := %s' % (i, test['name']))
+ print('.test.driver.%d := %s' % (i, driver))
+ print('.test.cmd.%d := %s' % (i, cmd))
+
+ test_suites = test['suite'] or ['default']
+ is_slow = any(s.endswith('-slow') for s in test_suites)
+ for s in test_suites:
+ # The suite name in the introspection info is "PROJECT:SUITE"
+ s = s.split(':')[1]
+ if s.endswith('-slow'):
+ s = s[:-5]
+ if is_slow:
+ suites[s].slow_tests.append(i)
+ else:
+ suites[s].tests.append(i)
+ suites[s].executables.add(executable)
+
+print('.PHONY: check check-report.tap')
+print('check:')
+print('check-report.tap:')
+print('\t@cat $^ | scripts/tap-merge.pl >$@')
+for name, suite in suites.items():
+ executables = ' '.join(suite.executables)
+ slow_test_numbers = ' '.join((str(x) for x in suite.slow_tests))
+ test_numbers = ' '.join((str(x) for x in suite.tests))
+ print('.test.suite-quick.%s := %s' % (name, test_numbers))
+ print('.test.suite-slow.%s := $(.test.suite-quick.%s) %s' % (name, name, slow_test_numbers))
+ print('check-build: %s' % executables)
+ print('.PHONY: check-%s' % name)
+ print('.PHONY: check-report-%s.tap' % name)
+ print('check: check-%s' % name)
+ print('check-%s: %s' % (name, executables))
+ print('\t$(call .test.human, $(.test.suite-$(SPEED).%s))' % (name, ))
+ print('check-report.tap: check-report-%s.tap' % name)
+ print('check-report-%s.tap: %s' % (name, executables))
+ print('\t$(call .test.tap, $(.test.suite-$(SPEED).%s))' % (name, ))
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 985cd14..5e9dff9 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -674,7 +674,6 @@ check-report-unit.tap: $(check-unit-y)
# Reports and overall runs
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
- $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
# FPU Emulation tests (aka softfloat)
#
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 021/143] libqemuutil, qapi, trace: convert to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (19 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 020/143] meson: add testsuite Makefile generator Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 022/143] meson: add remaining generated tcg trace helpers Paolo Bonzini
` (126 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
This shows how to do some "computations" in meson.build using its array
and dictionary data structures, and also a basic usage of the sourceset
module for conditional compilation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 228 ++++++------------------------------
Makefile.objs | 95 ---------------
Makefile.target | 8 +-
configure | 8 ++
crypto/Makefile.objs | 6 -
crypto/meson.build | 11 ++
docs/devel/tracing.txt | 2 +-
meson.build | 178 ++++++++++++++++++++++++++++
qapi/Makefile.objs | 23 ----
qapi/meson.build | 120 +++++++++++++++++++
qobject/Makefile.objs | 3 -
qobject/meson.build | 3 +
rules.mak | 2 +-
scripts/tracetool/backend/dtrace.py | 2 +-
scripts/tracetool/backend/ust.py | 6 +-
storage-daemon/Makefile.objs | 4 +-
storage-daemon/meson.build | 1 +
storage-daemon/qapi/Makefile.objs | 1 -
storage-daemon/qapi/meson.build | 10 ++
stubs/Makefile.objs | 56 ---------
stubs/meson.build | 50 ++++++++
trace/Makefile.objs | 51 --------
trace/meson.build | 82 +++++++++++++
util/Makefile.objs | 83 -------------
util/meson.build | 68 +++++++++++
25 files changed, 576 insertions(+), 525 deletions(-)
create mode 100644 crypto/meson.build
create mode 100644 qapi/meson.build
delete mode 100644 qobject/Makefile.objs
create mode 100644 qobject/meson.build
create mode 100644 storage-daemon/meson.build
delete mode 100644 storage-daemon/qapi/Makefile.objs
create mode 100644 storage-daemon/qapi/meson.build
delete mode 100644 stubs/Makefile.objs
create mode 100644 stubs/meson.build
create mode 100644 trace/meson.build
delete mode 100644 util/Makefile.objs
create mode 100644 util/meson.build
diff --git a/Makefile b/Makefile
index 6248fd0..5209d17 100644
--- a/Makefile
+++ b/Makefile
@@ -121,184 +121,60 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO
generated-files-y = qemu-version.h config-host.h qemu-options.def
-GENERATED_QAPI_FILES = qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c
-GENERATED_QAPI_FILES += qapi/qapi-types.h qapi/qapi-types.c
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.h)
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.c)
-GENERATED_QAPI_FILES += qapi/qapi-builtin-visit.h qapi/qapi-builtin-visit.c
-GENERATED_QAPI_FILES += qapi/qapi-visit.h qapi/qapi-visit.c
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.h)
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.c)
-GENERATED_QAPI_FILES += qapi/qapi-init-commands.h qapi/qapi-init-commands.c
-GENERATED_QAPI_FILES += qapi/qapi-commands.h qapi/qapi-commands.c
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.h)
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.c)
-GENERATED_QAPI_FILES += qapi/qapi-emit-events.h qapi/qapi-emit-events.c
-GENERATED_QAPI_FILES += qapi/qapi-events.h qapi/qapi-events.c
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.h)
-GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.c)
-GENERATED_QAPI_FILES += qapi/qapi-introspect.c qapi/qapi-introspect.h
-GENERATED_QAPI_FILES += qapi/qapi-doc.texi
-
-# The following list considers only the storage daemon main module. All other
-# modules are currently shared with the main schema, so we don't actually
-# generate additional files.
-
-GENERATED_STORAGE_DAEMON_QAPI_FILES = storage-daemon/qapi/qapi-commands.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-commands.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-emit-events.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-emit-events.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-events.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-events.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-init-commands.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-init-commands.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-introspect.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-introspect.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-types.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-types.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-visit.h
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-visit.c
-GENERATED_STORAGE_DAEMON_QAPI_FILES += storage-daemon/qapi/qapi-doc.texi
-
-generated-files-y += $(GENERATED_QAPI_FILES)
-generated-files-y += $(GENERATED_STORAGE_DAEMON_QAPI_FILES)
-
generated-files-y += trace/generated-tcg-tracers.h
generated-files-y += trace/generated-helpers-wrappers.h
generated-files-y += trace/generated-helpers.h
generated-files-y += trace/generated-helpers.c
-generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.h
-generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.c
-
generated-files-y += module_block.h
-TRACE_HEADERS = trace/trace-root.h
-TRACE_SOURCES = trace/trace-root.c
-TRACE_DTRACE =
-ifdef CONFIG_TRACE_DTRACE
-TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h)
-TRACE_DTRACE += trace-dtrace-root.dtrace $(trace-events-subdirs:%=%/trace-dtrace.dtrace)
-endif
-ifdef CONFIG_TRACE_UST
-TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)
-endif
-
-generated-files-y += $(BUILD_DIR)/trace-events-all
generated-files-y += .git-submodule-status
-trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
-trace-group-suffix = $(shell echo $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
-
tracetool-y = $(SRC_PATH)/scripts/tracetool.py
tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-define __trace_rules
-TRACE_HEADERS += trace/trace-$2.h
-TRACE_SOURCES += trace/trace-$2.c
-trace-obj-y += trace/trace-$2.o
-trace/trace-$2.h: trace/trace-$2.h-timestamp
- @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
-trace/trace-$2.h-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
- $(call quiet-command,$(TRACETOOL) \
- --group=$2 \
- --format=h \
- --backends=$(TRACE_BACKENDS) \
- $$< > $$@,"GEN","$$(@:%-timestamp=%)")
-
-trace/trace-$2.c: trace/trace-$2.c-timestamp
- @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
-trace/trace-$2.c-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
- $(call quiet-command,$(TRACETOOL) \
- --group=$2 \
- --format=c \
- --backends=$(TRACE_BACKENDS) \
- $$< > $$@,"GEN","$$(@:%-timestamp=%)")
-endef
-
-%/trace-ust.h: %/trace-ust.h-timestamp
+trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace-ust.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
- $(call quiet-command,$(TRACETOOL) \
- --group=$(call trace-group-name,$@) \
- --format=ust-events-h \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
-
-%/trace-dtrace.dtrace: %/trace-dtrace.dtrace-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace-dtrace.dtrace-timestamp: $(SRC_PATH)/%/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=$(call trace-group-name,$@) \
- --format=d \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
-
-%/trace-dtrace.h: %/trace-dtrace.dtrace $(tracetool-y)
- $(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@")
-
-%/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y)
-
-
-trace/trace-root.h: trace/trace-root.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+ @mkdir -p $(dir $@)
$(call quiet-command,$(TRACETOOL) \
--group=root \
- --format=h \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
+ --format=tcg-helper-wrapper-h \
+ --backend=$(TRACE_BACKENDS) \
+ $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-trace/trace-root.c: trace/trace-root.c-timestamp
+trace/generated-helpers.h: trace/generated-helpers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+ @mkdir -p $(dir $@)
$(call quiet-command,$(TRACETOOL) \
--group=root \
- --format=c \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
+ --format=tcg-helper-h \
+ --backend=$(TRACE_BACKENDS) \
+ $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-trace-ust-root.h: trace-ust-root.h-timestamp
+trace/generated-helpers.c: trace/generated-helpers.c-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+ @mkdir -p $(dir $@)
$(call quiet-command,$(TRACETOOL) \
--group=root \
- --format=ust-events-h \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
-
-trace-ust-all.h: trace-ust-all.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DIR)/config-host.mak
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=ust-events-h \
- --backends=$(TRACE_BACKENDS) \
- $(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)")
+ --format=tcg-helper-c \
+ --backend=$(TRACE_BACKENDS) \
+ $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-trace-ust-all.c: trace-ust-all.c-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DIR)/config-host.mak
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=ust-events-c \
- --backends=$(TRACE_BACKENDS) \
- $(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)")
+trace/generated-helpers.o: trace/generated-helpers.c
-trace-dtrace-root.dtrace: trace-dtrace-root.dtrace-timestamp
+trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-dtrace-root.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+ @mkdir -p $(dir $@)
$(call quiet-command,$(TRACETOOL) \
--group=root \
- --format=d \
- --backends=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(@:%-timestamp=%)")
-
-trace-dtrace-root.h: trace-dtrace-root.dtrace
- $(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@")
-
-trace-dtrace-root.o: trace-dtrace-root.dtrace
+ --format=tcg-h \
+ --backend=$(TRACE_BACKENDS) \
+ $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
@@ -469,10 +345,8 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- stub-obj-y \
authz-obj-y \
chardev-obj-y \
- util-obj-y \
qga-obj-y \
elf2dmp-obj-y \
ivshmem-client-obj-y \
@@ -493,14 +367,7 @@ dummy := $(call unnest-vars,, \
qom-obj-y \
io-obj-y \
common-obj-y \
- common-obj-m \
- trace-obj-y)
-
-dummy := $(foreach DIR,$(trace-events-subdirs),$(eval $(call __trace_rules,$(DIR),$(call trace-group-suffix,$(DIR)))))
-
-generated-files-y += $(TRACE_HEADERS)
-generated-files-y += $(TRACE_SOURCES)
-
+ common-obj-m)
include $(SRC_PATH)/tests/Makefile.include
@@ -614,8 +481,7 @@ Makefile: $(version-obj-y)
######################################################################
# Build libraries
-libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y)
-libvhost-user.a: $(libvhost-user-obj-y) $(util-obj-y) $(stub-obj-y)
+libvhost-user.a: $(libvhost-user-obj-y)
######################################################################
@@ -678,27 +544,6 @@ qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-p
"GEN","$(@:%-timestamp=%)")
@>$@
-qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json \
- $(QAPI_MODULES:%=$(SRC_PATH)/qapi/%.json)
-
-$(GENERATED_QAPI_FILES): qapi-gen-timestamp ;
-qapi-gen-timestamp: $(qapi-modules) $(qapi-py)
- $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \
- -o "qapi" -b $<, \
- "GEN","$(@:%-timestamp=%)")
- @>$@
-
-qapi-modules-storage-daemon = \
- $(SRC_PATH)/storage-daemon/qapi/qapi-schema.json \
- $(QAPI_MODULES_STORAGE_DAEMON:%=$(SRC_PATH)/qapi/%.json)
-
-$(GENERATED_STORAGE_DAEMON_QAPI_FILES): storage-daemon/qapi/qapi-gen-timestamp ;
-storage-daemon/qapi/qapi-gen-timestamp: $(qapi-modules-storage-daemon) $(qapi-py)
- $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \
- -o "storage-daemon/qapi" $<, \
- "GEN","$(@:%-timestamp=%)")
- @>$@
-
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qapi-commands.h qga-qapi-init-commands.h)
$(qga-obj-y): $(QGALIB_GEN)
@@ -736,9 +581,9 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
-vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a
+vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
@@ -751,12 +596,12 @@ virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a
+vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
ifdef CONFIG_VHOST_USER_INPUT
ifdef CONFIG_LINUX
-vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a libqemuutil.a
+vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
# build by default, do not install
@@ -784,9 +629,6 @@ clean: recurse-clean
rm -f fsdev/*.pod scsi/*.pod
rm -f qemu-img-cmds.h
rm -f ui/shader/*-vert.h ui/shader/*-frag.h
- @# May not be present in generated-files-y
- rm -f trace/generated-tracers-dtrace.dtrace*
- rm -f trace/generated-tracers-dtrace.h*
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
rm -f qapi-gen-timestamp
rm -f storage-daemon/qapi/qapi-gen-timestamp
@@ -1013,7 +855,9 @@ endif
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
done
- $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
+ for d in $(TARGET_DIRS); do \
+ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
+ done
# opengl shader programs
ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclude.pl
@@ -1224,10 +1068,6 @@ Makefile: $(generated-files-y)
endif
endif
-.SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \
- $(TRACE_SOURCES) $(TRACE_SOURCES:%=%-timestamp) \
- $(TRACE_DTRACE) $(TRACE_DTRACE:%=%-timestamp)
-
# Include automatically generated dependency files
# Dependencies in Makefile.objs files come from our recursive subdir rules
-include $(wildcard *.d tests/*.d)
diff --git a/Makefile.objs b/Makefile.objs
index 3823463..e5c9077 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,7 +1,5 @@
#######################################################################
# Common libraries for tools and emulators
-stub-obj-y = stubs/
-util-obj-y = crypto/ util/ qobject/ qapi/
qom-obj-y = qom/
#######################################################################
@@ -95,10 +93,6 @@ common-obj-y += disas/
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
######################################################################
-# tracing
-util-obj-y += trace/
-
-######################################################################
# guest agent
# FIXME: a few definitions from qapi/qapi-types.o and
@@ -123,92 +117,3 @@ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
virtiofsd-obj-y = tools/virtiofsd/
######################################################################
-trace-events-subdirs =
-trace-events-subdirs += accel/kvm
-trace-events-subdirs += accel/tcg
-trace-events-subdirs += backends
-trace-events-subdirs += backends/tpm
-trace-events-subdirs += crypto
-trace-events-subdirs += monitor
-ifeq ($(CONFIG_USER_ONLY),y)
-trace-events-subdirs += linux-user
-endif
-ifeq ($(CONFIG_BLOCK),y)
-trace-events-subdirs += authz
-trace-events-subdirs += block
-trace-events-subdirs += io
-trace-events-subdirs += nbd
-trace-events-subdirs += scsi
-endif
-ifeq ($(CONFIG_SOFTMMU),y)
-trace-events-subdirs += audio
-trace-events-subdirs += chardev
-trace-events-subdirs += hw/9pfs
-trace-events-subdirs += hw/acpi
-trace-events-subdirs += hw/alpha
-trace-events-subdirs += hw/arm
-trace-events-subdirs += hw/audio
-trace-events-subdirs += hw/block
-trace-events-subdirs += hw/block/dataplane
-trace-events-subdirs += hw/char
-trace-events-subdirs += hw/dma
-trace-events-subdirs += hw/hppa
-trace-events-subdirs += hw/hyperv
-trace-events-subdirs += hw/i2c
-trace-events-subdirs += hw/i386
-trace-events-subdirs += hw/i386/xen
-trace-events-subdirs += hw/ide
-trace-events-subdirs += hw/input
-trace-events-subdirs += hw/intc
-trace-events-subdirs += hw/isa
-trace-events-subdirs += hw/mem
-trace-events-subdirs += hw/mips
-trace-events-subdirs += hw/misc
-trace-events-subdirs += hw/misc/macio
-trace-events-subdirs += hw/net
-trace-events-subdirs += hw/nvram
-trace-events-subdirs += hw/pci
-trace-events-subdirs += hw/pci-host
-trace-events-subdirs += hw/ppc
-trace-events-subdirs += hw/rdma
-trace-events-subdirs += hw/rdma/vmw
-trace-events-subdirs += hw/rtc
-trace-events-subdirs += hw/s390x
-trace-events-subdirs += hw/scsi
-trace-events-subdirs += hw/sd
-trace-events-subdirs += hw/sparc
-trace-events-subdirs += hw/sparc64
-trace-events-subdirs += hw/ssi
-trace-events-subdirs += hw/timer
-trace-events-subdirs += hw/tpm
-trace-events-subdirs += hw/usb
-trace-events-subdirs += hw/vfio
-trace-events-subdirs += hw/virtio
-trace-events-subdirs += hw/watchdog
-trace-events-subdirs += hw/xen
-trace-events-subdirs += hw/gpio
-trace-events-subdirs += hw/riscv
-trace-events-subdirs += migration
-trace-events-subdirs += net
-trace-events-subdirs += ui
-endif
-trace-events-subdirs += hw/core
-trace-events-subdirs += hw/display
-trace-events-subdirs += qapi
-trace-events-subdirs += qom
-trace-events-subdirs += target/arm
-trace-events-subdirs += target/hppa
-trace-events-subdirs += target/i386
-trace-events-subdirs += target/mips
-trace-events-subdirs += target/ppc
-trace-events-subdirs += target/riscv
-trace-events-subdirs += target/s390x
-trace-events-subdirs += target/sparc
-trace-events-subdirs += util
-
-trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)
-
-trace-obj-y = trace-root.o
-trace-obj-$(CONFIG_TRACE_UST) += trace-ust-all.o
-trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace-root.o
-trace-obj-$(CONFIG_TRACE_DTRACE) += $(trace-events-subdirs:%=%/trace-dtrace.o)
diff --git a/Makefile.target b/Makefile.target
index d61a6a9..0b32364 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -57,7 +57,7 @@ endif
tracetool-y = $(SRC_PATH)/scripts/tracetool.py
tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y)
+$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--group=all \
--format=stap \
@@ -67,7 +67,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y)
--target-type=$(TARGET_TYPE) \
$< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed")
-$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
+$(QEMU_PROG).stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--group=all \
--format=stap \
@@ -77,7 +77,7 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
--target-type=$(TARGET_TYPE) \
$< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp")
-$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
+$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--group=all \
--format=simpletrace-stap \
@@ -85,7 +85,7 @@ $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
--probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
$< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
-$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
+$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--group=all \
--format=log-stap \
diff --git a/configure b/configure
index 6ee1359..e3a7e71 100755
--- a/configure
+++ b/configure
@@ -7165,6 +7165,8 @@ fi
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
if test "$gnutls" = "yes" ; then
echo "CONFIG_GNUTLS=y" >> $config_host_mak
+ echo "GNUTLS_CFLAGS=$gnutls_cflags" >> $config_host_mak
+ echo "GNUTLS_LIBS=$gnutls_libs" >> $config_host_mak
fi
if test "$gcrypt" = "yes" ; then
echo "CONFIG_GCRYPT=y" >> $config_host_mak
@@ -7175,6 +7177,8 @@ fi
if test "$nettle" = "yes" ; then
echo "CONFIG_NETTLE=y" >> $config_host_mak
echo "CONFIG_NETTLE_VERSION_MAJOR=${nettle_version%%.*}" >> $config_host_mak
+ echo "NETTLE_CFLAGS=$nettle_cflags" >> $config_host_mak
+ echo "NETTLE_LIBS=$nettle_libs" >> $config_host_mak
fi
if test "$qemu_private_xts" = "yes" ; then
echo "CONFIG_QEMU_PRIVATE_XTS=y" >> $config_host_mak
@@ -7551,6 +7555,8 @@ if have_backend "log"; then
fi
if have_backend "ust"; then
echo "CONFIG_TRACE_UST=y" >> $config_host_mak
+ echo "LTTNG_UST_LIBS=$lttng_ust_libs" >> $config_host_mak
+ echo "URCU_BP_LIBS=$urcu_bp_libs" >> $config_host_mak
fi
if have_backend "dtrace"; then
echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak
@@ -7776,6 +7782,8 @@ echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak
+echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
+echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
if test "$sparse" = "yes" ; then
echo "SPARSE_CFLAGS = -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
fi
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index f1965b1..a988591 100644
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -35,9 +35,3 @@ crypto-obj-$(CONFIG_QEMU_PRIVATE_XTS) += xts.o
crypto-obj-y += block.o
crypto-obj-y += block-qcow.o
crypto-obj-y += block-luks.o
-
-util-obj-$(CONFIG_GCRYPT) += random-gcrypt.o
-util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) += random-gnutls.o
-util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,$(CONFIG_RNG_NONE))) += random-none.o
-util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,$(if $(CONFIG_RNG_NONE),n,y))) += random-platform.o
-util-obj-y += aes.o init.o
diff --git a/crypto/meson.build b/crypto/meson.build
new file mode 100644
index 0000000..1b24431
--- /dev/null
+++ b/crypto/meson.build
@@ -0,0 +1,11 @@
+util_ss.add(files('aes.c'))
+util_ss.add(files('init.c'))
+if 'CONFIG_GCRYPT' in config_host
+ util_ss.add(files('random-gcrypt.c'))
+elif 'CONFIG_GNUTLS' in config_host
+ util_ss.add(files('random-gnutls.c'), gnutls)
+elif 'CONFIG_RNG_NONE' in config_host
+ util_ss.add(files('random-none.c'))
+else
+ util_ss.add(files('random-platform.c'))
+endif
diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt
index cb5f685..6144d99 100644
--- a/docs/devel/tracing.txt
+++ b/docs/devel/tracing.txt
@@ -60,7 +60,7 @@ general. It is strongly preferred that all events be declared directly in
the sub-directory that uses them. The only exception is where there are some
shared trace events defined in the top level directory trace-events file.
The top level directory generates trace files with a filename prefix of
-"trace-root" instead of just "trace". This is to avoid ambiguity between
+"trace/trace-root" instead of just "trace". This is to avoid ambiguity between
a trace.h in the current directory, vs the top level directory.
=== Using trace events ===
diff --git a/meson.build b/meson.build
index 9749c3d..ec742fe 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,9 @@ project('qemu', ['c', 'cpp'], meson_version: '>=0.55.0',
not_found = dependency('', required: false)
keyval = import('unstable-keyval')
+ss = import('sourceset')
+
+cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
@@ -39,6 +42,181 @@ supported_cpus = ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv64', 'x86
cpu = host_machine.cpu_family()
targetos = host_machine.system()
+m = cc.find_library('m', required: false)
+util = cc.find_library('util', required: false)
+socket = []
+if host_machine.system() == 'windows'
+ socket = cc.find_library('ws2_32')
+endif
+glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
+ link_args: config_host['GLIB_LIBS'].split())
+gio = not_found
+if 'CONFIG_GIO' in config_host
+ gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),
+ link_args: config_host['GIO_LIBS'].split())
+endif
+lttng = not_found
+if 'CONFIG_TRACE_UST' in config_host
+ lttng = declare_dependency(link_args: config_host['LTTNG_UST_LIBS'].split())
+endif
+urcubp = not_found
+if 'CONFIG_TRACE_UST' in config_host
+ urcubp = declare_dependency(link_args: config_host['URCU_BP_LIBS'].split())
+endif
+nettle = not_found
+if 'CONFIG_NETTLE' in config_host
+ nettle = declare_dependency(compile_args: config_host['NETTLE_CFLAGS'].split(),
+ link_args: config_host['NETTLE_LIBS'].split())
+endif
+gnutls = not_found
+if 'CONFIG_GNUTLS' in config_host
+ gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(),
+ link_args: config_host['GNUTLS_LIBS'].split())
+endif
+
+target_dirs = config_host['TARGET_DIRS'].split()
+have_user = false
+have_system = false
+foreach target : target_dirs
+ have_user = have_user or target.endswith('-user')
+ have_system = have_system or target.endswith('-softmmu')
+endforeach
+have_tools = 'CONFIG_TOOLS' in config_host
+have_block = have_system or have_tools
+
+# Generators
+
+qapi_gen = find_program('scripts/qapi-gen.py')
+qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py',
+ meson.source_root() / 'scripts/qapi/introspect.py',
+ meson.source_root() / 'scripts/qapi/types.py',
+ meson.source_root() / 'scripts/qapi/visit.py',
+ meson.source_root() / 'scripts/qapi/common.py',
+ meson.source_root() / 'scripts/qapi/doc.py',
+ meson.source_root() / 'scripts/qapi-gen.py' ]
+
+# Collect sourcesets.
+
+util_ss = ss.source_set()
+stub_ss = ss.source_set()
+trace_ss = ss.source_set()
+
+###############
+# Trace files #
+###############
+
+trace_events_subdirs = [
+ 'accel/kvm',
+ 'accel/tcg',
+ 'crypto',
+ 'monitor',
+]
+if have_user
+ trace_events_subdirs += [ 'linux-user' ]
+endif
+if have_block
+ trace_events_subdirs += [
+ 'authz',
+ 'block',
+ 'io',
+ 'nbd',
+ 'scsi',
+ ]
+endif
+if have_system
+ trace_events_subdirs += [
+ 'audio',
+ 'backends',
+ 'backends/tpm',
+ 'chardev',
+ 'hw/9pfs',
+ 'hw/acpi',
+ 'hw/alpha',
+ 'hw/arm',
+ 'hw/audio',
+ 'hw/block',
+ 'hw/block/dataplane',
+ 'hw/char',
+ 'hw/display',
+ 'hw/dma',
+ 'hw/hppa',
+ 'hw/hyperv',
+ 'hw/i2c',
+ 'hw/i386',
+ 'hw/i386/xen',
+ 'hw/ide',
+ 'hw/input',
+ 'hw/intc',
+ 'hw/isa',
+ 'hw/mem',
+ 'hw/mips',
+ 'hw/misc',
+ 'hw/misc/macio',
+ 'hw/net',
+ 'hw/nvram',
+ 'hw/pci',
+ 'hw/pci-host',
+ 'hw/ppc',
+ 'hw/rdma',
+ 'hw/rdma/vmw',
+ 'hw/rtc',
+ 'hw/s390x',
+ 'hw/scsi',
+ 'hw/sd',
+ 'hw/sparc',
+ 'hw/sparc64',
+ 'hw/ssi',
+ 'hw/timer',
+ 'hw/tpm',
+ 'hw/usb',
+ 'hw/vfio',
+ 'hw/virtio',
+ 'hw/watchdog',
+ 'hw/xen',
+ 'hw/gpio',
+ 'hw/riscv',
+ 'migration',
+ 'net',
+ 'ui',
+ ]
+endif
+trace_events_subdirs += [
+ 'hw/core',
+ 'qapi',
+ 'qom',
+ 'target/arm',
+ 'target/hppa',
+ 'target/i386',
+ 'target/mips',
+ 'target/ppc',
+ 'target/riscv',
+ 'target/s390x',
+ 'target/sparc',
+ 'util',
+]
+
+genh = []
+
+subdir('qapi')
+subdir('qobject')
+subdir('stubs')
+subdir('trace')
+subdir('util')
+subdir('crypto')
+subdir('storage-daemon')
+
+# Build targets from sourcesets
+
+stub_ss = stub_ss.apply(config_host, strict: false)
+
+util_ss.add_all(trace_ss)
+util_ss = util_ss.apply(config_host, strict: false)
+libqemuutil = static_library('qemuutil',
+ sources: util_ss.sources() + stub_ss.sources() + genh,
+ dependencies: [util_ss.dependencies(), m, glib, socket])
+qemuutil = declare_dependency(link_with: libqemuutil,
+ sources: genh)
+
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
summary_info += {'BIOS directory': config_host['qemu_datadir']}
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 4673ab7..c0a31be 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -1,25 +1,4 @@
-util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qobject-input-visitor.o
-util-obj-y += qobject-output-visitor.o qmp-registry.o qmp-dispatch.o
-util-obj-y += string-input-visitor.o string-output-visitor.o
-util-obj-y += opts-visitor.o qapi-clone-visitor.o
-util-obj-y += qmp-event.o
-util-obj-y += qapi-util.o
-
-QAPI_COMMON_MODULES = audio authz block-core block char common control crypto
-QAPI_COMMON_MODULES += dump error introspect job machine migration misc
-QAPI_COMMON_MODULES += net pragma qdev qom rdma rocker run-state sockets tpm
-QAPI_COMMON_MODULES += trace transaction ui
QAPI_TARGET_MODULES = machine-target misc-target
-QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES)
-
-util-obj-y += qapi-builtin-types.o
-util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-types-%.o)
-util-obj-y += qapi-builtin-visit.o
-util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-visit-%.o)
-util-obj-y += qapi-emit-events.o
-util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-events-%.o)
-
-common-obj-y = $(QAPI_COMMON_MODULES:%=qapi-commands-%.o)
obj-y = qapi-introspect.o
obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o)
@@ -34,5 +13,3 @@ obj-y += qapi-init-commands.o
QAPI_MODULES_STORAGE_DAEMON = block-core char common control crypto
QAPI_MODULES_STORAGE_DAEMON += introspect job qom sockets pragma transaction
-
-storage-daemon-obj-y += $(QAPI_MODULES_STORAGE_DAEMON:%=qapi-commands-%.o)
diff --git a/qapi/meson.build b/qapi/meson.build
new file mode 100644
index 0000000..51d11ce
--- /dev/null
+++ b/qapi/meson.build
@@ -0,0 +1,120 @@
+util_ss.add(files(
+ 'opts-visitor.c',
+ 'qapi-clone-visitor.c',
+ 'qapi-dealloc-visitor.c',
+ 'qapi-util.c',
+ 'qapi-visit-core.c',
+ 'qmp-dispatch.c',
+ 'qmp-event.c',
+ 'qmp-registry.c',
+ 'qobject-input-visitor.c',
+ 'qobject-output-visitor.c',
+ 'string-input-visitor.c',
+ 'string-output-visitor.c',
+))
+
+qapi_all_modules = [
+ 'audio',
+ 'authz',
+ 'block-core',
+ 'block',
+ 'char',
+ 'common',
+ 'control',
+ 'crypto',
+ 'dump',
+ 'error',
+ 'introspect',
+ 'job',
+ 'machine',
+ 'machine-target',
+ 'migration',
+ 'misc',
+ 'misc-target',
+ 'net',
+ 'pragma',
+ 'qdev',
+ 'qom',
+ 'rdma',
+ 'rocker',
+ 'run-state',
+ 'sockets',
+ 'tpm',
+ 'trace',
+ 'transaction',
+ 'ui',
+]
+
+qapi_storage_daemon_modules = [
+ 'block-core',
+ 'char',
+ 'common',
+ 'control',
+ 'crypto',
+ 'introspect',
+ 'job',
+ 'qom',
+ 'sockets',
+ 'pragma',
+ 'transaction',
+]
+
+qapi_nonmodule_outputs = [
+ 'qapi-introspect.c', 'qapi-introspect.h',
+ 'qapi-types.c', 'qapi-types.h',
+ 'qapi-visit.h', 'qapi-visit.c',
+ 'qapi-commands.h', 'qapi-commands.c',
+ 'qapi-init-commands.h', 'qapi-init-commands.c',
+ 'qapi-events.h', 'qapi-events.c',
+]
+
+# First build all sources
+qapi_util_outputs = [
+ 'qapi-builtin-types.c', 'qapi-builtin-visit.c',
+ 'qapi-emit-events.c',
+]
+
+qapi_inputs = []
+qapi_specific_outputs = []
+foreach module : qapi_all_modules
+ qapi_inputs += [ files(module + '.json') ]
+ qapi_module_outputs = [
+ 'qapi-types-@0@.c'.format(module),
+ 'qapi-types-@0@.h'.format(module),
+ 'qapi-visit-@0@.c'.format(module),
+ 'qapi-visit-@0@.h'.format(module),
+ 'qapi-events-@0@.c'.format(module),
+ 'qapi-events-@0@.h'.format(module),
+ 'qapi-commands-@0@.c'.format(module),
+ 'qapi-commands-@0@.h'.format(module),
+ ]
+ if module.endswith('-target')
+ qapi_specific_outputs += qapi_module_outputs
+ else
+ qapi_util_outputs += qapi_module_outputs
+ endif
+endforeach
+
+qapi_files = custom_target('shared QAPI source files',
+ output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs + ['qapi-doc.texi'],
+ input: [ files('qapi-schema.json') ],
+ command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ],
+ depend_files: [ qapi_inputs, qapi_gen_depends ])
+
+# Now go through all the outputs and add them to the right sourceset.
+# These loops must be synchronized with the output of the above custom target.
+
+i = 0
+foreach output : qapi_util_outputs
+ if output.endswith('.h')
+ genh += qapi_files[i]
+ endif
+ util_ss.add(qapi_files[i])
+ i = i + 1
+endforeach
+
+# These are still handled by the Makefile
+i += qapi_nonmodule_outputs.length()
+i += qapi_specific_outputs.length()
+
+qapi_doc_texi = qapi_files[i]
diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs
deleted file mode 100644
index 7b12c9c..0000000
--- a/qobject/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o
-util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o
-util-obj-y += block-qdict.o
diff --git a/qobject/meson.build b/qobject/meson.build
new file mode 100644
index 0000000..bb63c06
--- /dev/null
+++ b/qobject/meson.build
@@ -0,0 +1,3 @@
+util_ss.add(files('qnull.c', 'qnum.c', 'qstring.c', 'qdict.c', 'qlist.c', 'qbool.c',
+ 'qlit.c', 'qjson.c', 'qobject.c', 'json-lexer.c', 'json-streamer.c', 'json-parser.c',
+ 'block-qdict.c'))
diff --git a/rules.mak b/rules.mak
index 5ab42de..7aefd37 100644
--- a/rules.mak
+++ b/rules.mak
@@ -32,7 +32,7 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
# dir, one absolute and the other relative to the compiler working
# directory. These are the same for target-independent files, but
# different for target-dependent ones.
-QEMU_LOCAL_INCLUDES = -iquote $(BUILD_DIR)/$(@D) -iquote $(@D)
+QEMU_LOCAL_INCLUDES = -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -iquote $(@D)
WL_U := -Wl,-u,
find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2)))
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
index fc0c8fc..e17edc9 100644
--- a/scripts/tracetool/backend/dtrace.py
+++ b/scripts/tracetool/backend/dtrace.py
@@ -38,7 +38,7 @@ def generate_h_begin(events, group):
if group == "root":
header = "trace-dtrace-root.h"
else:
- header = "trace-dtrace.h"
+ header = "trace-dtrace-%s.h" % group
# Workaround for ust backend, which also includes <sys/sdt.h> and may
# require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h>
diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
index 6c0a5f8..c857516 100644
--- a/scripts/tracetool/backend/ust.py
+++ b/scripts/tracetool/backend/ust.py
@@ -19,11 +19,7 @@ PUBLIC = True
def generate_h_begin(events, group):
- if group == "root":
- header = "trace-ust-root.h"
- else:
- header = "trace-ust.h"
-
+ header = 'trace-ust-' + group + '.h'
out('#include <lttng/tracepoint.h>',
'#include "%s"' % header,
'',
diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs
index cfe6bee..41c0d02 100644
--- a/storage-daemon/Makefile.objs
+++ b/storage-daemon/Makefile.objs
@@ -1 +1,3 @@
-storage-daemon-obj-y += qapi/
+storage-daemon-obj-y = qapi/libqsd-qapi.fa
+
+qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/qapi/qapi-init-commands.h
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
new file mode 100644
index 0000000..35f8949
--- /dev/null
+++ b/storage-daemon/meson.build
@@ -0,0 +1 @@
+subdir('qapi')
diff --git a/storage-daemon/qapi/Makefile.objs b/storage-daemon/qapi/Makefile.objs
deleted file mode 100644
index 8a4b220..0000000
--- a/storage-daemon/qapi/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-storage-daemon-obj-y += qapi-commands.o qapi-init-commands.o qapi-introspect.o
diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.build
new file mode 100644
index 0000000..a4e24f3
--- /dev/null
+++ b/storage-daemon/qapi/meson.build
@@ -0,0 +1,10 @@
+qsd_qapi_files = custom_target('QAPI files for qemu-storage-daemon',
+ output: qapi_nonmodule_outputs,
+ input: [ files('qapi-schema.json') ],
+ command: [ qapi_gen, '-o', 'storage-daemon/qapi', '@INPUT@' ],
+ depend_files: [ qapi_inputs, qapi_gen_depends ])
+
+static_library('qsd-qapi',
+ qsd_qapi_files.to_list(),
+ name_suffix: 'fa',
+ build_by_default: false)
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
deleted file mode 100644
index d42046a..0000000
--- a/stubs/Makefile.objs
+++ /dev/null
@@ -1,56 +0,0 @@
-stub-obj-y += blk-commit-all.o
-stub-obj-y += cmos.o
-stub-obj-y += cpu-get-clock.o
-stub-obj-y += cpu-get-icount.o
-stub-obj-y += dump.o
-stub-obj-y += error-printf.o
-stub-obj-y += fdset.o
-stub-obj-y += gdbstub.o
-stub-obj-y += iothread-lock.o
-stub-obj-y += is-daemonized.o
-stub-obj-y += isa-bus.o
-stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
-stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o
-stub-obj-y += monitor-core.o
-stub-obj-y += notify-event.o
-stub-obj-y += pci-bus.o
-stub-obj-y += qmp_memory_device.o
-stub-obj-y += qtest.o
-stub-obj-y += ramfb.o
-stub-obj-y += replay.o
-stub-obj-y += runstate-check.o
-stub-obj-$(CONFIG_SOFTMMU) += semihost.o
-stub-obj-y += set-fd-handler.o
-stub-obj-y += sysbus.o
-stub-obj-y += tpm.o
-stub-obj-y += trace-control.o
-stub-obj-y += vmgenid.o
-stub-obj-y += vmstate.o
-stub-obj-$(CONFIG_SOFTMMU) += win32-kbd-hook.o
-
-#######################################################################
-# code used by both qemu system emulation and qemu-img
-
-ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
-
-stub-obj-y += arch_type.o
-stub-obj-y += bdrv-next-monitor-owned.o
-stub-obj-y += blockdev-close-all-bdrv-states.o
-stub-obj-y += change-state-handler.o
-stub-obj-y += clock-warp.o
-stub-obj-y += fd-register.o
-stub-obj-y += fw_cfg.o
-stub-obj-y += get-vm-name.o
-stub-obj-y += iothread.o
-stub-obj-y += machine-init-done.o
-stub-obj-y += migr-blocker.o
-stub-obj-y += monitor.o
-stub-obj-y += pci-host-piix.o
-stub-obj-y += ram-block.o
-stub-obj-y += replay-user.o
-stub-obj-y += target-get-monitor-def.o
-stub-obj-y += target-monitor-defs.o
-stub-obj-y += uuid.o
-stub-obj-y += vm-stop.o
-
-endif # CONFIG_SOFTMMU || CONFIG_TOOLS
diff --git a/stubs/meson.build b/stubs/meson.build
new file mode 100644
index 0000000..019bd79
--- /dev/null
+++ b/stubs/meson.build
@@ -0,0 +1,50 @@
+stub_ss.add(files('arch_type.c'))
+stub_ss.add(files('bdrv-next-monitor-owned.c'))
+stub_ss.add(files('blk-commit-all.c'))
+stub_ss.add(files('blockdev-close-all-bdrv-states.c'))
+stub_ss.add(files('change-state-handler.c'))
+stub_ss.add(files('clock-warp.c'))
+stub_ss.add(files('cmos.c'))
+stub_ss.add(files('cpu-get-clock.c'))
+stub_ss.add(files('cpu-get-icount.c'))
+stub_ss.add(files('dump.c'))
+stub_ss.add(files('error-printf.c'))
+stub_ss.add(files('fd-register.c'))
+stub_ss.add(files('fdset.c'))
+stub_ss.add(files('fw_cfg.c'))
+stub_ss.add(files('gdbstub.c'))
+stub_ss.add(files('get-vm-name.c'))
+stub_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('io_uring.c'))
+stub_ss.add(files('iothread.c'))
+stub_ss.add(files('iothread-lock.c'))
+stub_ss.add(files('isa-bus.c'))
+stub_ss.add(files('is-daemonized.c'))
+stub_ss.add(when: 'CONFIG_LINUX_AIO', if_true: files('linux-aio.c'))
+stub_ss.add(files('machine-init-done.c'))
+stub_ss.add(files('migr-blocker.c'))
+stub_ss.add(files('monitor.c'))
+stub_ss.add(files('monitor-core.c'))
+stub_ss.add(files('notify-event.c'))
+stub_ss.add(files('pci-bus.c'))
+stub_ss.add(files('pci-host-piix.c'))
+stub_ss.add(files('qmp_memory_device.c'))
+stub_ss.add(files('qtest.c'))
+stub_ss.add(files('ram-block.c'))
+stub_ss.add(files('ramfb.c'))
+stub_ss.add(files('replay.c'))
+stub_ss.add(files('replay-user.c'))
+stub_ss.add(files('runstate-check.c'))
+stub_ss.add(files('set-fd-handler.c'))
+stub_ss.add(files('sysbus.c'))
+stub_ss.add(files('target-get-monitor-def.c'))
+stub_ss.add(files('target-monitor-defs.c'))
+stub_ss.add(files('tpm.c'))
+stub_ss.add(files('trace-control.c'))
+stub_ss.add(files('uuid.c'))
+stub_ss.add(files('vmgenid.c'))
+stub_ss.add(files('vmstate.c'))
+stub_ss.add(files('vm-stop.c'))
+stub_ss.add(files('win32-kbd-hook.c'))
+if have_system
+ stub_ss.add(files('semihost.c'))
+endif
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index c544509..a429474 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -1,59 +1,8 @@
# -*- mode: makefile -*-
-$(BUILD_DIR)/trace-events-all: $(trace-events-files)
- $(call quiet-command,cat $^ > $@)
-
##################################################
# Translation level
-$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-wrapper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-$(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-c \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-$(obj)/generated-helpers.o: $(obj)/generated-helpers.c
-
obj-y += generated-helpers.o
-
-
-$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-
-######################################################################
-# Backend code
-
-util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
-util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
-util-obj-y += control.o
obj-y += control-target.o
-util-obj-y += qmp.o
diff --git a/trace/meson.build b/trace/meson.build
new file mode 100644
index 0000000..d0e5d17
--- /dev/null
+++ b/trace/meson.build
@@ -0,0 +1,82 @@
+# common options
+tracetool = [
+ find_program('scripts/tracetool.py'),
+ '--backend=' + config_host['TRACE_BACKENDS']
+]
+
+trace_events_files = []
+foreach dir : [ '.' ] + trace_events_subdirs
+ trace_events_file = meson.source_root() / dir / 'trace-events'
+ trace_events_files += [ trace_events_file ]
+ group_name = dir == '.' ? 'root' : dir.underscorify()
+ group = '--group=' + group_name
+ fmt = '@0@-' + group_name + '.@1@'
+
+ trace_h = custom_target(fmt.format('trace', 'h'),
+ output: fmt.format('trace', 'h'),
+ input: trace_events_file,
+ command: [ tracetool, group, '--format=h', '@INPUT@' ],
+ capture: true)
+ genh += trace_h
+ trace_c = custom_target(fmt.format('trace', 'c'),
+ output: fmt.format('trace', 'c'),
+ input: trace_events_file,
+ command: [ tracetool, group, '--format=c', '@INPUT@' ],
+ capture: true)
+ if 'CONFIG_TRACE_UST' in config_host
+ trace_ust_h = custom_target(fmt.format('trace-ust', 'h'),
+ output: fmt.format('trace-ust', 'h'),
+ input: trace_events_file,
+ command: [ tracetool, group, '--format=ust-events-h', '@INPUT@' ],
+ capture: true)
+ trace_ss.add(trace_ust_h, lttng, urcubp)
+ genh += trace_ust_h
+ endif
+ trace_ss.add(trace_h, trace_c)
+ if 'CONFIG_TRACE_DTRACE' in config_host
+ trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
+ output: fmt.format('trace-dtrace', 'dtrace'),
+ input: trace_events_file,
+ command: [ tracetool, group, '--format=d', '@INPUT@' ],
+ capture: true)
+ trace_dtrace_h = custom_target(fmt.format('trace-dtrace', 'h'),
+ output: fmt.format('trace-dtrace', 'h'),
+ input: trace_dtrace,
+ command: [ 'dtrace', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ])
+ trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
+ output: fmt.format('trace-dtrace', 'o'),
+ input: trace_dtrace,
+ command: [ 'dtrace', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
+
+ trace_ss.add(trace_dtrace_h, trace_dtrace_o)
+ genh += trace_dtrace_h
+ endif
+endforeach
+
+custom_target('trace-events-all',
+ output: 'trace-events-all',
+ input: trace_events_files,
+ command: [ 'cat', '@INPUT@' ],
+ capture: true,
+ install: true,
+ install_dir: config_host['qemu_datadir'])
+
+if 'CONFIG_TRACE_UST' in config_host
+ trace_ust_all_h = custom_target('trace-ust-all.h',
+ output: 'trace-ust-all.h',
+ input: trace_events_files,
+ command: [ tracetool, '--group=all', '--format=ust-events-h', '@INPUT@' ],
+ capture: true)
+ trace_ust_all_c = custom_target('trace-ust-all.c',
+ output: 'trace-ust-all.c',
+ input: trace_events_files,
+ command: [ tracetool, '--group=all', '--format=ust-events-c', '@INPUT@' ],
+ capture: true)
+ trace_ss.add(trace_ust_all_h, trace_ust_all_c)
+ genh += trace_ust_all_h
+endif
+
+trace_ss.add(when: 'CONFIG_TRACE_SIMPLE', if_true: files('simple.c'))
+trace_ss.add(when: 'CONFIG_TRACE_FTRACE', if_true: files('ftrace.c'))
+trace_ss.add(files('control.c'))
+trace_ss.add(files('qmp.c'))
diff --git a/util/Makefile.objs b/util/Makefile.objs
deleted file mode 100644
index cc5e371..0000000
--- a/util/Makefile.objs
+++ /dev/null
@@ -1,83 +0,0 @@
-util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o
-util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
-util-obj-$(CONFIG_POSIX) += aio-posix.o
-util-obj-$(CONFIG_POSIX) += fdmon-poll.o
-util-obj-$(CONFIG_EPOLL_CREATE1) += fdmon-epoll.o
-util-obj-$(CONFIG_LINUX_IO_URING) += fdmon-io_uring.o
-util-obj-$(CONFIG_POSIX) += compatfd.o
-util-obj-$(CONFIG_POSIX) += event_notifier-posix.o
-util-obj-$(CONFIG_POSIX) += mmap-alloc.o
-util-obj-$(CONFIG_POSIX) += oslib-posix.o
-util-obj-$(CONFIG_POSIX) += qemu-openpty.o
-util-obj-$(CONFIG_POSIX) += qemu-thread-posix.o
-util-obj-$(CONFIG_POSIX) += memfd.o
-util-obj-$(CONFIG_WIN32) += aio-win32.o
-util-obj-$(CONFIG_WIN32) += event_notifier-win32.o
-util-obj-$(CONFIG_WIN32) += oslib-win32.o
-util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o
-util-obj-y += envlist.o path.o module.o
-util-obj-y += host-utils.o
-util-obj-y += bitmap.o bitops.o
-util-obj-y += fifo8.o
-util-obj-y += cacheinfo.o
-util-obj-y += error.o qemu-error.o
-util-obj-y += qemu-print.o
-util-obj-y += id.o
-util-obj-y += qemu-config.o notify.o
-util-obj-y += qemu-option.o qemu-progress.o
-util-obj-y += keyval.o
-util-obj-y += crc32c.o
-util-obj-y += uuid.o
-util-obj-y += getauxval.o
-util-obj-y += rcu.o
-util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o
-util-obj-y += log.o
-util-obj-y += pagesize.o
-util-obj-y += qdist.o
-util-obj-y += qht.o
-util-obj-y += qsp.o
-util-obj-y += range.o
-util-obj-y += stats64.o
-util-obj-y += systemd.o
-util-obj-$(CONFIG_POSIX) += drm.o
-util-obj-y += guest-random.o
-util-obj-$(CONFIG_GIO) += dbus.o
-dbus.o-cflags = $(GIO_CFLAGS)
-dbus.o-libs = $(GIO_LIBS)
-util-obj-$(CONFIG_USER_ONLY) += selfmap.o
-
-#######################################################################
-# code used by both qemu system emulation and qemu-img
-
-ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
-
-util-obj-y += aio-wait.o
-util-obj-y += aiocb.o
-util-obj-y += async.o
-util-obj-y += base64.o
-util-obj-y += buffer.o
-util-obj-y += bufferiszero.o
-util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o
-util-obj-y += hexdump.o
-util-obj-y += lockcnt.o
-util-obj-y += iov.o
-util-obj-y += iova-tree.o
-util-obj-y += hbitmap.o
-util-obj-y += main-loop.o
-util-obj-y += nvdimm-utils.o
-util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
-util-obj-y += qemu-coroutine-sleep.o
-util-obj-y += qemu-co-shared-resource.o
-util-obj-y += qemu-sockets.o
-util-obj-y += qemu-timer.o
-util-obj-y += thread-pool.o
-util-obj-y += throttle.o
-util-obj-y += timed-average.o
-util-obj-y += uri.o
-
-util-obj-$(CONFIG_LINUX) += vfio-helpers.o
-util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o
-util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o
-util-obj-$(CONFIG_BLOCK) += readline.o
-
-endif # CONFIG_SOFTMMU || CONFIG_TOOLS
diff --git a/util/meson.build b/util/meson.build
new file mode 100644
index 0000000..62113ba
--- /dev/null
+++ b/util/meson.build
@@ -0,0 +1,68 @@
+util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c'))
+util_ss.add(files('bufferiszero.c'))
+util_ss.add(files('lockcnt.c'))
+util_ss.add(files('aiocb.c', 'async.c', 'aio-wait.c', 'thread-pool.c', 'qemu-timer.c'))
+util_ss.add(files('main-loop.c'))
+util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c'))
+util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c'))
+util_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('fdmon-io_uring.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('mmap-alloc.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('oslib-posix.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: [files('qemu-openpty.c'), util])
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('qemu-thread-posix.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('memfd.c'))
+util_ss.add(when: 'CONFIG_WIN32', if_true: files('aio-win32.c'))
+util_ss.add(when: 'CONFIG_WIN32', if_true: files('event_notifier-win32.c'))
+util_ss.add(when: 'CONFIG_WIN32', if_true: files('oslib-win32.c'))
+util_ss.add(when: 'CONFIG_WIN32', if_true: files('qemu-thread-win32.c'))
+util_ss.add(when: 'CONFIG_WIN32', if_true: winmm)
+util_ss.add(files('envlist.c', 'path.c', 'module.c'))
+util_ss.add(files('host-utils.c'))
+util_ss.add(files('bitmap.c', 'bitops.c', 'hbitmap.c'))
+util_ss.add(files('fifo8.c'))
+util_ss.add(files('nvdimm-utils.c'))
+util_ss.add(files('cacheinfo.c'))
+util_ss.add(files('error.c', 'qemu-error.c'))
+util_ss.add(files('qemu-print.c'))
+util_ss.add(files('id.c'))
+util_ss.add(files('iov.c', 'qemu-config.c', 'qemu-sockets.c', 'uri.c', 'notify.c'))
+util_ss.add(files('qemu-option.c', 'qemu-progress.c'))
+util_ss.add(files('keyval.c'))
+util_ss.add(files('hexdump.c'))
+util_ss.add(files('crc32c.c'))
+util_ss.add(files('uuid.c'))
+util_ss.add(files('throttle.c'))
+util_ss.add(files('getauxval.c'))
+util_ss.add(files('readline.c'))
+util_ss.add(files('rcu.c'))
+util_ss.add(when: 'CONFIG_MEMBARRIER', if_true: files('sys_membarrier.c'))
+util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-coroutine-io.c'))
+util_ss.add(files('qemu-coroutine-sleep.c'))
+util_ss.add(files('qemu-co-shared-resource.c'))
+util_ss.add(files('coroutine-@0@.c'.format(config_host['CONFIG_COROUTINE_BACKEND'])))
+util_ss.add(files('buffer.c'))
+util_ss.add(files('timed-average.c'))
+util_ss.add(files('base64.c'))
+util_ss.add(files('log.c'))
+util_ss.add(files('pagesize.c'))
+util_ss.add(files('qdist.c'))
+util_ss.add(files('qht.c'))
+util_ss.add(files('qsp.c'))
+util_ss.add(files('range.c'))
+util_ss.add(files('stats64.c'))
+util_ss.add(files('systemd.c'))
+util_ss.add(files('iova-tree.c'))
+util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify.c'),
+ if_false: files('filemonitor-stub.c'))
+util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
+util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c'))
+util_ss.add(files('guest-random.c'))
+util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio])
+
+if have_user then
+ util_ss.add(files('selfmap.c'))
+endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 022/143] meson: add remaining generated tcg trace helpers
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (20 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 021/143] libqemuutil, qapi, trace: convert to meson Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 023/143] meson: add version.o Paolo Bonzini
` (125 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 51 ---------------------------------------------------
trace/meson.build | 14 ++++++++++++++
2 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index 5209d17..3f902a2 100644
--- a/Makefile
+++ b/Makefile
@@ -121,61 +121,10 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO
generated-files-y = qemu-version.h config-host.h qemu-options.def
-generated-files-y += trace/generated-tcg-tracers.h
-
-generated-files-y += trace/generated-helpers-wrappers.h
-generated-files-y += trace/generated-helpers.h
-generated-files-y += trace/generated-helpers.c
-
generated-files-y += module_block.h
generated-files-y += .git-submodule-status
-tracetool-y = $(SRC_PATH)/scripts/tracetool.py
-tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-
-trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-wrapper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.h: trace/generated-helpers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.c: trace/generated-helpers.c-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-c \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.o: trace/generated-helpers.c
-
-trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
diff --git a/trace/meson.build b/trace/meson.build
index d0e5d17..8ea8db7 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -61,6 +61,20 @@ custom_target('trace-events-all',
install: true,
install_dir: config_host['qemu_datadir'])
+foreach d : [
+ ['generated-tcg-tracers.h', 'tcg-h'],
+ ['generated-helpers.c', 'tcg-helper-c'],
+ ['generated-helpers.h', 'tcg-helper-h'],
+ ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'],
+]
+ custom_target(d[0],
+ output: d[0],
+ input: meson.source_root() / 'trace-events',
+ command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ],
+ build_by_default: true, # to be removed when added to a target
+ capture: true)
+endforeach
+
if 'CONFIG_TRACE_UST' in config_host
trace_ust_all_h = custom_target('trace-ust-all.h',
output: 'trace-ust-all.h',
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 023/143] meson: add version.o
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (21 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 022/143] meson: add remaining generated tcg trace helpers Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 024/143] contrib/libvhost-user: convert to Meson Paolo Bonzini
` (124 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index ec742fe..bfaa08f 100644
--- a/meson.build
+++ b/meson.build
@@ -45,8 +45,14 @@ targetos = host_machine.system()
m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
+version_res = []
if host_machine.system() == 'windows'
socket = cc.find_library('ws2_32')
+
+ win = import('windows')
+ version_res = win.compile_resources('version.rc',
+ depend_files: files('pc-bios/qemu-nsis.ico'),
+ include_directories: include_directories('.'))
endif
glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
link_args: config_host['GLIB_LIBS'].split())
@@ -215,7 +221,7 @@ libqemuutil = static_library('qemuutil',
sources: util_ss.sources() + stub_ss.sources() + genh,
dependencies: [util_ss.dependencies(), m, glib, socket])
qemuutil = declare_dependency(link_with: libqemuutil,
- sources: genh)
+ sources: genh + version_res)
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 024/143] contrib/libvhost-user: convert to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (22 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 023/143] meson: add version.o Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 025/143] tools/virtiofsd: " Paolo Bonzini
` (123 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Since libqemuutil.a has been converted to Meson, the conversion is
straightforward.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 16 +++++-----------
Makefile.objs | 1 -
contrib/libvhost-user/Makefile.objs | 1 -
contrib/libvhost-user/meson.build | 2 ++
meson.build | 8 ++++++++
5 files changed, 15 insertions(+), 13 deletions(-)
delete mode 100644 contrib/libvhost-user/Makefile.objs
create mode 100644 contrib/libvhost-user/meson.build
diff --git a/Makefile b/Makefile
index 3f902a2..0d45423 100644
--- a/Makefile
+++ b/Makefile
@@ -302,7 +302,6 @@ dummy := $(call unnest-vars,, \
ivshmem-server-obj-y \
virtiofsd-obj-y \
rdmacm-mux-obj-y \
- libvhost-user-obj-y \
vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
vhost-user-input-obj-y \
@@ -428,11 +427,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
Makefile: $(version-obj-y)
######################################################################
-# Build libraries
-
-libvhost-user.a: $(libvhost-user-obj-y)
-
-######################################################################
COMMON_LDADDS = libqemuutil.a
@@ -530,9 +524,9 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
-vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
@@ -541,16 +535,16 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
# relies on Linux-specific syscalls
ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
-virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
+virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
ifdef CONFIG_VHOST_USER_INPUT
ifdef CONFIG_LINUX
-vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
# build by default, do not install
diff --git a/Makefile.objs b/Makefile.objs
index e5c9077..9489864 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,7 +106,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs
deleted file mode 100644
index ef3778e..0000000
--- a/contrib/libvhost-user/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meson.build
new file mode 100644
index 0000000..03ba2af
--- /dev/null
+++ b/contrib/libvhost-user/meson.build
@@ -0,0 +1,2 @@
+libvhost_user = static_library('vhost-user',
+ [files('libvhost-user.c', 'libvhost-user-glib.c')])
diff --git a/meson.build b/meson.build
index bfaa08f..4540a81 100644
--- a/meson.build
+++ b/meson.build
@@ -223,6 +223,14 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+# Other build targets
+
+if have_tools
+ if 'CONFIG_VHOST_USER' in config_host
+ subdir('contrib/libvhost-user')
+ endif
+endif
+
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
summary_info += {'BIOS directory': config_host['qemu_datadir']}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 025/143] tools/virtiofsd: convert to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (23 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 024/143] contrib/libvhost-user: convert to Meson Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 026/143] contrib/vhost-user-blk: " Paolo Bonzini
` (122 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 12 ------------
Makefile.objs | 1 -
configure | 1 +
meson.build | 11 +++++++++++
tools/meson.build | 7 +++++++
tools/virtiofsd/Makefile.objs | 12 ------------
tools/virtiofsd/meson.build | 17 +++++++++++++++++
tools/virtiofsd/passthrough_ll.c | 2 +-
tools/virtiofsd/{seccomp.c => passthrough_seccomp.c} | 2 +-
tools/virtiofsd/{seccomp.h => passthrough_seccomp.h} | 0
10 files changed, 38 insertions(+), 27 deletions(-)
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%)
diff --git a/Makefile b/Makefile
index 0d45423..0918639 100644
--- a/Makefile
+++ b/Makefile
@@ -189,11 +189,6 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif
-ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy)
-HELPERS-y += virtiofsd$(EXESUF)
-vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
-endif
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -300,7 +295,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- virtiofsd-obj-y \
rdmacm-mux-obj-y \
vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
@@ -533,12 +527,6 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
-# relies on Linux-specific syscalls
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
-virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
-endif
-
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
diff --git a/Makefile.objs b/Makefile.objs
index 9489864..fee0f71 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -113,6 +113,5 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/
rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
-virtiofsd-obj-y = tools/virtiofsd/
######################################################################
diff --git a/configure b/configure
index e3a7e71..bb44d39 100755
--- a/configure
+++ b/configure
@@ -6965,6 +6965,7 @@ if test "$gprof" = "yes" ; then
fi
if test "$cap_ng" = "yes" ; then
echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak
+ echo "LIBCAP_NG_LIBS=$cap_libs" >> $config_host_mak
fi
echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak
for drv in $audio_drv_list; do
diff --git a/meson.build b/meson.build
index 4540a81..2f159b8 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,15 @@ if 'CONFIG_GNUTLS' in config_host
gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(),
link_args: config_host['GNUTLS_LIBS'].split())
endif
+seccomp = not_found
+if 'CONFIG_SECCOMP' in config_host
+ seccomp = declare_dependency(compile_args: config_host['SECCOMP_CFLAGS'].split(),
+ link_args: config_host['SECCOMP_LIBS'].split())
+endif
+libcap_ng = not_found
+if 'CONFIG_LIBCAP_NG' in config_host
+ libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -231,6 +240,8 @@ if have_tools
endif
endif
+subdir('tools')
+
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
summary_info += {'BIOS directory': config_host['qemu_datadir']}
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 0000000..5a6f895
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,7 @@
+have_virtiofsd = (have_system and
+ 'CONFIG_LINUX' in config_host and
+ 'CONFIG_SECCOMP' in config_host and
+ 'CONFIG_LIBCAP_NG' in config_host)
+if have_virtiofsd
+ subdir('virtiofsd')
+endif
diff --git a/tools/virtiofsd/Makefile.objs b/tools/virtiofsd/Makefile.objs
deleted file mode 100644
index 076f667..0000000
--- a/tools/virtiofsd/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-virtiofsd-obj-y = buffer.o \
- fuse_opt.o \
- fuse_log.o \
- fuse_lowlevel.o \
- fuse_signals.o \
- fuse_virtio.o \
- helper.o \
- passthrough_ll.o \
- seccomp.o
-
-seccomp.o-cflags := $(SECCOMP_CFLAGS)
-seccomp.o-libs := $(SECCOMP_LIBS)
diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build
new file mode 100644
index 0000000..846a6be
--- /dev/null
+++ b/tools/virtiofsd/meson.build
@@ -0,0 +1,17 @@
+executable('virtiofsd', files(
+ 'buffer.c',
+ 'fuse_opt.c',
+ 'fuse_log.c',
+ 'fuse_lowlevel.c',
+ 'fuse_signals.c',
+ 'fuse_virtio.c',
+ 'helper.c',
+ 'passthrough_ll.c',
+ 'passthrough_seccomp.c'),
+ link_with: libvhost_user,
+ dependencies: [seccomp, qemuutil, libcap_ng])
+
+configure_file(input: '50-qemu-virtiofsd.json.in',
+ output: '50-qemu-virtiofsd.json',
+ configuration: config_host,
+ install_dir: config_host['qemu_datadir'] / 'vhost-user')
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 94e0de2..63d1d00 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -65,7 +65,7 @@
#include <unistd.h>
#include "passthrough_helpers.h"
-#include "seccomp.h"
+#include "passthrough_seccomp.h"
/* Keep track of inode posix locks for each owner. */
struct lo_inode_plock {
diff --git a/tools/virtiofsd/seccomp.c b/tools/virtiofsd/passthrough_seccomp.c
similarity index 99%
rename from tools/virtiofsd/seccomp.c
rename to tools/virtiofsd/passthrough_seccomp.c
index 3b1522a..19fee60 100644
--- a/tools/virtiofsd/seccomp.c
+++ b/tools/virtiofsd/passthrough_seccomp.c
@@ -7,7 +7,7 @@
*/
#include "qemu/osdep.h"
-#include "seccomp.h"
+#include "passthrough_seccomp.h"
#include "fuse_i.h"
#include "fuse_log.h"
#include <errno.h>
diff --git a/tools/virtiofsd/seccomp.h b/tools/virtiofsd/passthrough_seccomp.h
similarity index 100%
rename from tools/virtiofsd/seccomp.h
rename to tools/virtiofsd/passthrough_seccomp.h
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 026/143] contrib/vhost-user-blk: convert to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (24 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 025/143] tools/virtiofsd: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 027/143] contrib/vhost-user-scsi: " Paolo Bonzini
` (121 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
The GLib pkg-config information is extracted from config-host.mak and
used to link vhost-user-blk.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 ---
Makefile.objs | 1 -
contrib/vhost-user-blk/Makefile.objs | 1 -
contrib/vhost-user-blk/meson.build | 3 +++
meson.build | 1 +
5 files changed, 4 insertions(+), 5 deletions(-)
delete mode 100644 contrib/vhost-user-blk/Makefile.objs
create mode 100644 contrib/vhost-user-blk/meson.build
diff --git a/Makefile b/Makefile
index 0918639..7e4341d 100644
--- a/Makefile
+++ b/Makefile
@@ -297,7 +297,6 @@ dummy := $(call unnest-vars,, \
ivshmem-server-obj-y \
rdmacm-mux-obj-y \
vhost-user-scsi-obj-y \
- vhost-user-blk-obj-y \
vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
@@ -520,8 +519,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
endif
vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
-vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
diff --git a/Makefile.objs b/Makefile.objs
index fee0f71..f69736c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -109,7 +109,6 @@ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
-vhost-user-blk-obj-y = contrib/vhost-user-blk/
rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
diff --git a/contrib/vhost-user-blk/Makefile.objs b/contrib/vhost-user-blk/Makefile.objs
deleted file mode 100644
index 72e2cdc..0000000
--- a/contrib/vhost-user-blk/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-vhost-user-blk-obj-y = vhost-user-blk.o
diff --git a/contrib/vhost-user-blk/meson.build b/contrib/vhost-user-blk/meson.build
new file mode 100644
index 0000000..3856a9a
--- /dev/null
+++ b/contrib/vhost-user-blk/meson.build
@@ -0,0 +1,3 @@
+executable('vhost-user-blk', files('vhost-user-blk.c'),
+ link_with: libvhost_user,
+ dependencies: qemuutil)
diff --git a/meson.build b/meson.build
index 2f159b8..dc3d4a4 100644
--- a/meson.build
+++ b/meson.build
@@ -237,6 +237,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
if have_tools
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
+ subdir('contrib/vhost-user-blk')
endif
endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 027/143] contrib/vhost-user-scsi: convert to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (25 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 026/143] contrib/vhost-user-blk: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 028/143] contrib/rdmacm-mux: " Paolo Bonzini
` (120 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
The libiscsi pkg-config information is extracted from config-host.mak and
used to link vhost-user-blk.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 ---
Makefile.objs | 3 ---
contrib/vhost-user-scsi/Makefile.objs | 1 -
contrib/vhost-user-scsi/meson.build | 5 +++++
meson.build | 6 ++++++
5 files changed, 11 insertions(+), 7 deletions(-)
delete mode 100644 contrib/vhost-user-scsi/Makefile.objs
create mode 100644 contrib/vhost-user-scsi/meson.build
diff --git a/Makefile b/Makefile
index 7e4341d..325aa00 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,6 @@ dummy := $(call unnest-vars,, \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
rdmacm-mux-obj-y \
- vhost-user-scsi-obj-y \
vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
@@ -517,8 +516,6 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
diff --git a/Makefile.objs b/Makefile.objs
index f69736c..ab798b0 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,9 +106,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
-vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
-vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
diff --git a/contrib/vhost-user-scsi/Makefile.objs b/contrib/vhost-user-scsi/Makefile.objs
deleted file mode 100644
index e83a38a..0000000
--- a/contrib/vhost-user-scsi/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-vhost-user-scsi-obj-y = vhost-user-scsi.o
diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build
new file mode 100644
index 0000000..0bdd5a5
--- /dev/null
+++ b/contrib/vhost-user-scsi/meson.build
@@ -0,0 +1,5 @@
+if 'CONFIG_LIBISCSI' in config_host
+ executable('vhost-user-scsi', files('vhost-user-scsi.c'),
+ link_with: libvhost_user,
+ dependencies: [qemuutil, libiscsi])
+endif
diff --git a/meson.build b/meson.build
index dc3d4a4..8caf6eb 100644
--- a/meson.build
+++ b/meson.build
@@ -88,6 +88,11 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
endif
+libiscsi = not_found
+if 'CONFIG_LIBISCSI' in config_host
+ libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
+ link_args: config_host['LIBISCSI_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -238,6 +243,7 @@ if have_tools
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
+ subdir('contrib/vhost-user-scsi')
endif
endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 028/143] contrib/rdmacm-mux: convert to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (26 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 027/143] contrib/vhost-user-scsi: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 029/143] contrib/vhost-user-input: convert to meson Paolo Bonzini
` (119 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
We can use config-host.mak to decide whether the tool has to be built,
apart from that the conversion is straightforward.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
Makefile.objs | 1 -
contrib/rdmacm-mux/Makefile.objs | 3 ---
contrib/rdmacm-mux/meson.build | 6 ++++++
meson.build | 2 ++
5 files changed, 8 insertions(+), 9 deletions(-)
delete mode 100644 contrib/rdmacm-mux/Makefile.objs
create mode 100644 contrib/rdmacm-mux/meson.build
diff --git a/Makefile b/Makefile
index 325aa00..8d94f21 100644
--- a/Makefile
+++ b/Makefile
@@ -295,7 +295,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- rdmacm-mux-obj-y \
vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
@@ -517,10 +516,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-rdmacm-mux$(EXESUF): LIBS += "-libumad"
-rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
diff --git a/Makefile.objs b/Makefile.objs
index ab798b0..0f80b63 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,7 +106,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs
deleted file mode 100644
index 3df744a..0000000
--- a/contrib/rdmacm-mux/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-ifdef CONFIG_PVRDMA
-rdmacm-mux-obj-y = main.o
-endif
diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build
new file mode 100644
index 0000000..29a9ced
--- /dev/null
+++ b/contrib/rdmacm-mux/meson.build
@@ -0,0 +1,6 @@
+if 'CONFIG_PVRDMA' in config_host
+ # if not found, CONFIG_PVRDMA should not be set
+ libumad = cc.find_library('ibumad', required: true)
+ executable('rdmacm-mux', files('main.c'),
+ dependencies: [glib, libumad])
+endif
diff --git a/meson.build b/meson.build
index 8caf6eb..c3aa0b0 100644
--- a/meson.build
+++ b/meson.build
@@ -240,6 +240,8 @@ qemuutil = declare_dependency(link_with: libqemuutil,
# Other build targets
if have_tools
+ subdir('contrib/rdmacm-mux')
+
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 029/143] contrib/vhost-user-input: convert to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (27 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 028/143] contrib/rdmacm-mux: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 030/143] contrib/vhost-user-gpu: " Paolo Bonzini
` (118 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 11 -----------
Makefile.objs | 1 -
contrib/vhost-user-input/Makefile.objs | 1 -
contrib/vhost-user-input/meson.build | 3 +++
meson.build | 1 +
5 files changed, 4 insertions(+), 13 deletions(-)
delete mode 100644 contrib/vhost-user-input/Makefile.objs
create mode 100644 contrib/vhost-user-input/meson.build
diff --git a/Makefile b/Makefile
index 8d94f21..80d276a 100644
--- a/Makefile
+++ b/Makefile
@@ -295,7 +295,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
@@ -519,16 +518,6 @@ endif
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
-ifdef CONFIG_VHOST_USER_INPUT
-ifdef CONFIG_LINUX
-vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
-
-# build by default, do not install
-all: vhost-user-input$(EXESUF)
-endif
-endif
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/Makefile.objs b/Makefile.objs
index 0f80b63..0922c3ed 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,7 +106,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
######################################################################
diff --git a/contrib/vhost-user-input/Makefile.objs b/contrib/vhost-user-input/Makefile.objs
deleted file mode 100644
index b1fad90..0000000
--- a/contrib/vhost-user-input/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-vhost-user-input-obj-y = main.o
diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-input/meson.build
new file mode 100644
index 0000000..6f79679
--- /dev/null
+++ b/contrib/vhost-user-input/meson.build
@@ -0,0 +1,3 @@
+executable('vhost-user-input', files('main.c'),
+ link_with: libvhost_user,
+ dependencies: qemuutil)
diff --git a/meson.build b/meson.build
index c3aa0b0..924fbed 100644
--- a/meson.build
+++ b/meson.build
@@ -245,6 +245,7 @@ if have_tools
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
+ subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi')
endif
endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 030/143] contrib/vhost-user-gpu: convert to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (28 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 029/143] contrib/vhost-user-input: convert to meson Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 031/143] contrib/ivshmem: " Paolo Bonzini
` (117 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 18 +-----------------
Makefile.objs | 1 -
contrib/vhost-user-gpu/Makefile.objs | 10 ----------
contrib/vhost-user-gpu/meson.build | 11 +++++++++++
meson.build | 15 +++++++++++++++
rules.mak | 7 -------
6 files changed, 27 insertions(+), 35 deletions(-)
delete mode 100644 contrib/vhost-user-gpu/Makefile.objs
create mode 100644 contrib/vhost-user-gpu/meson.build
diff --git a/Makefile b/Makefile
index 80d276a..128bebe 100644
--- a/Makefile
+++ b/Makefile
@@ -179,16 +179,10 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-vhost-user-json-y =
HELPERS-y = $(HELPERS)
HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
-ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
-HELPERS-y += vhost-user-gpu$(EXESUF)
-vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
-endif
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -295,7 +289,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -309,7 +302,7 @@ dummy := $(call unnest-vars,, \
include $(SRC_PATH)/tests/Makefile.include
-all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules $(vhost-user-json-y)
+all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules
qemu-version.h: FORCE
$(call quiet-command, \
@@ -515,9 +508,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
@@ -711,12 +701,6 @@ endif
ifneq ($(HELPERS-y),)
$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
endif
-ifneq ($(vhost-user-json-y),)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/"
- for x in $(vhost-user-json-y); do \
- $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
- done
-endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif
diff --git a/Makefile.objs b/Makefile.objs
index 0922c3ed..2f2d4b2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,6 +106,5 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
######################################################################
diff --git a/contrib/vhost-user-gpu/Makefile.objs b/contrib/vhost-user-gpu/Makefile.objs
deleted file mode 100644
index 0929609..0000000
--- a/contrib/vhost-user-gpu/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-vhost-user-gpu-obj-y = vhost-user-gpu.o virgl.o vugbm.o
-
-vhost-user-gpu.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS)
-vhost-user-gpu.o-libs := $(PIXMAN_LIBS)
-
-virgl.o-cflags := $(VIRGL_CFLAGS) $(GBM_CFLAGS)
-virgl.o-libs := $(VIRGL_LIBS)
-
-vugbm.o-cflags := $(GBM_CFLAGS)
-vugbm.o-libs := $(GBM_LIBS)
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build
new file mode 100644
index 0000000..b4b4dc3
--- /dev/null
+++ b/contrib/vhost-user-gpu/meson.build
@@ -0,0 +1,11 @@
+if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \
+ and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host
+ executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
+ link_with: libvhost_user,
+ dependencies: [qemuutil, pixman, gbm, virgl])
+
+ configure_file(input: '50-qemu-gpu.json.in',
+ output: '50-qemu-gpu.json',
+ configuration: config_host,
+ install_dir: config_host['qemu_datadir'] / 'vhost-user')
+endif
diff --git a/meson.build b/meson.build
index 924fbed..894584a 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,8 @@ if 'CONFIG_GNUTLS' in config_host
gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(),
link_args: config_host['GNUTLS_LIBS'].split())
endif
+pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(),
+ link_args: config_host['PIXMAN_LIBS'].split())
seccomp = not_found
if 'CONFIG_SECCOMP' in config_host
seccomp = declare_dependency(compile_args: config_host['SECCOMP_CFLAGS'].split(),
@@ -93,6 +95,16 @@ if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
link_args: config_host['LIBISCSI_LIBS'].split())
endif
+gbm = not_found
+if 'CONFIG_GBM' in config_host
+ gbm = declare_dependency(compile_args: config_host['GBM_CFLAGS'].split(),
+ link_args: config_host['GBM_LIBS'].split())
+endif
+virgl = not_found
+if 'CONFIG_VIRGL' in config_host
+ virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(),
+ link_args: config_host['VIRGL_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -245,6 +257,9 @@ if have_tools
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
+ if 'CONFIG_LINUX' in config_host
+ subdir('contrib/vhost-user-gpu')
+ endif
subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi')
endif
diff --git a/rules.mak b/rules.mak
index 7aefd37..1aa6394 100644
--- a/rules.mak
+++ b/rules.mak
@@ -402,13 +402,6 @@ TEXI2MAN = $(call quiet-command, \
%.8:
$(call TEXI2MAN)
-GEN_SUBST = $(call quiet-command, \
- sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \
- "GEN","$@")
-
-%.json: %.json.in
- $(call GEN_SUBST)
-
# Support for building multiple output files by atomically executing
# a single rule which depends on several input files (so the rule
# will be executed exactly once, not once per output file, and
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 031/143] contrib/ivshmem: convert to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (29 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 030/143] contrib/vhost-user-gpu: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 032/143] contrib/elf2dmp: " Paolo Bonzini
` (116 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 9 ---------
Makefile.objs | 2 --
configure | 3 ---
contrib/ivshmem-client/Makefile.objs | 1 -
contrib/ivshmem-client/meson.build | 3 +++
contrib/ivshmem-server/Makefile.objs | 1 -
contrib/ivshmem-server/meson.build | 3 +++
meson.build | 6 ++++++
8 files changed, 12 insertions(+), 16 deletions(-)
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
diff --git a/Makefile b/Makefile
index 128bebe..e3d54c0 100644
--- a/Makefile
+++ b/Makefile
@@ -287,8 +287,6 @@ dummy := $(call unnest-vars,, \
chardev-obj-y \
qga-obj-y \
elf2dmp-obj-y \
- ivshmem-client-obj-y \
- ivshmem-server-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -501,13 +499,6 @@ endif
elf2dmp$(EXESUF): $(elf2dmp-obj-y)
$(call LINK, $^)
-ifdef CONFIG_IVSHMEM
-ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-endif
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/Makefile.objs b/Makefile.objs
index 2f2d4b2..336a684 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -104,7 +104,5 @@ qga-vss-dll-obj-y = qga/
######################################################################
# contrib
elf2dmp-obj-y = contrib/elf2dmp/
-ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
-ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
######################################################################
diff --git a/configure b/configure
index bb44d39..473173d 100755
--- a/configure
+++ b/configure
@@ -6647,9 +6647,6 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
fi
- if [ "$ivshmem" = "yes" ]; then
- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
- fi
if [ "$curl" = "yes" ]; then
tools="elf2dmp\$(EXESUF) $tools"
fi
diff --git a/contrib/ivshmem-client/Makefile.objs b/contrib/ivshmem-client/Makefile.objs
deleted file mode 100644
index bfab2d2..0000000
--- a/contrib/ivshmem-client/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-ivshmem-client-obj-y = ivshmem-client.o main.o
diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/meson.build
new file mode 100644
index 0000000..92ad844
--- /dev/null
+++ b/contrib/ivshmem-client/meson.build
@@ -0,0 +1,3 @@
+executable('ivshmem-client', files('ivshmem-client.c', 'main.c'),
+ dependencies: glib,
+ install: true)
diff --git a/contrib/ivshmem-server/Makefile.objs b/contrib/ivshmem-server/Makefile.objs
deleted file mode 100644
index c060dd3..0000000
--- a/contrib/ivshmem-server/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-ivshmem-server-obj-y = ivshmem-server.o main.o
diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build
new file mode 100644
index 0000000..6dbe240
--- /dev/null
+++ b/contrib/ivshmem-server/meson.build
@@ -0,0 +1,3 @@
+executable('ivshmem-server', files('ivshmem-server.c', 'main.c'),
+ dependencies: [qemuutil, rt],
+ install: true)
diff --git a/meson.build b/meson.build
index 894584a..aa6fffa 100644
--- a/meson.build
+++ b/meson.build
@@ -90,6 +90,7 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
endif
+rt = cc.find_library('rt', required: false)
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
@@ -263,6 +264,11 @@ if have_tools
subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi')
endif
+
+ if 'CONFIG_IVSHMEM' in config_host
+ subdir('contrib/ivshmem-client')
+ subdir('contrib/ivshmem-server')
+ endif
endif
subdir('tools')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 032/143] contrib/elf2dmp: convert to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (30 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 031/143] contrib/ivshmem: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 033/143] meson: convert qemu-ga Paolo Bonzini
` (115 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 4 ----
Makefile.objs | 6 ------
configure | 3 ---
contrib/elf2dmp/Makefile.objs | 4 ----
contrib/elf2dmp/meson.build | 4 ++++
meson.build | 6 ++++++
6 files changed, 10 insertions(+), 17 deletions(-)
delete mode 100644 contrib/elf2dmp/Makefile.objs
create mode 100644 contrib/elf2dmp/meson.build
diff --git a/Makefile b/Makefile
index e3d54c0..39bf0c4 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,6 @@ dummy := $(call unnest-vars,, \
authz-obj-y \
chardev-obj-y \
qga-obj-y \
- elf2dmp-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -496,9 +495,6 @@ ifneq ($(EXESUF),)
qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
endif
-elf2dmp$(EXESUF): $(elf2dmp-obj-y)
- $(call LINK, $^)
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/Makefile.objs b/Makefile.objs
index 336a684..1486254 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -100,9 +100,3 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
# extracted into a QAPI schema module, or perhaps a separate schema.
qga-obj-y = qga/
qga-vss-dll-obj-y = qga/
-
-######################################################################
-# contrib
-elf2dmp-obj-y = contrib/elf2dmp/
-
-######################################################################
diff --git a/configure b/configure
index 473173d..b57968b 100755
--- a/configure
+++ b/configure
@@ -6647,9 +6647,6 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
fi
- if [ "$curl" = "yes" ]; then
- tools="elf2dmp\$(EXESUF) $tools"
- fi
fi
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs
deleted file mode 100644
index 1505716..0000000
--- a/contrib/elf2dmp/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-elf2dmp-obj-y = main.o addrspace.o download.o pdb.o qemu_elf.o
-
-download.o-cflags := $(CURL_CFLAGS)
-download.o-libs := $(CURL_LIBS)
diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build
new file mode 100644
index 0000000..b9e5199
--- /dev/null
+++ b/contrib/elf2dmp/meson.build
@@ -0,0 +1,4 @@
+if 'CONFIG_CURL' in config_host
+ executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'),
+ dependencies: [glib, curl])
+endif
diff --git a/meson.build b/meson.build
index aa6fffa..21e822e 100644
--- a/meson.build
+++ b/meson.build
@@ -106,6 +106,11 @@ if 'CONFIG_VIRGL' in config_host
virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(),
link_args: config_host['VIRGL_LIBS'].split())
endif
+curl = not_found
+if 'CONFIG_CURL' in config_host
+ curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(),
+ link_args: config_host['CURL_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -254,6 +259,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
if have_tools
subdir('contrib/rdmacm-mux')
+ subdir('contrib/elf2dmp')
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 033/143] meson: convert qemu-ga
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (31 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 032/143] contrib/elf2dmp: " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 034/143] meson: convert vss-win32 Paolo Bonzini
` (114 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 53 ++++++-----------------------------------------
Makefile.objs | 1 -
configure | 9 ++++----
meson.build | 22 ++++++++++++++++++--
qga/Makefile.objs | 9 --------
qga/installer/qemu-ga.wxs | 2 +-
qga/meson.build | 45 ++++++++++++++++++++++++++++++++++++++++
tests/Makefile.include | 4 ++--
tests/test-qga.c | 8 +++----
9 files changed, 82 insertions(+), 71 deletions(-)
create mode 100644 qga/meson.build
diff --git a/Makefile b/Makefile
index 39bf0c4..05f774d 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,6 @@ endif
dummy := $(call unnest-vars,, \
authz-obj-y \
chardev-obj-y \
- qga-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -433,52 +432,15 @@ endif
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
-qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
-
qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-qapi-py = $(SRC_PATH)/scripts/qapi/__init__.py \
-$(SRC_PATH)/scripts/qapi/commands.py \
-$(SRC_PATH)/scripts/qapi/common.py \
-$(SRC_PATH)/scripts/qapi/doc.py \
-$(SRC_PATH)/scripts/qapi/error.py \
-$(SRC_PATH)/scripts/qapi/events.py \
-$(SRC_PATH)/scripts/qapi/expr.py \
-$(SRC_PATH)/scripts/qapi/gen.py \
-$(SRC_PATH)/scripts/qapi/introspect.py \
-$(SRC_PATH)/scripts/qapi/parser.py \
-$(SRC_PATH)/scripts/qapi/schema.py \
-$(SRC_PATH)/scripts/qapi/source.py \
-$(SRC_PATH)/scripts/qapi/types.py \
-$(SRC_PATH)/scripts/qapi/visit.py \
-$(SRC_PATH)/scripts/qapi-gen.py
-
-qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \
-qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h \
-qga/qapi-generated/qga-qapi-commands.h qga/qapi-generated/qga-qapi-commands.c \
-qga/qapi-generated/qga-qapi-init-commands.h qga/qapi-generated/qga-qapi-init-commands.c \
-qga/qapi-generated/qga-qapi-doc.texi: \
-qga/qapi-generated/qapi-gen-timestamp ;
-qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py)
- $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \
- -o qga/qapi-generated -p "qga-" $<, \
- "GEN","$(@:%-timestamp=%)")
- @>$@
-
-QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qapi-commands.h qga-qapi-init-commands.h)
-$(qga-obj-y): $(QGALIB_GEN)
-
-qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-
ifdef QEMU_GA_MSI_ENABLED
QEMU_GA_MSI=qemu-ga-$(ARCH).msi
msi: $(QEMU_GA_MSI)
-$(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER)
+$(QEMU_GA_MSI): qga/qemu-ga.exe $(QGA_VSS_PROVIDER)
$(QEMU_GA_MSI): config-host.mak
@@ -491,8 +453,8 @@ msi:
endif
ifneq ($(EXESUF),)
-.PHONY: qemu-ga
-qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
+.PHONY: qga/qemu-ga
+qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
endif
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
@@ -516,9 +478,6 @@ clean: recurse-clean
rm -f qemu-img-cmds.h
rm -f ui/shader/*-vert.h ui/shader/*-frag.h
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
- rm -f qapi-gen-timestamp
- rm -f storage-daemon/qapi/qapi-gen-timestamp
- rm -rf qga/qapi-generated
rm -f config-all-devices.mak
rm -f $(SUBDIR_DEVICES_MAK)
@@ -637,7 +596,7 @@ endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1"
endif
-ifneq (,$(findstring qemu-ga,$(TOOLS)))
+ifeq ($(CONFIG_GUEST_AGENT),y)
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
@@ -658,7 +617,7 @@ install-datadir:
install-localstatedir:
ifdef CONFIG_POSIX
-ifneq (,$(findstring qemu-ga,$(TOOLS)))
+ifeq ($(CONFIG_GUEST_AGENT),y)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run
endif
endif
@@ -850,7 +809,7 @@ $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h
docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi
@cp -p $< $@
-docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi
+docs/interop/qemu-ga-qapi.texi: qga/qga-qapi-doc.texi
@cp -p $< $@
html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs
diff --git a/Makefile.objs b/Makefile.objs
index 1486254..259f993 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -98,5 +98,4 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
# FIXME: a few definitions from qapi/qapi-types.o and
# qapi/qapi-visit.o are needed by libqemuutil.a. These should be
# extracted into a QAPI schema module, or perhaps a separate schema.
-qga-obj-y = qga/
qga-vss-dll-obj-y = qga/
diff --git a/configure b/configure
index b57968b..e0ef3f7 100755
--- a/configure
+++ b/configure
@@ -3949,7 +3949,6 @@ for i in $glib_modules; do
glib_libs=$($pkg_config --libs $i)
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
LIBS="$glib_libs $LIBS"
- libs_qga="$glib_libs $libs_qga"
else
error_exit "glib-$glib_req_ver $i is required to compile QEMU"
fi
@@ -5169,7 +5168,6 @@ if compile_prog "" "" ; then
:
elif compile_prog "" "-lm" ; then
LIBS="-lm $LIBS"
- libs_qga="-lm $libs_qga"
else
error_exit "libm check failed"
fi
@@ -5194,7 +5192,6 @@ if compile_prog "" "" ; then
# we need pthread for static linking. use previous pthread test result
elif compile_prog "" "$pthread_lib -lrt" ; then
LIBS="$LIBS -lrt"
- libs_qga="$libs_qga -lrt"
fi
# Check whether we need to link libutil for openpty()
@@ -6689,7 +6686,6 @@ if [ "$guest_agent" != "no" ]; then
if [ "$softmmu" = no -a "$want_tools" = no ] ; then
guest_agent=no
elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
- tools="qemu-ga\$(EXESUF) $tools"
guest_agent=yes
elif [ "$guest_agent" != yes ]; then
guest_agent=no
@@ -6935,6 +6931,9 @@ fi
if test "$want_tools" = "yes" ; then
echo "CONFIG_TOOLS=y" >> $config_host_mak
fi
+if test "$guest_agent" = "yes" ; then
+ echo "CONFIG_GUEST_AGENT=y" >> $config_host_mak
+fi
if test "$slirp" != "no"; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
@@ -7792,7 +7791,7 @@ echo "PTHREAD_LIB=$PTHREAD_LIB" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "DSOSUF=$DSOSUF" >> $config_host_mak
echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
-echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
+echo "LIBS_QGA=$libs_qga" >> $config_host_mak
echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak
echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak
echo "POD2MAN=$POD2MAN" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 21e822e..a68c7b4 100644
--- a/meson.build
+++ b/meson.build
@@ -111,6 +111,10 @@ if 'CONFIG_CURL' in config_host
curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(),
link_args: config_host['CURL_LIBS'].split())
endif
+libudev = not_found
+if 'CONFIG_LIBUDEV' in config_host
+ libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -125,13 +129,23 @@ have_block = have_system or have_tools
# Generators
qapi_gen = find_program('scripts/qapi-gen.py')
-qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/events.py',
+qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
+ meson.source_root() / 'scripts/qapi/commands.py',
+ meson.source_root() / 'scripts/qapi/common.py',
+ meson.source_root() / 'scripts/qapi/doc.py',
+ meson.source_root() / 'scripts/qapi/error.py',
+ meson.source_root() / 'scripts/qapi/events.py',
+ meson.source_root() / 'scripts/qapi/expr.py',
+ meson.source_root() / 'scripts/qapi/gen.py',
meson.source_root() / 'scripts/qapi/introspect.py',
+ meson.source_root() / 'scripts/qapi/parser.py',
+ meson.source_root() / 'scripts/qapi/schema.py',
+ meson.source_root() / 'scripts/qapi/source.py',
meson.source_root() / 'scripts/qapi/types.py',
meson.source_root() / 'scripts/qapi/visit.py',
meson.source_root() / 'scripts/qapi/common.py',
meson.source_root() / 'scripts/qapi/doc.py',
- meson.source_root() / 'scripts/qapi-gen.py' ]
+]
# Collect sourcesets.
@@ -257,6 +271,10 @@ qemuutil = declare_dependency(link_with: libqemuutil,
# Other build targets
+if 'CONFIG_GUEST_AGENT' in config_host
+ subdir('qga')
+endif
+
if have_tools
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
diff --git a/qga/Makefile.objs b/qga/Makefile.objs
index 9c558ae..9ecf249 100644
--- a/qga/Makefile.objs
+++ b/qga/Makefile.objs
@@ -1,10 +1 @@
-commands-posix.o-libs := $(LIBUDEV_LIBS)
-qga-obj-y = commands.o guest-agent-command-state.o main.o
-qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o
-qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o
-qga-obj-$(CONFIG_WIN32) += vss-win32.o
-qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o
-qga-obj-y += qapi-generated/qga-qapi-commands.o
-qga-obj-y += qapi-generated/qga-qapi-init-commands.o
-
qga-vss-dll-obj-$(CONFIG_QGA_VSS) += vss-win32/
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index f678175..9cb4c3d 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -66,7 +66,7 @@
<Directory Id="$(var.GaProgramFilesFolder)" Name="QEMU Guest Agent">
<Directory Id="qemu_ga_directory" Name="Qemu-ga">
<Component Id="qemu_ga" Guid="{908B7199-DE2A-4DC6-A8D0-27A5AE444FEA}">
- <File Id="qemu_ga.exe" Name="qemu-ga.exe" Source="$(env.BUILD_DIR)/qemu-ga.exe" KeyPath="yes" DiskId="1"/>
+ <File Id="qemu_ga.exe" Name="qemu-ga.exe" Source="$(env.BUILD_DIR)/qga/qemu-ga.exe" KeyPath="yes" DiskId="1"/>
<ServiceInstall
Id="ServiceInstaller"
Type="ownProcess"
diff --git a/qga/meson.build b/qga/meson.build
new file mode 100644
index 0000000..e963e43
--- /dev/null
+++ b/qga/meson.build
@@ -0,0 +1,45 @@
+qga_qapi_outputs = [
+ 'qga-qapi-commands.c',
+ 'qga-qapi-commands.h',
+ 'qga-qapi-doc.texi',
+ 'qga-qapi-emit-events.c',
+ 'qga-qapi-emit-events.h',
+ 'qga-qapi-events.c',
+ 'qga-qapi-events.h',
+ 'qga-qapi-init-commands.c',
+ 'qga-qapi-init-commands.h',
+ 'qga-qapi-introspect.c',
+ 'qga-qapi-introspect.h',
+ 'qga-qapi-types.c',
+ 'qga-qapi-types.h',
+ 'qga-qapi-visit.c',
+ 'qga-qapi-visit.h',
+]
+
+qga_qapi_files = custom_target('QGA QAPI files',
+ output: qga_qapi_outputs,
+ input: 'qapi-schema.json',
+ command: [ qapi_gen, '-o', 'qga', '-p', 'qga-', '@INPUT0@' ],
+ depend_files: qapi_gen_depends)
+qga_ss = ss.source_set()
+qga_ss.add(qga_qapi_files)
+qga_ss.add(files(
+ 'commands.c',
+ 'guest-agent-command-state.c',
+ 'main.c',
+))
+qga_ss.add(when: 'CONFIG_POSIX', if_true: files(
+ 'channel-posix.c',
+ 'commands-posix.c'))
+qga_ss.add(when: 'CONFIG_WIN32', if_true: files(
+ 'channel-win32.c',
+ 'commands-win32.c',
+ 'service-win32.c',
+ 'vss-win32.c'
+))
+
+qga_ss = qga_ss.apply(config_host, strict: false)
+
+qga = executable('qemu-ga', qga_ss.sources(),
+ link_args: config_host['LIBS_QGA'].split(),
+ dependencies: [qemuutil, libudev])
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5e9dff9..1a20657 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -129,7 +129,7 @@ ifndef CONFIG_TSAN
# https://github.com/google/sanitizers/issues/1116
check-unit-$(CONFIG_SOFTMMU) += tests/test-char$(EXESUF)
check-unit-$(CONFIG_SOFTMMU) += tests/test-qdev-global-props$(EXESUF)
-ifneq (,$(findstring qemu-ga,$(TOOLS)))
+ifeq ($(CONFIG_GUEST_AGENT),y)
check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
endif
endif
@@ -603,7 +603,7 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
include $(SRC_PATH)/tests/qtest/Makefile.include
-tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
+tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF)
tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
diff --git a/tests/test-qga.c b/tests/test-qga.c
index d2b2435..d1b4c3e 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -61,8 +61,8 @@ fixture_setup(TestFixture *fixture, gconstpointer data, gchar **envp)
path = g_build_filename(fixture->test_dir, "sock", NULL);
cwd = g_get_current_dir();
- cmd = g_strdup_printf("%s%cqemu-ga -m unix-listen -t %s -p %s %s %s",
- cwd, G_DIR_SEPARATOR,
+ cmd = g_strdup_printf("%s%cqga%cqemu-ga -m unix-listen -t %s -p %s %s %s",
+ cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR,
fixture->test_dir, path,
getenv("QTEST_LOG") ? "-v" : "",
extra_arg ?: "");
@@ -699,8 +699,8 @@ static void test_qga_config(gconstpointer data)
GKeyFile *kf;
cwd = g_get_current_dir();
- cmd = g_strdup_printf("%s%cqemu-ga -D",
- cwd, G_DIR_SEPARATOR);
+ cmd = g_strdup_printf("%s%cqga%cqemu-ga -D",
+ cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR);
g_free(cwd);
g_shell_parse_argv(cmd, NULL, &argv, &error);
g_free(cmd);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 034/143] meson: convert vss-win32
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (32 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 033/143] meson: convert qemu-ga Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 035/143] meson: add msi generation Paolo Bonzini
` (113 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 -
Makefile.objs | 8 --------
qga/Makefile.objs | 1 -
qga/meson.build | 6 ++++++
qga/vss-win32/Makefile.objs | 23 -----------------------
qga/vss-win32/meson.build | 33 +++++++++++++++++++++++++++++++++
6 files changed, 39 insertions(+), 33 deletions(-)
delete mode 100644 qga/Makefile.objs
delete mode 100644 qga/vss-win32/Makefile.objs
create mode 100644 qga/vss-win32/meson.build
diff --git a/Makefile b/Makefile
index 05f774d..3451981 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,6 @@ endif
dummy := $(call unnest-vars,, \
authz-obj-y \
chardev-obj-y \
- qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
storage-daemon-obj-y \
diff --git a/Makefile.objs b/Makefile.objs
index 259f993..baf1565 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -91,11 +91,3 @@ common-obj-y += disas/
######################################################################
# Resource file for Windows executables
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
-
-######################################################################
-# guest agent
-
-# FIXME: a few definitions from qapi/qapi-types.o and
-# qapi/qapi-visit.o are needed by libqemuutil.a. These should be
-# extracted into a QAPI schema module, or perhaps a separate schema.
-qga-vss-dll-obj-y = qga/
diff --git a/qga/Makefile.objs b/qga/Makefile.objs
deleted file mode 100644
index 9ecf249..0000000
--- a/qga/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-qga-vss-dll-obj-$(CONFIG_QGA_VSS) += vss-win32/
diff --git a/qga/meson.build b/qga/meson.build
index e963e43..7dc031f 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -43,3 +43,9 @@ qga_ss = qga_ss.apply(config_host, strict: false)
qga = executable('qemu-ga', qga_ss.sources(),
link_args: config_host['LIBS_QGA'].split(),
dependencies: [qemuutil, libudev])
+
+if host_machine.system() == 'windows'
+ if 'CONFIG_QGA_VSS' in config_host
+ subdir('vss-win32')
+ endif
+endif
diff --git a/qga/vss-win32/Makefile.objs b/qga/vss-win32/Makefile.objs
deleted file mode 100644
index c82676a..0000000
--- a/qga/vss-win32/Makefile.objs
+++ /dev/null
@@ -1,23 +0,0 @@
-# rules to build qga-vss.dll
-
-qga-vss-dll-obj-y += requester.o provider.o install.o
-
-obj-qga-vss-dll-obj-y = $(addprefix $(obj)/, $(qga-vss-dll-obj-y))
-$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS := $(filter-out -fstack-protector-all -fstack-protector-strong, $(QEMU_CXXFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor
-
-QGA_VSS_LDFLAGS = -shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup -lglib-2.0 -lole32 -loleaut32 -lshlwapi -luuid -lintl -lws2_32 -static
-$(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def
- $(call quiet-command,$(CXX) -o $@ $(qga-vss-dll-obj-y) $(SRC_PATH)/qga/vss-win32/qga-vss.def $(CXXFLAGS) $(QGA_VSS_LDFLAGS),"LINK","$(TARGET_DIR)$@")
-
-
-# rules to build qga-provider.tlb
-# Currently, only native build is supported because building .tlb
-# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++).
-MIDL=$(WIN_SDK)/Bin/midl
-
-$(obj)/qga-vss.tlb: $(SRC_PATH)/$(obj)/qga-vss.idl
-ifeq ($(WIN_SDK),"")
- $(call quiet-command,cp $(dir $<)qga-vss.tlb $@,"COPY","$(TARGET_DIR)$@")
-else
- $(call quiet-command,$(MIDL) -tlb $@ -I $(WIN_SDK)/Include $<,"MIDL","$(TARGET_DIR)$@")
-endif
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
new file mode 100644
index 0000000..42c8d31
--- /dev/null
+++ b/qga/vss-win32/meson.build
@@ -0,0 +1,33 @@
+if add_languages('cpp', required: false)
+ glib_static = dependency('glib-2.0', static: true)
+ link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
+ '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
+ shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
+ name_prefix: '',
+ cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
+ link_args: link_args,
+ vs_module_defs: 'qga-vss.def',
+ dependencies: [glib_static, socket,
+ cc.find_library('ole32'),
+ cc.find_library('oleaut32'),
+ cc.find_library('shlwapi'),
+ cc.find_library('uuid'),
+ cc.find_library('intl')])
+endif
+
+# rules to build qga-vss.tlb
+# Currently, only native build is supported because building .tlb
+# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++).
+midl = find_program('midl', required: false)
+if midl.found()
+ gen_tlb = custom_target('gen-tlb',
+ input: 'qga-vss.idl',
+ output: 'qga-vss.tlb',
+ command: [midl, '-tlb', '-I' + config_host['WIN_SDK'],
+ '@INPUT@', '@OUTPUT@'])
+else
+ gen_tlb = custom_target('gen-tlb',
+ input: 'qga-vss.tlb',
+ output: 'qga-vss.tlb',
+ command: ['cp', '@INPUT@', '@OUTPUT@'])
+endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 035/143] meson: add msi generation
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (33 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 034/143] meson: convert vss-win32 Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 036/143] meson: convert dummy Windows qga/qemu-ga target Paolo Bonzini
` (112 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 18 ------------------
qga/meson.build | 25 +++++++++++++++++++++++++
qga/vss-win32/meson.build | 3 ++-
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index 3451981..7c4a34a 100644
--- a/Makefile
+++ b/Makefile
@@ -434,23 +434,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-ifdef QEMU_GA_MSI_ENABLED
-QEMU_GA_MSI=qemu-ga-$(ARCH).msi
-
-msi: $(QEMU_GA_MSI)
-
-$(QEMU_GA_MSI): qga/qemu-ga.exe $(QGA_VSS_PROVIDER)
-
-$(QEMU_GA_MSI): config-host.mak
-
-$(QEMU_GA_MSI): $(SRC_PATH)/qga/installer/qemu-ga.wxs
- $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \
- wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<,"WIXL","$@")
-else
-msi:
- @echo "MSI build not configured or dependency resolution failed (reconfigure with --enable-guest-agent-msi option)"
-endif
-
ifneq ($(EXESUF),)
.PHONY: qga/qemu-ga
qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
@@ -465,7 +448,6 @@ clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
rm -f qemu-options.def
- rm -f *.msi
find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
diff --git a/qga/meson.build b/qga/meson.build
index 7dc031f..9246575 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -47,5 +47,30 @@ qga = executable('qemu-ga', qga_ss.sources(),
if host_machine.system() == 'windows'
if 'CONFIG_QGA_VSS' in config_host
subdir('vss-win32')
+ else
+ gen_tlb = []
+ endif
+
+ wixl = find_program('wixl', required: false)
+ if wixl.found()
+ deps = [gen_tlb, qga]
+ if 'QEMU_GA_MSI_WITH_VSS' in config_host
+ deps += qga_vss
+ endif
+ qga_msi = custom_target('QGA MSI',
+ input: files('installer/qemu-ga.wxs'),
+ output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
+ depends: deps,
+ command: [
+ 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
+ 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
+ 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
+ 'BUILD_DIR=' + meson.build_root(),
+ wixl, '-o', '@OUTPUT0@', '@INPUT0@',
+ config_host['QEMU_GA_MSI_ARCH'].split(),
+ config_host['QEMU_GA_MSI_WITH_VSS'].split(),
+ config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
+ ])
+ alias_target('msi', qga_msi)
endif
endif
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 42c8d31..1f39e05 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -2,7 +2,8 @@ if add_languages('cpp', required: false)
glib_static = dependency('glib-2.0', static: true)
link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
'-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
- shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
+
+ qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
name_prefix: '',
cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
link_args: link_args,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 036/143] meson: convert dummy Windows qga/qemu-ga target
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (34 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 035/143] meson: add msi generation Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 037/143] meson: add qemu-bridge-helper Paolo Bonzini
` (111 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
qga/meson.build | 4 ++++
qga/vss-win32/meson.build | 2 ++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 7c4a34a..5df772b 100644
--- a/Makefile
+++ b/Makefile
@@ -434,11 +434,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-ifneq ($(EXESUF),)
-.PHONY: qga/qemu-ga
-qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
-endif
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/qga/meson.build b/qga/meson.build
index 9246575..dcd4772 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -43,6 +43,7 @@ qga_ss = qga_ss.apply(config_host, strict: false)
qga = executable('qemu-ga', qga_ss.sources(),
link_args: config_host['LIBS_QGA'].split(),
dependencies: [qemuutil, libudev])
+all_qga = [qga]
if host_machine.system() == 'windows'
if 'CONFIG_QGA_VSS' in config_host
@@ -71,6 +72,9 @@ if host_machine.system() == 'windows'
config_host['QEMU_GA_MSI_WITH_VSS'].split(),
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
])
+ all_qga += [qga-msi]
alias_target('msi', qga_msi)
endif
+
+ alias_target('qga/qemu-ga', all_qga)
endif
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 1f39e05..780c461 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -14,6 +14,8 @@ if add_languages('cpp', required: false)
cc.find_library('shlwapi'),
cc.find_library('uuid'),
cc.find_library('intl')])
+
+ all_qga += qga_vss
endif
# rules to build qga-vss.tlb
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 037/143] meson: add qemu-bridge-helper
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (35 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 036/143] meson: convert dummy Windows qga/qemu-ga target Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:20 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 038/143] meson: add qemu-keymap Paolo Bonzini
` (110 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 4 ----
meson.build | 8 +++++++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 5df772b..0a2bbd5 100644
--- a/Makefile
+++ b/Makefile
@@ -181,8 +181,6 @@ LIBS+=-lz $(LIBS_TOOLS)
HELPERS-y = $(HELPERS)
-HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -415,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
-
qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
diff --git a/meson.build b/meson.build
index a68c7b4..9eb1204 100644
--- a/meson.build
+++ b/meson.build
@@ -270,7 +270,6 @@ qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
# Other build targets
-
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
endif
@@ -289,6 +288,13 @@ if have_tools
subdir('contrib/vhost-user-scsi')
endif
+ if host_machine.system() == 'linux'
+ executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
+ dependencies: [qemuutil, libcap_ng],
+ install: true,
+ install_dir: get_option('libexecdir'))
+ endif
+
if 'CONFIG_IVSHMEM' in config_host
subdir('contrib/ivshmem-client')
subdir('contrib/ivshmem-server')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 038/143] meson: add qemu-keymap
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (36 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 037/143] meson: add qemu-bridge-helper Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 039/143] meson: add qemu-edid Paolo Bonzini
` (109 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
configure | 4 +---
meson.build | 10 ++++++++++
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 0a2bbd5..bffe932 100644
--- a/Makefile
+++ b/Makefile
@@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
-
qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)
@@ -427,9 +425,6 @@ endif
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
-qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
-qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/configure b/configure
index e0ef3f7..f84c5cd 100755
--- a/configure
+++ b/configure
@@ -6675,9 +6675,6 @@ if test "$softmmu" = yes ; then
fi
mpath=no
fi
- if test "$xkbcommon" = "yes"; then
- tools="qemu-keymap\$(EXESUF) $tools"
- fi
fi
# Probe for guest agent support/options
@@ -6994,6 +6991,7 @@ if test "$vnc_png" = "yes" ; then
echo "CONFIG_VNC_PNG=y" >> $config_host_mak
fi
if test "$xkbcommon" = "yes" ; then
+ echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 9eb1204..a4909f1 100644
--- a/meson.build
+++ b/meson.build
@@ -90,6 +90,11 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
endif
+xkbcommon = not_found
+if 'CONFIG_XKBCOMMON' in config_host
+ xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
+ link_args: config_host['XKBCOMMON_LIBS'].split())
+endif
rt = cc.find_library('rt', required: false)
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
@@ -278,6 +283,11 @@ if have_tools
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
+ if 'CONFIG_XKBCOMMON' in config_host
+ executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'),
+ dependencies: [qemuutil, xkbcommon], install: true)
+ endif
+
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 039/143] meson: add qemu-edid
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (37 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 038/143] meson: add qemu-keymap Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:21 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 040/143] meson: add virtfs-proxy-helper Paolo Bonzini
` (108 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 --
configure | 2 +-
meson.build | 3 +++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index bffe932..a961bc3 100644
--- a/Makefile
+++ b/Makefile
@@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
-
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
diff --git a/configure b/configure
index f84c5cd..d123733 100755
--- a/configure
+++ b/configure
@@ -6640,7 +6640,7 @@ fi
tools=""
if test "$want_tools" = "yes" ; then
- tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) qemu-edid\$(EXESUF) $tools"
+ tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
fi
diff --git a/meson.build b/meson.build
index a4909f1..c62f99f 100644
--- a/meson.build
+++ b/meson.build
@@ -288,6 +288,9 @@ if have_tools
dependencies: [qemuutil, xkbcommon], install: true)
endif
+ executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'),
+ dependencies: qemuutil)
+
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 040/143] meson: add virtfs-proxy-helper
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (38 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 039/143] meson: add qemu-edid Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 041/143] meson: keymap-gen Paolo Bonzini
` (107 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 --
configure | 7 +++++--
fsdev/meson.build | 5 +++++
meson.build | 6 ++++++
4 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 fsdev/meson.build
diff --git a/Makefile b/Makefile
index a961bc3..2fbbc0a 100644
--- a/Makefile
+++ b/Makefile
@@ -413,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)
-
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
ifdef CONFIG_MPATH
scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
diff --git a/configure b/configure
index d123733..8026778 100755
--- a/configure
+++ b/configure
@@ -4320,6 +4320,7 @@ fi
##########################################
# attr probe
+libattr_libs=
if test "$attr" != "no" ; then
cat > $TMPC <<EOF
#include <stdio.h>
@@ -4336,7 +4337,8 @@ EOF
# Older distros have <attr/xattr.h>, and need -lattr:
elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then
attr=yes
- LIBS="-lattr $LIBS"
+ libattr_libs="-lattr"
+ LIBS="$libattr_libs $LIBS"
libattr=yes
else
if test "$attr" = "yes" ; then
@@ -6639,6 +6641,7 @@ if [ "$eventfd" = "yes" ]; then
fi
tools=""
+helpers=""
if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
@@ -6649,7 +6652,6 @@ if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
virtfs=yes
- helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
error_exit "VirtFS requires libcap-ng devel and libattr devel"
@@ -7231,6 +7233,7 @@ if test "$linux_io_uring" = "yes" ; then
fi
if test "$attr" = "yes" ; then
echo "CONFIG_ATTR=y" >> $config_host_mak
+ echo "LIBATTR_LIBS=$libattr_libs" >> $config_host_mak
fi
if test "$libattr" = "yes" ; then
echo "CONFIG_LIBATTR=y" >> $config_host_mak
diff --git a/fsdev/meson.build b/fsdev/meson.build
new file mode 100644
index 0000000..d0daa2a
--- /dev/null
+++ b/fsdev/meson.build
@@ -0,0 +1,5 @@
+have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host
+if have_virtfs_proxy_helper
+ executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
+ dependencies: [qemuutil, libattr, libcap_ng])
+endif
diff --git a/meson.build b/meson.build
index c62f99f..eec72f5 100644
--- a/meson.build
+++ b/meson.build
@@ -81,6 +81,10 @@ if 'CONFIG_GNUTLS' in config_host
endif
pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(),
link_args: config_host['PIXMAN_LIBS'].split())
+libattr = not_found
+if 'CONFIG_ATTR' in config_host
+ libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split())
+endif
seccomp = not_found
if 'CONFIG_SECCOMP' in config_host
seccomp = declare_dependency(compile_args: config_host['SECCOMP_CFLAGS'].split(),
@@ -274,6 +278,8 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+subdir('fsdev')
+
# Other build targets
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 041/143] meson: keymap-gen
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (39 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 040/143] meson: add virtfs-proxy-helper Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 042/143] meson: generate qemu-version.h Paolo Bonzini
` (106 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 38 --------------------------------------
meson.build | 1 +
ui/meson.build | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 38 deletions(-)
create mode 100644 ui/meson.build
diff --git a/Makefile b/Makefile
index 2fbbc0a..3837f80 100644
--- a/Makefile
+++ b/Makefile
@@ -125,44 +125,6 @@ generated-files-y += module_block.h
generated-files-y += .git-submodule-status
-KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
-KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
-
-KEYCODEMAP_FILES = \
- ui/input-keymap-atset1-to-qcode.c \
- ui/input-keymap-linux-to-qcode.c \
- ui/input-keymap-qcode-to-atset1.c \
- ui/input-keymap-qcode-to-atset2.c \
- ui/input-keymap-qcode-to-atset3.c \
- ui/input-keymap-qcode-to-linux.c \
- ui/input-keymap-qcode-to-qnum.c \
- ui/input-keymap-qcode-to-sun.c \
- ui/input-keymap-qnum-to-qcode.c \
- ui/input-keymap-usb-to-qcode.c \
- ui/input-keymap-win32-to-qcode.c \
- ui/input-keymap-x11-to-qcode.c \
- ui/input-keymap-xorgevdev-to-qcode.c \
- ui/input-keymap-xorgkbd-to-qcode.c \
- ui/input-keymap-xorgxquartz-to-qcode.c \
- ui/input-keymap-xorgxwin-to-qcode.c \
- ui/input-keymap-osx-to-qcode.c \
- $(NULL)
-
-generated-files-$(CONFIG_SOFTMMU) += $(KEYCODEMAP_FILES)
-
-ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile.objs
- $(call quiet-command,\
- stem=$* && src=$${stem%-to-*} dst=$${stem#*-to-} && \
- test -e $(KEYCODEMAP_GEN) && \
- $(PYTHON) $(KEYCODEMAP_GEN) \
- --lang glib2 \
- --varname qemu_input_map_$${src}_to_$${dst} \
- code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
- > $@ || rm -f $@, "GEN", "$@")
-
-$(KEYCODEMAP_GEN): .git-submodule-status
-$(KEYCODEMAP_CSV): .git-submodule-status
-
edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))
pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2
$(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<)
diff --git a/meson.build b/meson.build
index eec72f5..4448bfe 100644
--- a/meson.build
+++ b/meson.build
@@ -265,6 +265,7 @@ subdir('trace')
subdir('util')
subdir('crypto')
subdir('storage-daemon')
+subdir('ui')
# Build targets from sourcesets
diff --git a/ui/meson.build b/ui/meson.build
new file mode 100644
index 0000000..cad9763
--- /dev/null
+++ b/ui/meson.build
@@ -0,0 +1,34 @@
+keymap_gen = find_program('keycodemapdb/tools/keymap-gen')
+
+keymaps = [
+ ['atset1', 'qcode'],
+ ['linux', 'qcode'],
+ ['qcode', 'atset1'],
+ ['qcode', 'atset2'],
+ ['qcode', 'atset3'],
+ ['qcode', 'linux'],
+ ['qcode', 'qnum'],
+ ['qcode', 'sun'],
+ ['qnum', 'qcode'],
+ ['usb', 'qcode'],
+ ['win32', 'qcode'],
+ ['x11', 'qcode'],
+ ['xorgevdev', 'qcode'],
+ ['xorgkbd', 'qcode'],
+ ['xorgxquartz', 'qcode'],
+ ['xorgxwin', 'qcode'],
+ ['osx', 'qcode'],
+]
+
+foreach e : keymaps
+ output = 'input-keymap-@0@-to-@1@.c'.format(e[0], e[1])
+ custom_target(output,
+ output: output,
+ capture: true,
+ build_by_default: true, # to be removed when added to a target
+ input: files('keycodemapdb/data/keymaps.csv'),
+ command: [keymap_gen,
+ '--lang', 'glib2',
+ '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]),
+ 'code-map', '@INPUT0@', e[0], e[1]])
+endforeach
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 042/143] meson: generate qemu-version.h
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (40 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 041/143] meson: keymap-gen Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 043/143] meson: generate shader headers Paolo Bonzini
` (105 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 27 +--------------------------
meson.build | 14 ++++++++++++--
scripts/qemu-version.sh | 25 +++++++++++++++++++++++++
3 files changed, 38 insertions(+), 28 deletions(-)
create mode 100755 scripts/qemu-version.sh
diff --git a/Makefile b/Makefile
index 3837f80..d9a8633 100644
--- a/Makefile
+++ b/Makefile
@@ -105,21 +105,7 @@ include $(SRC_PATH)/rules.mak
# lor is defined in rules.mak
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
-# Create QEMU_PKGVERSION and FULL_VERSION strings
-# If PKGVERSION is set, use that; otherwise get version and -dirty status from git
-QEMU_PKGVERSION := $(if $(PKGVERSION),$(PKGVERSION),$(shell \
- cd $(SRC_PATH); \
- if test -e .git; then \
- git describe --match 'v*' 2>/dev/null | tr -d '\n'; \
- if ! git diff-index --quiet HEAD &>/dev/null; then \
- echo "-dirty"; \
- fi; \
- fi))
-
-# Either "version (pkgversion)", or just "version" if pkgversion not set
-FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSION))
-
-generated-files-y = qemu-version.h config-host.h qemu-options.def
+generated-files-y = config-host.h qemu-options.def
generated-files-y += module_block.h
@@ -259,17 +245,6 @@ include $(SRC_PATH)/tests/Makefile.include
all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules
-qemu-version.h: FORCE
- $(call quiet-command, \
- (printf '#define QEMU_PKGVERSION "$(QEMU_PKGVERSION)"\n'; \
- printf '#define QEMU_FULL_VERSION "$(FULL_VERSION)"\n'; \
- ) > $@.tmp)
- $(call quiet-command, if ! cmp -s $@ $@.tmp; then \
- mv $@.tmp $@; \
- else \
- rm $@.tmp; \
- fi)
-
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
diff --git a/meson.build b/meson.build
index 4448bfe..f90bc23 100644
--- a/meson.build
+++ b/meson.build
@@ -137,6 +137,7 @@ have_block = have_system or have_tools
# Generators
+genh = []
qapi_gen = find_program('scripts/qapi-gen.py')
qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
meson.source_root() / 'scripts/qapi/commands.py',
@@ -156,6 +157,17 @@ qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
meson.source_root() / 'scripts/qapi/doc.py',
]
+qemu_version_cmd = [find_program('scripts/qemu-version.sh'),
+ meson.current_source_dir(),
+ config_host['PKGVERSION'], config_host['VERSION']]
+qemu_version = custom_target('qemu-version.h',
+ output: 'qemu-version.h',
+ command: qemu_version_cmd,
+ capture: true,
+ build_by_default: true,
+ build_always_stale: true)
+genh += qemu_version
+
# Collect sourcesets.
util_ss = ss.source_set()
@@ -256,8 +268,6 @@ trace_events_subdirs += [
'util',
]
-genh = []
-
subdir('qapi')
subdir('qobject')
subdir('stubs')
diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
new file mode 100755
index 0000000..4847385
--- /dev/null
+++ b/scripts/qemu-version.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -eu
+
+dir="$1"
+pkgversion="$2"
+version="$3"
+
+if [ -z "$pkgversion"]; then
+ cd "$dir"
+ if [ -e .git ]; then
+ pkgversion=$(git describe --match 'v*' --dirty | echo "")
+ fi
+fi
+
+if [ -n "$pkgversion" ]; then
+ fullversion="$version ($pkgversion)"
+else
+ fullversion="$version"
+fi
+
+cat <<EOF
+#define QEMU_PKGVERSION "$pkgversion"
+#define QEMU_FULL_VERSION "$fullversion"
+EOF
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 043/143] meson: generate shader headers
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (41 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 042/143] meson: generate qemu-version.h Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 044/143] meson: generate hxtool files Paolo Bonzini
` (104 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 19 -------------------
meson.build | 1 +
ui/meson.build | 2 ++
ui/shader/meson.build | 15 +++++++++++++++
4 files changed, 18 insertions(+), 19 deletions(-)
create mode 100644 ui/shader/meson.build
diff --git a/Makefile b/Makefile
index d9a8633..3fafc89 100644
--- a/Makefile
+++ b/Makefile
@@ -376,7 +376,6 @@ clean: recurse-clean
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f qemu-img-cmds.h
- rm -f ui/shader/*-vert.h ui/shader/*-frag.h
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
rm -f config-all-devices.mak
rm -f $(SUBDIR_DEVICES_MAK)
@@ -598,24 +597,6 @@ endif
$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
done
-# opengl shader programs
-ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclude.pl
- @mkdir -p $(dir $@)
- $(call quiet-command,\
- perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\
- "VERT","$@")
-
-ui/shader/%-frag.h: $(SRC_PATH)/ui/shader/%.frag $(SRC_PATH)/scripts/shaderinclude.pl
- @mkdir -p $(dir $@)
- $(call quiet-command,\
- perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\
- "FRAG","$@")
-
-ui/shader.o: $(SRC_PATH)/ui/shader.c \
- ui/shader/texture-blit-vert.h \
- ui/shader/texture-blit-flip-vert.h \
- ui/shader/texture-blit-frag.h
-
# documentation
MAKEINFO=makeinfo
MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
diff --git a/meson.build b/meson.build
index f90bc23..fe2be8f 100644
--- a/meson.build
+++ b/meson.build
@@ -138,6 +138,7 @@ have_block = have_system or have_tools
# Generators
genh = []
+shaderinclude = find_program('scripts/shaderinclude.pl')
qapi_gen = find_program('scripts/qapi-gen.py')
qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
meson.source_root() / 'scripts/qapi/commands.py',
diff --git a/ui/meson.build b/ui/meson.build
index cad9763..8157754 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -32,3 +32,5 @@ foreach e : keymaps
'--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]),
'code-map', '@INPUT0@', e[0], e[1]])
endforeach
+
+subdir('shader')
diff --git a/ui/shader/meson.build b/ui/shader/meson.build
new file mode 100644
index 0000000..f69e44e
--- /dev/null
+++ b/ui/shader/meson.build
@@ -0,0 +1,15 @@
+shaders = [
+ ['texture-blit', 'frag'],
+ ['texture-blit', 'vert'],
+ ['texture-blit-flip', 'vert'],
+]
+
+foreach e : shaders
+ output = '@0@-@1@.h'.format(e[0], e[1])
+ genh += custom_target(output,
+ output: output,
+ capture: true,
+ build_by_default: true, # to be removed when added to a target
+ input: files('@0@.@1@'.format(e[0], e[1])),
+ command: [shaderinclude, '@INPUT0@'])
+endforeach
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 044/143] meson: generate hxtool files
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (42 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 043/143] meson: generate shader headers Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 045/143] meson: uncompress edk2 bios Paolo Bonzini
` (103 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 8 +-------
Makefile.target | 6 ------
meson.build | 21 +++++++++++++++++++++
scripts/hxtool | 2 +-
4 files changed, 23 insertions(+), 14 deletions(-)
mode change 100644 => 100755 scripts/hxtool
diff --git a/Makefile b/Makefile
index 3fafc89..984f784 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ include $(SRC_PATH)/rules.mak
# lor is defined in rules.mak
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
-generated-files-y = config-host.h qemu-options.def
+generated-files-y = config-host.h
generated-files-y += module_block.h
@@ -247,8 +247,6 @@ all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all mo
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
-qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), $(TARGET_DIRS)))
@@ -355,9 +353,6 @@ ifdef CONFIG_MPATH
scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
endif
-qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
@@ -375,7 +370,6 @@ clean: recurse-clean
rm -f $(edk2-decompressed)
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
- rm -f qemu-img-cmds.h
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
rm -f config-all-devices.mak
rm -f $(SUBDIR_DEVICES_MAK)
diff --git a/Makefile.target b/Makefile.target
index 0b32364..257afc2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -225,12 +225,6 @@ endif
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
-hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@")
-
-hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@")
-
clean: clean-target
rm -f *.a *~ $(PROGS)
rm -f $(shell find . -name '*.[od]')
diff --git a/meson.build b/meson.build
index fe2be8f..892bb62 100644
--- a/meson.build
+++ b/meson.build
@@ -138,6 +138,7 @@ have_block = have_system or have_tools
# Generators
genh = []
+hxtool = find_program('scripts/hxtool')
shaderinclude = find_program('scripts/shaderinclude.pl')
qapi_gen = find_program('scripts/qapi-gen.py')
qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
@@ -169,6 +170,26 @@ qemu_version = custom_target('qemu-version.h',
build_always_stale: true)
genh += qemu_version
+hxdep = []
+hx_headers = [
+ ['qemu-options.hx', 'qemu-options.def'],
+ ['qemu-img-cmds.hx', 'qemu-img-cmds.h'],
+]
+if have_system
+ hx_headers += [
+ ['hmp-commands.hx', 'hmp-commands.h'],
+ ['hmp-commands-info.hx', 'hmp-commands-info.h'],
+ ]
+endif
+foreach d : hx_headers
+ custom_target(d[1],
+ input: files(d[0]),
+ output: d[1],
+ capture: true,
+ build_by_default: true, # to be removed when added to a target
+ command: [hxtool, '-h', '@INPUT0@'])
+endforeach
+
# Collect sourcesets.
util_ss = ss.source_set()
diff --git a/scripts/hxtool b/scripts/hxtool
old mode 100644
new mode 100755
index 7b1452f..80516b9
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -19,6 +19,6 @@ hxtoh()
case "$1" in
"-h") hxtoh ;;
*) exit 1 ;;
-esac
+esac < "$2"
exit 0
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 045/143] meson: uncompress edk2 bios
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (43 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 044/143] meson: generate hxtool files Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:26 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 046/143] meson: convert check-decodetree Paolo Bonzini
` (102 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 7 -------
meson.build | 1 +
pc-bios/meson.build | 23 +++++++++++++++++++++++
3 files changed, 24 insertions(+), 7 deletions(-)
create mode 100644 pc-bios/meson.build
diff --git a/Makefile b/Makefile
index 984f784..d277681 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,6 @@ generated-files-y += module_block.h
generated-files-y += .git-submodule-status
edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))
-pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2
- $(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<)
-
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
@@ -258,9 +255,6 @@ $(SOFTMMU_ALL_RULES): $(chardev-obj-y)
$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
$(SOFTMMU_ALL_RULES): $(io-obj-y)
$(SOFTMMU_ALL_RULES): config-all-devices.mak
-ifdef DECOMPRESS_EDK2_BLOBS
-$(SOFTMMU_ALL_RULES): $(edk2-decompressed)
-endif
SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
$(SOFTMMU_FUZZ_RULES): $(authz-obj-y)
@@ -367,7 +361,6 @@ clean: recurse-clean
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
-exec rm {} +
- rm -f $(edk2-decompressed)
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
diff --git a/meson.build b/meson.build
index 892bb62..d287e06 100644
--- a/meson.build
+++ b/meson.build
@@ -354,6 +354,7 @@ if have_tools
endif
subdir('tools')
+subdir('pc-bios')
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
new file mode 100644
index 0000000..8a3d335
--- /dev/null
+++ b/pc-bios/meson.build
@@ -0,0 +1,23 @@
+bzip2 = find_program('bzip2')
+
+if 'DECOMPRESS_EDK2_BLOBS' in config_host
+ fds = [
+ 'edk2-aarch64-code.fd',
+ 'edk2-arm-code.fd',
+ 'edk2-arm-vars.fd',
+ 'edk2-i386-code.fd',
+ 'edk2-i386-secure-code.fd',
+ 'edk2-i386-vars.fd',
+ 'edk2-x86_64-code.fd',
+ 'edk2-x86_64-secure-code.fd',
+ ]
+
+ foreach f : fds
+ custom_target(f,
+ output: f,
+ input: '@0@.bz2'.format(f),
+ capture: true,
+ build_by_default: true,
+ command: [ bzip2, '-dc', '@INPUT0@' ])
+ endforeach
+endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 046/143] meson: convert check-decodetree
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (44 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 045/143] meson: uncompress edk2 bios Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 047/143] meson: convert tests/fp and check-softfloat Paolo Bonzini
` (101 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 ++
tests/Makefile.include | 8 +-------
tests/meson.build | 4 ++++
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 tests/meson.build
diff --git a/meson.build b/meson.build
index d287e06..fbf27a7 100644
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ not_found = dependency('', required: false)
keyval = import('unstable-keyval')
ss = import('sourceset')
+sh = find_program('sh')
cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
@@ -355,6 +356,7 @@ endif
subdir('tools')
subdir('pc-bios')
+subdir('tests')
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 1a20657..3ae7f88 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -896,13 +896,6 @@ check-tests/qapi-schema/frontend: $(addprefix $(SRC_PATH)/, $(check-qapi-schema-
check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi
@diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $<
-.PHONY: check-decodetree
-check-decodetree:
- $(call quiet-command, \
- cd $(SRC_PATH)/tests/decode && \
- ./check.sh "$(PYTHON)" "$(SRC_PATH)/scripts/decodetree.py", \
- TEST, decodetree.py)
-
# Python venv for running tests
.PHONY: check-venv check-acceptance
@@ -964,6 +957,7 @@ check-block: $(patsubst %,check-%, $(check-block-y))
endif
check-build: build-unit build-softfloat build-qtest
+check: check-block check-qapi-schema check-unit check-softfloat check-qtest
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 0000000..5c52021
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,4 @@
+test('decodetree', sh,
+ args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
+ workdir: meson.current_source_dir() / 'decode',
+ suite: 'decodetree')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 047/143] meson: convert tests/fp and check-softfloat
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (45 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 046/143] meson: convert check-decodetree Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 048/143] meson: convert check-qapi-schema Paolo Bonzini
` (100 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
tests/Makefile.include | 160 +------------
tests/fp/Makefile | 600 ----------------------------------------------
tests/fp/meson.build | 628 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/meson.build | 4 +
5 files changed, 636 insertions(+), 758 deletions(-)
delete mode 100644 tests/fp/Makefile
create mode 100644 tests/fp/meson.build
diff --git a/configure b/configure
index 8026778..3c54abf 100755
--- a/configure
+++ b/configure
@@ -8319,7 +8319,7 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios"
LINKS="Makefile"
LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile"
-LINKS="$LINKS tests/tcg/Makefile.target tests/fp/Makefile"
+LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS tests/plugin/Makefile"
LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3ae7f88..f7ffecc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -437,9 +437,6 @@ tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-obj-y)
tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-y)
tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y)
-tests/fp/%:
- $(MAKE) -C $(dir $@) $(notdir $@)
-
tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \
hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\
hw/core/bus.o \
@@ -675,157 +672,6 @@ check-report-unit.tap: $(check-unit-y)
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
-# FPU Emulation tests (aka softfloat)
-#
-# As we still have some places that need fixing the rules are a little
-# more complex than they need to be and have to override some of the
-# generic Makefile expansions. Once we are cleanly passing all
-# the tests we can simplify the make syntax.
-
-FP_TEST_BIN=$(BUILD_DIR)/tests/fp/fp-test
-
-# the build dir is created by configure
-$(FP_TEST_BIN): config-host.h $(test-util-obj-y)
- $(call quiet-command, \
- $(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" $(notdir $@), \
- "BUILD", "$(notdir $@)")
-
-# The full test suite can take a bit of time, default to a quick run
-# "-l 2 -r all" can take more than a day for some operations and is best
-# run manually
-FP_TL=-l 1 -r all
-
-# $1 = tests, $2 = description, $3 = test flags
-test-softfloat = $(call quiet-command, \
- cd $(BUILD_DIR)/tests/fp && \
- ./fp-test -s $(if $3,$3,$(FP_TL)) $1 > $2.out 2>&1 || \
- (cat $2.out && exit 1;), \
- "FLOAT TEST", $2)
-
-# Conversion Routines: Float to Float
-# FIXME: f32_to_f128 (broken), f64_to_f128 (broken)
-# FIXME: f128_to_f32(broken), f128_to_f64 (broken)
-# FIXME: f128_to_extF80 (broken)
-check-softfloat-conv-f2f: $(FP_TEST_BIN)
- $(call test-softfloat, \
- f16_to_f32 f16_to_f64 \
- f16_to_extF80 f16_to_f128 \
- f32_to_f16 f32_to_f64 \
- f32_to_extF80 \
- f64_to_f16 f64_to_f32 \
- extF80_to_f16 extF80_to_f32 \
- extF80_to_f64 extF80_to_f128 \
- f128_to_f16, \
- float-to-float)
-
-# Conversion Routines: Int and Uint to Float
-# FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken)
-# ui32_to_f128 (not implemented)
-check-softfloat-conv-to-float: $(FP_TEST_BIN)
- $(call test-softfloat, \
- i32_to_f16 i64_to_f16 \
- i32_to_f32 i64_to_f32 \
- i32_to_f64 i64_to_f64 \
- i32_to_f128 i64_to_f128, int-to-float)
- $(call test-softfloat, \
- ui32_to_f16 ui64_to_f16 \
- ui32_to_f32 ui64_to_f32 \
- ui32_to_f64 ui64_to_f64 \
- ui32_to_extF80 ui64_to_extF80 \
- ui64_to_f128, uint-to-float)
-
-# Conversion Routines: Float to integers
-# FIXME: extF80_roundToInt (broken)
-check-softfloat-conv-to-int: $(FP_TEST_BIN)
- $(call test-softfloat, \
- f16_to_i32 f16_to_i32_r_minMag \
- f32_to_i32 f32_to_i32_r_minMag \
- f64_to_i32 f64_to_i32_r_minMag \
- extF80_to_i32 extF80_to_i32_r_minMag \
- f128_to_i32 f128_to_i32_r_minMag \
- f16_to_i64 f16_to_i64_r_minMag \
- f32_to_i64 f32_to_i64_r_minMag \
- f64_to_i64 f64_to_i64_r_minMag \
- extF80_to_i64 extF80_to_i64_r_minMag \
- f128_to_i64 f128_to_i64_r_minMag, \
- float-to-int)
- $(call test-softfloat, \
- f16_to_ui32 f16_to_ui32_r_minMag \
- f32_to_ui32 f32_to_ui32_r_minMag \
- f64_to_ui32 f64_to_ui32_r_minMag \
- extF80_to_ui32 extF80_to_ui32_r_minMag \
- f128_to_ui32 f128_to_ui32_r_minMag \
- f16_to_ui64 f16_to_ui64_r_minMag \
- f32_to_ui64 f32_to_ui64_r_minMag \
- f64_to_ui64 f64_to_ui64_r_minMag \
- extF80_to_ui64 extF80_to_ui64_r_minMag \
- f128_to_ui64 f128_to_ui64_r_minMag, \
- float-to-uint)
- $(call test-softfloat, \
- f16_roundToInt f32_roundToInt \
- f64_roundToInt f128_roundToInt, \
- round-to-integer)
-
-.PHONY: check-softfloat-conv
-check-softfloat-conv: check-softfloat-conv-f2f
-check-softfloat-conv: check-softfloat-conv-to-float
-check-softfloat-conv: check-softfloat-conv-to-int
-
-# Generic rule for all float operations
-#
-# Some patterns are overridden due to broken or missing tests.
-# Hopefully these can be removed over time.
-
-check-softfloat-%: $(FP_TEST_BIN)
- $(call test-softfloat, f16_$* f32_$* f64_$* extF80_$* f128_$*, $*)
-
-# Float Compare routines
-SF_COMPARE_OPS=eq eq_signaling le le_quiet lt_quiet
-SF_COMPARE_RULES=$(patsubst %,check-softfloat-%, $(SF_COMPARE_OPS))
-
-# FIXME: extF80_lt_quiet (broken)
-check-softfloat-lt_quiet: $(FP_TEST_BIN)
- $(call test-softfloat, \
- f16_lt_quiet f32_lt_quiet f64_lt_quiet \
- f128_lt_quiet, \
- lt_quiet)
-
-.PHONY: check-softfloat-compare
-check-softfloat-compare: $(SF_COMPARE_RULES)
-
-# Math Operations
-
-# FIXME: extF80_mulAdd (missing)
-check-softfloat-mulAdd: $(FP_TEST_BIN)
- $(call test-softfloat, \
- f16_mulAdd f32_mulAdd f64_mulAdd f128_mulAdd, \
- mulAdd,-l 1)
-
-# FIXME: extF80_rem (broken)
-check-softfloat-rem: $(FP_TEST_BIN)
- $(call test-softfloat, \
- f16_rem f32_rem f64_rem f128_rem, \
- rem)
-
-SF_MATH_OPS=add sub mul mulAdd div rem sqrt
-SF_MATH_RULES=$(patsubst %,check-softfloat-%, $(SF_MATH_OPS))
-
-.PHONY: check-softfloat-ops
-check-softfloat-ops: $(SF_MATH_RULES)
-
-# Finally a generic rule to test all of softfoat. If TCG isnt't
-# enabled we define a null operation which skips the tests.
-
-.PHONY: check-softfloat
-ifeq ($(CONFIG_TCG),y)
-build-softfloat: $(FP_TEST_BIN)
-check-softfloat: build-softfloat check-softfloat-conv check-softfloat-compare check-softfloat-ops
-else
-build-softfloat check-softfloat:
- $(call quiet-command, /bin/true, "FLOAT TEST", \
- "SKIPPED for non-TCG builds")
-endif
-
# Plugins
ifeq ($(CONFIG_PLUGIN),y)
.PHONY: plugins
@@ -955,9 +801,9 @@ check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
ifeq ($(CONFIG_TOOLS),y)
check-block: $(patsubst %,check-%, $(check-block-y))
endif
-check-build: build-unit build-softfloat build-qtest
+check-build: build-unit build-qtest
-check: check-block check-qapi-schema check-unit check-softfloat check-qtest
+check: check-block check-qapi-schema check-unit check-qtest
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
@@ -965,7 +811,7 @@ check-clean:
rm -f tests/qtest/dbus-vmstate1-gen-timestamp
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
-check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-block check-qapi-schema check-unit check-qtest check-decodetree
clean: check-clean
diff --git a/tests/fp/Makefile b/tests/fp/Makefile
deleted file mode 100644
index 56768ec..0000000
--- a/tests/fp/Makefile
+++ /dev/null
@@ -1,600 +0,0 @@
-BUILD_DIR := $(CURDIR)/../..
-
-include $(BUILD_DIR)/config-host.mak
-include $(SRC_PATH)/rules.mak
-
-SOFTFLOAT_DIR := $(SRC_PATH)/tests/fp/berkeley-softfloat-3
-TESTFLOAT_DIR := $(SRC_PATH)/tests/fp/berkeley-testfloat-3
-
-SF_SOURCE_DIR := $(SOFTFLOAT_DIR)/source
-SF_INCLUDE_DIR := $(SOFTFLOAT_DIR)/source/include
-# we could use any specialize here, it doesn't matter
-SF_SPECIALIZE := 8086-SSE
-SF_SPECIALIZE_DIR := $(SF_SOURCE_DIR)/$(SF_SPECIALIZE)
-
-TF_SOURCE_DIR := $(TESTFLOAT_DIR)/source
-
-$(call set-vpath, $(SRC_PATH)/fpu $(SRC_PATH)/tests/fp)
-
-LIBQEMUUTIL := $(BUILD_DIR)/libqemuutil.a
-
-# Use this variable to be clear when we pull in our own implementation
-# We build the object with a default rule thanks to the vpath above
-QEMU_SOFTFLOAT_OBJ := softfloat.o
-
-QEMU_INCLUDES += -I$(SRC_PATH)/tests/fp
-QEMU_INCLUDES += -I$(SF_INCLUDE_DIR)
-QEMU_INCLUDES += -I$(SF_SPECIALIZE_DIR)
-QEMU_INCLUDES += -I$(TF_SOURCE_DIR)
-
-# work around TARGET_* poisoning
-QEMU_CFLAGS += -DHW_POISON_H
-# define a target to match testfloat's implementation-defined choices, such as
-# whether to raise the invalid flag when dealing with NaNs in muladd.
-QEMU_CFLAGS += -DTARGET_ARM
-
-# capstone has a platform.h file that clashes with softfloat's
-QEMU_CFLAGS := $(filter-out %capstone, $(QEMU_CFLAGS))
-
-# softfloat defines
-SF_OPTS :=
-SF_OPTS += -DSOFTFLOAT_ROUND_ODD
-SF_OPTS += -DINLINE_LEVEL=5
-SF_OPTS += -DSOFTFLOAT_FAST_DIV32TO16
-SF_OPTS += -DSOFTFLOAT_FAST_DIV64TO32
-SF_OPTS += -DSOFTFLOAT_FAST_INT64
-QEMU_CFLAGS += $(SF_OPTS)
-
-# silence the build of softfloat objects
-SF_CFLAGS += -Wno-missing-prototypes
-SF_CFLAGS += -Wno-redundant-decls
-SF_CFLAGS += -Wno-return-type
-SF_CFLAGS += -Wno-error
-
-# testfloat defines
-TF_OPTS :=
-TF_OPTS += -DFLOAT16
-TF_OPTS += -DFLOAT64
-TF_OPTS += -DEXTFLOAT80
-TF_OPTS += -DFLOAT128
-TF_OPTS += -DFLOAT_ROUND_ODD
-TF_OPTS += -DLONG_DOUBLE_IS_EXTFLOAT80
-QEMU_CFLAGS += $(TF_OPTS)
-
-# silence the build of testfloat objects
-TF_CFLAGS :=
-TF_CFLAGS += -Wno-strict-prototypes
-TF_CFLAGS += -Wno-unknown-pragmas
-TF_CFLAGS += -Wno-uninitialized
-TF_CFLAGS += -Wno-missing-prototypes
-TF_CFLAGS += -Wno-return-type
-TF_CFLAGS += -Wno-unused-function
-TF_CFLAGS += -Wno-error
-
-# softfloat objects
-SF_OBJS_PRIMITIVES :=
-SF_OBJS_PRIMITIVES += s_eq128.o
-SF_OBJS_PRIMITIVES += s_le128.o
-SF_OBJS_PRIMITIVES += s_lt128.o
-SF_OBJS_PRIMITIVES += s_shortShiftLeft128.o
-SF_OBJS_PRIMITIVES += s_shortShiftRight128.o
-SF_OBJS_PRIMITIVES += s_shortShiftRightJam64.o
-SF_OBJS_PRIMITIVES += s_shortShiftRightJam64Extra.o
-SF_OBJS_PRIMITIVES += s_shortShiftRightJam128.o
-SF_OBJS_PRIMITIVES += s_shortShiftRightJam128Extra.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam32.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam64.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam64Extra.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam128.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam128Extra.o
-SF_OBJS_PRIMITIVES += s_shiftRightJam256M.o
-SF_OBJS_PRIMITIVES += s_countLeadingZeros8.o
-SF_OBJS_PRIMITIVES += s_countLeadingZeros16.o
-SF_OBJS_PRIMITIVES += s_countLeadingZeros32.o
-SF_OBJS_PRIMITIVES += s_countLeadingZeros64.o
-SF_OBJS_PRIMITIVES += s_add128.o
-SF_OBJS_PRIMITIVES += s_add256M.o
-SF_OBJS_PRIMITIVES += s_sub128.o
-SF_OBJS_PRIMITIVES += s_sub256M.o
-SF_OBJS_PRIMITIVES += s_mul64ByShifted32To128.o
-SF_OBJS_PRIMITIVES += s_mul64To128.o
-SF_OBJS_PRIMITIVES += s_mul128By32.o
-SF_OBJS_PRIMITIVES += s_mul128To256M.o
-SF_OBJS_PRIMITIVES += s_approxRecip_1Ks.o
-SF_OBJS_PRIMITIVES += s_approxRecip32_1.o
-SF_OBJS_PRIMITIVES += s_approxRecipSqrt_1Ks.o
-SF_OBJS_PRIMITIVES += s_approxRecipSqrt32_1.o
-
-SF_OBJS_SPECIALIZE :=
-SF_OBJS_SPECIALIZE += softfloat_raiseFlags.o
-SF_OBJS_SPECIALIZE += s_f16UIToCommonNaN.o
-SF_OBJS_SPECIALIZE += s_commonNaNToF16UI.o
-SF_OBJS_SPECIALIZE += s_propagateNaNF16UI.o
-SF_OBJS_SPECIALIZE += s_f32UIToCommonNaN.o
-SF_OBJS_SPECIALIZE += s_commonNaNToF32UI.o
-SF_OBJS_SPECIALIZE += s_propagateNaNF32UI.o
-SF_OBJS_SPECIALIZE += s_f64UIToCommonNaN.o
-SF_OBJS_SPECIALIZE += s_commonNaNToF64UI.o
-SF_OBJS_SPECIALIZE += s_propagateNaNF64UI.o
-SF_OBJS_SPECIALIZE += extF80M_isSignalingNaN.o
-SF_OBJS_SPECIALIZE += s_extF80UIToCommonNaN.o
-SF_OBJS_SPECIALIZE += s_commonNaNToExtF80UI.o
-SF_OBJS_SPECIALIZE += s_propagateNaNExtF80UI.o
-SF_OBJS_SPECIALIZE += f128M_isSignalingNaN.o
-SF_OBJS_SPECIALIZE += s_f128UIToCommonNaN.o
-SF_OBJS_SPECIALIZE += s_commonNaNToF128UI.o
-SF_OBJS_SPECIALIZE += s_propagateNaNF128UI.o
-
-SF_OBJS_OTHERS :=
-SF_OBJS_OTHERS += s_roundToUI32.o
-SF_OBJS_OTHERS += s_roundToUI64.o
-SF_OBJS_OTHERS += s_roundToI32.o
-SF_OBJS_OTHERS += s_roundToI64.o
-SF_OBJS_OTHERS += s_normSubnormalF16Sig.o
-SF_OBJS_OTHERS += s_roundPackToF16.o
-SF_OBJS_OTHERS += s_normRoundPackToF16.o
-SF_OBJS_OTHERS += s_addMagsF16.o
-SF_OBJS_OTHERS += s_subMagsF16.o
-SF_OBJS_OTHERS += s_mulAddF16.o
-SF_OBJS_OTHERS += s_normSubnormalF32Sig.o
-SF_OBJS_OTHERS += s_roundPackToF32.o
-SF_OBJS_OTHERS += s_normRoundPackToF32.o
-SF_OBJS_OTHERS += s_addMagsF32.o
-SF_OBJS_OTHERS += s_subMagsF32.o
-SF_OBJS_OTHERS += s_mulAddF32.o
-SF_OBJS_OTHERS += s_normSubnormalF64Sig.o
-SF_OBJS_OTHERS += s_roundPackToF64.o
-SF_OBJS_OTHERS += s_normRoundPackToF64.o
-SF_OBJS_OTHERS += s_addMagsF64.o
-SF_OBJS_OTHERS += s_subMagsF64.o
-SF_OBJS_OTHERS += s_mulAddF64.o
-SF_OBJS_OTHERS += s_normSubnormalExtF80Sig.o
-SF_OBJS_OTHERS += s_roundPackToExtF80.o
-SF_OBJS_OTHERS += s_normRoundPackToExtF80.o
-SF_OBJS_OTHERS += s_addMagsExtF80.o
-SF_OBJS_OTHERS += s_subMagsExtF80.o
-SF_OBJS_OTHERS += s_normSubnormalF128Sig.o
-SF_OBJS_OTHERS += s_roundPackToF128.o
-SF_OBJS_OTHERS += s_normRoundPackToF128.o
-SF_OBJS_OTHERS += s_addMagsF128.o
-SF_OBJS_OTHERS += s_subMagsF128.o
-SF_OBJS_OTHERS += s_mulAddF128.o
-SF_OBJS_OTHERS += softfloat_state.o
-SF_OBJS_OTHERS += ui32_to_f16.o
-SF_OBJS_OTHERS += ui32_to_f32.o
-SF_OBJS_OTHERS += ui32_to_f64.o
-SF_OBJS_OTHERS += ui32_to_extF80.o
-SF_OBJS_OTHERS += ui32_to_extF80M.o
-SF_OBJS_OTHERS += ui32_to_f128.o
-SF_OBJS_OTHERS += ui32_to_f128M.o
-SF_OBJS_OTHERS += ui64_to_f16.o
-SF_OBJS_OTHERS += ui64_to_f32.o
-SF_OBJS_OTHERS += ui64_to_f64.o
-SF_OBJS_OTHERS += ui64_to_extF80.o
-SF_OBJS_OTHERS += ui64_to_extF80M.o
-SF_OBJS_OTHERS += ui64_to_f128.o
-SF_OBJS_OTHERS += ui64_to_f128M.o
-SF_OBJS_OTHERS += i32_to_f16.o
-SF_OBJS_OTHERS += i32_to_f32.o
-SF_OBJS_OTHERS += i32_to_f64.o
-SF_OBJS_OTHERS += i32_to_extF80.o
-SF_OBJS_OTHERS += i32_to_extF80M.o
-SF_OBJS_OTHERS += i32_to_f128.o
-SF_OBJS_OTHERS += i32_to_f128M.o
-SF_OBJS_OTHERS += i64_to_f16.o
-SF_OBJS_OTHERS += i64_to_f32.o
-SF_OBJS_OTHERS += i64_to_f64.o
-SF_OBJS_OTHERS += i64_to_extF80.o
-SF_OBJS_OTHERS += i64_to_extF80M.o
-SF_OBJS_OTHERS += i64_to_f128.o
-SF_OBJS_OTHERS += i64_to_f128M.o
-SF_OBJS_OTHERS += f16_to_ui32.o
-SF_OBJS_OTHERS += f16_to_ui64.o
-SF_OBJS_OTHERS += f16_to_i32.o
-SF_OBJS_OTHERS += f16_to_i64.o
-SF_OBJS_OTHERS += f16_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += f16_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += f16_to_i32_r_minMag.o
-SF_OBJS_OTHERS += f16_to_i64_r_minMag.o
-SF_OBJS_OTHERS += f16_to_f32.o
-SF_OBJS_OTHERS += f16_to_f64.o
-SF_OBJS_OTHERS += f16_to_extF80.o
-SF_OBJS_OTHERS += f16_to_extF80M.o
-SF_OBJS_OTHERS += f16_to_f128.o
-SF_OBJS_OTHERS += f16_to_f128M.o
-SF_OBJS_OTHERS += f16_roundToInt.o
-SF_OBJS_OTHERS += f16_add.o
-SF_OBJS_OTHERS += f16_sub.o
-SF_OBJS_OTHERS += f16_mul.o
-SF_OBJS_OTHERS += f16_mulAdd.o
-SF_OBJS_OTHERS += f16_div.o
-SF_OBJS_OTHERS += f16_rem.o
-SF_OBJS_OTHERS += f16_sqrt.o
-SF_OBJS_OTHERS += f16_eq.o
-SF_OBJS_OTHERS += f16_le.o
-SF_OBJS_OTHERS += f16_lt.o
-SF_OBJS_OTHERS += f16_eq_signaling.o
-SF_OBJS_OTHERS += f16_le_quiet.o
-SF_OBJS_OTHERS += f16_lt_quiet.o
-SF_OBJS_OTHERS += f16_isSignalingNaN.o
-SF_OBJS_OTHERS += f32_to_ui32.o
-SF_OBJS_OTHERS += f32_to_ui64.o
-SF_OBJS_OTHERS += f32_to_i32.o
-SF_OBJS_OTHERS += f32_to_i64.o
-SF_OBJS_OTHERS += f32_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += f32_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += f32_to_i32_r_minMag.o
-SF_OBJS_OTHERS += f32_to_i64_r_minMag.o
-SF_OBJS_OTHERS += f32_to_f16.o
-SF_OBJS_OTHERS += f32_to_f64.o
-SF_OBJS_OTHERS += f32_to_extF80.o
-SF_OBJS_OTHERS += f32_to_extF80M.o
-SF_OBJS_OTHERS += f32_to_f128.o
-SF_OBJS_OTHERS += f32_to_f128M.o
-SF_OBJS_OTHERS += f32_roundToInt.o
-SF_OBJS_OTHERS += f32_add.o
-SF_OBJS_OTHERS += f32_sub.o
-SF_OBJS_OTHERS += f32_mul.o
-SF_OBJS_OTHERS += f32_mulAdd.o
-SF_OBJS_OTHERS += f32_div.o
-SF_OBJS_OTHERS += f32_rem.o
-SF_OBJS_OTHERS += f32_sqrt.o
-SF_OBJS_OTHERS += f32_eq.o
-SF_OBJS_OTHERS += f32_le.o
-SF_OBJS_OTHERS += f32_lt.o
-SF_OBJS_OTHERS += f32_eq_signaling.o
-SF_OBJS_OTHERS += f32_le_quiet.o
-SF_OBJS_OTHERS += f32_lt_quiet.o
-SF_OBJS_OTHERS += f32_isSignalingNaN.o
-SF_OBJS_OTHERS += f64_to_ui32.o
-SF_OBJS_OTHERS += f64_to_ui64.o
-SF_OBJS_OTHERS += f64_to_i32.o
-SF_OBJS_OTHERS += f64_to_i64.o
-SF_OBJS_OTHERS += f64_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += f64_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += f64_to_i32_r_minMag.o
-SF_OBJS_OTHERS += f64_to_i64_r_minMag.o
-SF_OBJS_OTHERS += f64_to_f16.o
-SF_OBJS_OTHERS += f64_to_f32.o
-SF_OBJS_OTHERS += f64_to_extF80.o
-SF_OBJS_OTHERS += f64_to_extF80M.o
-SF_OBJS_OTHERS += f64_to_f128.o
-SF_OBJS_OTHERS += f64_to_f128M.o
-SF_OBJS_OTHERS += f64_roundToInt.o
-SF_OBJS_OTHERS += f64_add.o
-SF_OBJS_OTHERS += f64_sub.o
-SF_OBJS_OTHERS += f64_mul.o
-SF_OBJS_OTHERS += f64_mulAdd.o
-SF_OBJS_OTHERS += f64_div.o
-SF_OBJS_OTHERS += f64_rem.o
-SF_OBJS_OTHERS += f64_sqrt.o
-SF_OBJS_OTHERS += f64_eq.o
-SF_OBJS_OTHERS += f64_le.o
-SF_OBJS_OTHERS += f64_lt.o
-SF_OBJS_OTHERS += f64_eq_signaling.o
-SF_OBJS_OTHERS += f64_le_quiet.o
-SF_OBJS_OTHERS += f64_lt_quiet.o
-SF_OBJS_OTHERS += f64_isSignalingNaN.o
-SF_OBJS_OTHERS += extF80_to_ui32.o
-SF_OBJS_OTHERS += extF80_to_ui64.o
-SF_OBJS_OTHERS += extF80_to_i32.o
-SF_OBJS_OTHERS += extF80_to_i64.o
-SF_OBJS_OTHERS += extF80_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += extF80_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += extF80_to_i32_r_minMag.o
-SF_OBJS_OTHERS += extF80_to_i64_r_minMag.o
-SF_OBJS_OTHERS += extF80_to_f16.o
-SF_OBJS_OTHERS += extF80_to_f32.o
-SF_OBJS_OTHERS += extF80_to_f64.o
-SF_OBJS_OTHERS += extF80_to_f128.o
-SF_OBJS_OTHERS += extF80_roundToInt.o
-SF_OBJS_OTHERS += extF80_add.o
-SF_OBJS_OTHERS += extF80_sub.o
-SF_OBJS_OTHERS += extF80_mul.o
-SF_OBJS_OTHERS += extF80_div.o
-SF_OBJS_OTHERS += extF80_rem.o
-SF_OBJS_OTHERS += extF80_sqrt.o
-SF_OBJS_OTHERS += extF80_eq.o
-SF_OBJS_OTHERS += extF80_le.o
-SF_OBJS_OTHERS += extF80_lt.o
-SF_OBJS_OTHERS += extF80_eq_signaling.o
-SF_OBJS_OTHERS += extF80_le_quiet.o
-SF_OBJS_OTHERS += extF80_lt_quiet.o
-SF_OBJS_OTHERS += extF80_isSignalingNaN.o
-SF_OBJS_OTHERS += extF80M_to_ui32.o
-SF_OBJS_OTHERS += extF80M_to_ui64.o
-SF_OBJS_OTHERS += extF80M_to_i32.o
-SF_OBJS_OTHERS += extF80M_to_i64.o
-SF_OBJS_OTHERS += extF80M_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += extF80M_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += extF80M_to_i32_r_minMag.o
-SF_OBJS_OTHERS += extF80M_to_i64_r_minMag.o
-SF_OBJS_OTHERS += extF80M_to_f16.o
-SF_OBJS_OTHERS += extF80M_to_f32.o
-SF_OBJS_OTHERS += extF80M_to_f64.o
-SF_OBJS_OTHERS += extF80M_to_f128M.o
-SF_OBJS_OTHERS += extF80M_roundToInt.o
-SF_OBJS_OTHERS += extF80M_add.o
-SF_OBJS_OTHERS += extF80M_sub.o
-SF_OBJS_OTHERS += extF80M_mul.o
-SF_OBJS_OTHERS += extF80M_div.o
-SF_OBJS_OTHERS += extF80M_rem.o
-SF_OBJS_OTHERS += extF80M_sqrt.o
-SF_OBJS_OTHERS += extF80M_eq.o
-SF_OBJS_OTHERS += extF80M_le.o
-SF_OBJS_OTHERS += extF80M_lt.o
-SF_OBJS_OTHERS += extF80M_eq_signaling.o
-SF_OBJS_OTHERS += extF80M_le_quiet.o
-SF_OBJS_OTHERS += extF80M_lt_quiet.o
-SF_OBJS_OTHERS += f128_to_ui32.o
-SF_OBJS_OTHERS += f128_to_ui64.o
-SF_OBJS_OTHERS += f128_to_i32.o
-SF_OBJS_OTHERS += f128_to_i64.o
-SF_OBJS_OTHERS += f128_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += f128_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += f128_to_i32_r_minMag.o
-SF_OBJS_OTHERS += f128_to_i64_r_minMag.o
-SF_OBJS_OTHERS += f128_to_f16.o
-SF_OBJS_OTHERS += f128_to_f32.o
-SF_OBJS_OTHERS += f128_to_extF80.o
-SF_OBJS_OTHERS += f128_to_f64.o
-SF_OBJS_OTHERS += f128_roundToInt.o
-SF_OBJS_OTHERS += f128_add.o
-SF_OBJS_OTHERS += f128_sub.o
-SF_OBJS_OTHERS += f128_mul.o
-SF_OBJS_OTHERS += f128_mulAdd.o
-SF_OBJS_OTHERS += f128_div.o
-SF_OBJS_OTHERS += f128_rem.o
-SF_OBJS_OTHERS += f128_sqrt.o
-SF_OBJS_OTHERS += f128_eq.o
-SF_OBJS_OTHERS += f128_le.o
-SF_OBJS_OTHERS += f128_lt.o
-SF_OBJS_OTHERS += f128_eq_signaling.o
-SF_OBJS_OTHERS += f128_le_quiet.o
-SF_OBJS_OTHERS += f128_lt_quiet.o
-SF_OBJS_OTHERS += f128_isSignalingNaN.o
-SF_OBJS_OTHERS += f128M_to_ui32.o
-SF_OBJS_OTHERS += f128M_to_ui64.o
-SF_OBJS_OTHERS += f128M_to_i32.o
-SF_OBJS_OTHERS += f128M_to_i64.o
-SF_OBJS_OTHERS += f128M_to_ui32_r_minMag.o
-SF_OBJS_OTHERS += f128M_to_ui64_r_minMag.o
-SF_OBJS_OTHERS += f128M_to_i32_r_minMag.o
-SF_OBJS_OTHERS += f128M_to_i64_r_minMag.o
-SF_OBJS_OTHERS += f128M_to_f16.o
-SF_OBJS_OTHERS += f128M_to_f32.o
-SF_OBJS_OTHERS += f128M_to_extF80M.o
-SF_OBJS_OTHERS += f128M_to_f64.o
-SF_OBJS_OTHERS += f128M_roundToInt.o
-SF_OBJS_OTHERS += f128M_add.o
-SF_OBJS_OTHERS += f128M_sub.o
-SF_OBJS_OTHERS += f128M_mul.o
-SF_OBJS_OTHERS += f128M_mulAdd.o
-SF_OBJS_OTHERS += f128M_div.o
-SF_OBJS_OTHERS += f128M_rem.o
-SF_OBJS_OTHERS += f128M_sqrt.o
-SF_OBJS_OTHERS += f128M_eq.o
-SF_OBJS_OTHERS += f128M_le.o
-SF_OBJS_OTHERS += f128M_lt.o
-SF_OBJS_OTHERS += f128M_eq_signaling.o
-SF_OBJS_OTHERS += f128M_le_quiet.o
-SF_OBJS_OTHERS += f128M_lt_quiet.o
-
-SF_OBJS_ALL_NOSPEC :=
-SF_OBJS_ALL_NOSPEC += $(SF_OBJS_PRIMITIVES)
-SF_OBJS_ALL_NOSPEC += $(SF_OBJS_OTHERS)
-
-SF_OBJS_ALL :=
-SF_OBJS_ALL += $(SF_OBJS_ALL_NOSPEC)
-SF_OBJS_ALL += $(SF_OBJS_SPECIALIZE)
-
-# testfloat objects
-TF_OBJS_GENCASES :=
-TF_OBJS_GENCASES += genCases_ui32.o
-TF_OBJS_GENCASES += genCases_ui64.o
-TF_OBJS_GENCASES += genCases_i32.o
-TF_OBJS_GENCASES += genCases_i64.o
-TF_OBJS_GENCASES += genCases_f16.o
-TF_OBJS_GENCASES += genCases_f32.o
-TF_OBJS_GENCASES += genCases_f64.o
-TF_OBJS_GENCASES += genCases_extF80.o
-TF_OBJS_GENCASES += genCases_f128.o
-
-TF_OBJS_WRITECASE :=
-TF_OBJS_WRITECASE += writeCase_a_ui32.o
-TF_OBJS_WRITECASE += writeCase_a_ui64.o
-TF_OBJS_WRITECASE += writeCase_a_f16.o
-TF_OBJS_WRITECASE += writeCase_ab_f16.o
-TF_OBJS_WRITECASE += writeCase_abc_f16.o
-TF_OBJS_WRITECASE += writeCase_a_f32.o
-TF_OBJS_WRITECASE += writeCase_ab_f32.o
-TF_OBJS_WRITECASE += writeCase_abc_f32.o
-TF_OBJS_WRITECASE += writeCase_a_f64.o
-TF_OBJS_WRITECASE += writeCase_ab_f64.o
-TF_OBJS_WRITECASE += writeCase_abc_f64.o
-TF_OBJS_WRITECASE += writeCase_a_extF80M.o
-TF_OBJS_WRITECASE += writeCase_ab_extF80M.o
-TF_OBJS_WRITECASE += writeCase_a_f128M.o
-TF_OBJS_WRITECASE += writeCase_ab_f128M.o
-TF_OBJS_WRITECASE += writeCase_abc_f128M.o
-TF_OBJS_WRITECASE += writeCase_z_bool.o
-TF_OBJS_WRITECASE += writeCase_z_ui32.o
-TF_OBJS_WRITECASE += writeCase_z_ui64.o
-TF_OBJS_WRITECASE += writeCase_z_f16.o
-TF_OBJS_WRITECASE += writeCase_z_f32.o
-TF_OBJS_WRITECASE += writeCase_z_f64.o
-TF_OBJS_WRITECASE += writeCase_z_extF80M.o
-TF_OBJS_WRITECASE += writeCase_z_f128M.o
-
-TF_OBJS_TEST :=
-TF_OBJS_TEST += test_a_ui32_z_f16.o
-TF_OBJS_TEST += test_a_ui32_z_f32.o
-TF_OBJS_TEST += test_a_ui32_z_f64.o
-TF_OBJS_TEST += test_a_ui32_z_extF80.o
-TF_OBJS_TEST += test_a_ui32_z_f128.o
-TF_OBJS_TEST += test_a_ui64_z_f16.o
-TF_OBJS_TEST += test_a_ui64_z_f32.o
-TF_OBJS_TEST += test_a_ui64_z_f64.o
-TF_OBJS_TEST += test_a_ui64_z_extF80.o
-TF_OBJS_TEST += test_a_ui64_z_f128.o
-TF_OBJS_TEST += test_a_i32_z_f16.o
-TF_OBJS_TEST += test_a_i32_z_f32.o
-TF_OBJS_TEST += test_a_i32_z_f64.o
-TF_OBJS_TEST += test_a_i32_z_extF80.o
-TF_OBJS_TEST += test_a_i32_z_f128.o
-TF_OBJS_TEST += test_a_i64_z_f16.o
-TF_OBJS_TEST += test_a_i64_z_f32.o
-TF_OBJS_TEST += test_a_i64_z_f64.o
-TF_OBJS_TEST += test_a_i64_z_extF80.o
-TF_OBJS_TEST += test_a_i64_z_f128.o
-TF_OBJS_TEST += test_a_f16_z_ui32_rx.o
-TF_OBJS_TEST += test_a_f16_z_ui64_rx.o
-TF_OBJS_TEST += test_a_f16_z_i32_rx.o
-TF_OBJS_TEST += test_a_f16_z_i64_rx.o
-TF_OBJS_TEST += test_a_f16_z_ui32_x.o
-TF_OBJS_TEST += test_a_f16_z_ui64_x.o
-TF_OBJS_TEST += test_a_f16_z_i32_x.o
-TF_OBJS_TEST += test_a_f16_z_i64_x.o
-TF_OBJS_TEST += test_a_f16_z_f32.o
-TF_OBJS_TEST += test_a_f16_z_f64.o
-TF_OBJS_TEST += test_a_f16_z_extF80.o
-TF_OBJS_TEST += test_a_f16_z_f128.o
-TF_OBJS_TEST += test_az_f16.o
-TF_OBJS_TEST += test_az_f16_rx.o
-TF_OBJS_TEST += test_abz_f16.o
-TF_OBJS_TEST += test_abcz_f16.o
-TF_OBJS_TEST += test_ab_f16_z_bool.o
-TF_OBJS_TEST += test_a_f32_z_ui32_rx.o
-TF_OBJS_TEST += test_a_f32_z_ui64_rx.o
-TF_OBJS_TEST += test_a_f32_z_i32_rx.o
-TF_OBJS_TEST += test_a_f32_z_i64_rx.o
-TF_OBJS_TEST += test_a_f32_z_ui32_x.o
-TF_OBJS_TEST += test_a_f32_z_ui64_x.o
-TF_OBJS_TEST += test_a_f32_z_i32_x.o
-TF_OBJS_TEST += test_a_f32_z_i64_x.o
-TF_OBJS_TEST += test_a_f32_z_f16.o
-TF_OBJS_TEST += test_a_f32_z_f64.o
-TF_OBJS_TEST += test_a_f32_z_extF80.o
-TF_OBJS_TEST += test_a_f32_z_f128.o
-TF_OBJS_TEST += test_az_f32.o
-TF_OBJS_TEST += test_az_f32_rx.o
-TF_OBJS_TEST += test_abz_f32.o
-TF_OBJS_TEST += test_abcz_f32.o
-TF_OBJS_TEST += test_ab_f32_z_bool.o
-TF_OBJS_TEST += test_a_f64_z_ui32_rx.o
-TF_OBJS_TEST += test_a_f64_z_ui64_rx.o
-TF_OBJS_TEST += test_a_f64_z_i32_rx.o
-TF_OBJS_TEST += test_a_f64_z_i64_rx.o
-TF_OBJS_TEST += test_a_f64_z_ui32_x.o
-TF_OBJS_TEST += test_a_f64_z_ui64_x.o
-TF_OBJS_TEST += test_a_f64_z_i32_x.o
-TF_OBJS_TEST += test_a_f64_z_i64_x.o
-TF_OBJS_TEST += test_a_f64_z_f16.o
-TF_OBJS_TEST += test_a_f64_z_f32.o
-TF_OBJS_TEST += test_a_f64_z_extF80.o
-TF_OBJS_TEST += test_a_f64_z_f128.o
-TF_OBJS_TEST += test_az_f64.o
-TF_OBJS_TEST += test_az_f64_rx.o
-TF_OBJS_TEST += test_abz_f64.o
-TF_OBJS_TEST += test_abcz_f64.o
-TF_OBJS_TEST += test_ab_f64_z_bool.o
-TF_OBJS_TEST += test_a_extF80_z_ui32_rx.o
-TF_OBJS_TEST += test_a_extF80_z_ui64_rx.o
-TF_OBJS_TEST += test_a_extF80_z_i32_rx.o
-TF_OBJS_TEST += test_a_extF80_z_i64_rx.o
-TF_OBJS_TEST += test_a_extF80_z_ui32_x.o
-TF_OBJS_TEST += test_a_extF80_z_ui64_x.o
-TF_OBJS_TEST += test_a_extF80_z_i32_x.o
-TF_OBJS_TEST += test_a_extF80_z_i64_x.o
-TF_OBJS_TEST += test_a_extF80_z_f16.o
-TF_OBJS_TEST += test_a_extF80_z_f32.o
-TF_OBJS_TEST += test_a_extF80_z_f64.o
-TF_OBJS_TEST += test_a_extF80_z_f128.o
-TF_OBJS_TEST += test_az_extF80.o
-TF_OBJS_TEST += test_az_extF80_rx.o
-TF_OBJS_TEST += test_abz_extF80.o
-TF_OBJS_TEST += test_ab_extF80_z_bool.o
-TF_OBJS_TEST += test_a_f128_z_ui32_rx.o
-TF_OBJS_TEST += test_a_f128_z_ui64_rx.o
-TF_OBJS_TEST += test_a_f128_z_i32_rx.o
-TF_OBJS_TEST += test_a_f128_z_i64_rx.o
-TF_OBJS_TEST += test_a_f128_z_ui32_x.o
-TF_OBJS_TEST += test_a_f128_z_ui64_x.o
-TF_OBJS_TEST += test_a_f128_z_i32_x.o
-TF_OBJS_TEST += test_a_f128_z_i64_x.o
-TF_OBJS_TEST += test_a_f128_z_f16.o
-TF_OBJS_TEST += test_a_f128_z_f32.o
-TF_OBJS_TEST += test_a_f128_z_f64.o
-TF_OBJS_TEST += test_a_f128_z_extF80.o
-TF_OBJS_TEST += test_az_f128.o
-TF_OBJS_TEST += test_az_f128_rx.o
-TF_OBJS_TEST += test_abz_f128.o
-TF_OBJS_TEST += test_abcz_f128.o
-TF_OBJS_TEST += test_ab_f128_z_bool.o
-
-TF_OBJS_LIB :=
-TF_OBJS_LIB += uint128_inline.o
-TF_OBJS_LIB += uint128.o
-TF_OBJS_LIB += fail.o
-TF_OBJS_LIB += functions_common.o
-TF_OBJS_LIB += functionInfos.o
-TF_OBJS_LIB += standardFunctionInfos.o
-TF_OBJS_LIB += random.o
-TF_OBJS_LIB += genCases_common.o
-TF_OBJS_LIB += $(TF_OBJS_GENCASES)
-TF_OBJS_LIB += genCases_writeTestsTotal.o
-TF_OBJS_LIB += verCases_inline.o
-TF_OBJS_LIB += verCases_common.o
-TF_OBJS_LIB += verCases_writeFunctionName.o
-TF_OBJS_LIB += readHex.o
-TF_OBJS_LIB += writeHex.o
-TF_OBJS_LIB += $(TF_OBJS_WRITECASE)
-TF_OBJS_LIB += testLoops_common.o
-TF_OBJS_LIB += $(TF_OBJS_TEST)
-
-BINARIES := fp-test$(EXESUF) fp-bench$(EXESUF)
-
-# We require artefacts from the main build including config-host.h
-# because platform.h includes it. Rather than re-invoking the main
-# build we just error out if things aren't there.
-$(LIBQEMUUTIL) $(BUILD_DIR)/config-host.h:
- $(error $@ missing, re-run parent build)
-
-all: $(BUILD_DIR)/config-host.h $(BINARIES)
-
-# libtestfloat.a depends on libsoftfloat.a, so specify it first
-FP_TEST_LIBS := libtestfloat.a libsoftfloat.a $(LIBQEMUUTIL)
-
-fp-test$(EXESUF): fp-test.o slowfloat.o $(QEMU_SOFTFLOAT_OBJ) $(FP_TEST_LIBS)
-
-# Custom rule to build with SF_CFLAGS
-SF_BUILD = $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
- $(QEMU_CFLAGS) $(SF_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \
- $($@-cflags) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-$(SF_OBJS_ALL_NOSPEC): %.o: $(SF_SOURCE_DIR)/%.c
- $(SF_BUILD)
-$(SF_OBJS_SPECIALIZE): %.o: $(SF_SPECIALIZE_DIR)/%.c
- $(SF_BUILD)
-
-libsoftfloat.a: $(SF_OBJS_ALL)
-
-# Custom rule to build with TF_CFLAGS
-$(TF_OBJS_LIB) slowfloat.o: %.o: $(TF_SOURCE_DIR)/%.c
- $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
- $(QEMU_CFLAGS) $(TF_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \
- $($@-cflags) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
-
-libtestfloat.a: $(TF_OBJS_LIB)
-
-fp-bench$(EXESUF): fp-bench.o $(QEMU_SOFTFLOAT_OBJ) $(LIBQEMUUTIL)
-
-clean:
- rm -f *.o *.d $(BINARIES)
- rm -f *.gcno *.gcda *.gcov
- rm -f fp-test$(EXESUF)
- rm -f fp-bench$(EXESUF)
- rm -f libsoftfloat.a
- rm -f libtestfloat.a
-
--include $(wildcard *.d)
diff --git a/tests/fp/meson.build b/tests/fp/meson.build
new file mode 100644
index 0000000..eed9780
--- /dev/null
+++ b/tests/fp/meson.build
@@ -0,0 +1,628 @@
+fpcflags = [
+ # softfloat defines
+ '-DSOFTFLOAT_ROUND_ODD',
+ '-DINLINE_LEVEL=5',
+ '-DSOFTFLOAT_FAST_DIV32TO16',
+ '-DSOFTFLOAT_FAST_DIV64TO32',
+ '-DSOFTFLOAT_FAST_INT64',
+ # testfloat defines
+ '-DFLOAT16',
+ '-DFLOAT64',
+ '-DEXTFLOAT80',
+ '-DFLOAT128',
+ '-DFLOAT_ROUND_ODD',
+ '-DLONG_DOUBLE_IS_EXTFLOAT80',
+]
+
+sfdir = 'berkeley-softfloat-3/source'
+sfspedir = sfdir / '8086-SSE'
+tfdir = 'berkeley-testfloat-3/source'
+
+sfinc = include_directories(sfdir / 'include', sfspedir)
+
+tfcflags = [
+ '-Wno-strict-prototypes',
+ '-Wno-unknown-pragmas',
+ '-Wno-uninitialized',
+ '-Wno-missing-prototypes',
+ '-Wno-return-type',
+ '-Wno-unused-function',
+ '-Wno-error',
+]
+
+tfgencases = [
+ tfdir / 'genCases_ui32.c',
+ tfdir / 'genCases_ui64.c',
+ tfdir / 'genCases_i32.c',
+ tfdir / 'genCases_i64.c',
+ tfdir / 'genCases_f16.c',
+ tfdir / 'genCases_f32.c',
+ tfdir / 'genCases_f64.c',
+ tfdir / 'genCases_extF80.c',
+ tfdir / 'genCases_f128.c',
+]
+
+tfwritecase = [
+ tfdir / 'writeCase_a_ui32.c',
+ tfdir / 'writeCase_a_ui64.c',
+ tfdir / 'writeCase_a_f16.c',
+ tfdir / 'writeCase_ab_f16.c',
+ tfdir / 'writeCase_abc_f16.c',
+ tfdir / 'writeCase_a_f32.c',
+ tfdir / 'writeCase_ab_f32.c',
+ tfdir / 'writeCase_abc_f32.c',
+ tfdir / 'writeCase_a_f64.c',
+ tfdir / 'writeCase_ab_f64.c',
+ tfdir / 'writeCase_abc_f64.c',
+ tfdir / 'writeCase_a_extF80M.c',
+ tfdir / 'writeCase_ab_extF80M.c',
+ tfdir / 'writeCase_a_f128M.c',
+ tfdir / 'writeCase_ab_f128M.c',
+ tfdir / 'writeCase_abc_f128M.c',
+ tfdir / 'writeCase_z_bool.c',
+ tfdir / 'writeCase_z_ui32.c',
+ tfdir / 'writeCase_z_ui64.c',
+ tfdir / 'writeCase_z_f16.c',
+ tfdir / 'writeCase_z_f32.c',
+ tfdir / 'writeCase_z_f64.c',
+ tfdir / 'writeCase_z_extF80M.c',
+ tfdir / 'writeCase_z_f128M.c',
+]
+
+tftest = [
+ tfdir / 'test_a_ui32_z_f16.c',
+ tfdir / 'test_a_ui32_z_f32.c',
+ tfdir / 'test_a_ui32_z_f64.c',
+ tfdir / 'test_a_ui32_z_extF80.c',
+ tfdir / 'test_a_ui32_z_f128.c',
+ tfdir / 'test_a_ui64_z_f16.c',
+ tfdir / 'test_a_ui64_z_f32.c',
+ tfdir / 'test_a_ui64_z_f64.c',
+ tfdir / 'test_a_ui64_z_extF80.c',
+ tfdir / 'test_a_ui64_z_f128.c',
+ tfdir / 'test_a_i32_z_f16.c',
+ tfdir / 'test_a_i32_z_f32.c',
+ tfdir / 'test_a_i32_z_f64.c',
+ tfdir / 'test_a_i32_z_extF80.c',
+ tfdir / 'test_a_i32_z_f128.c',
+ tfdir / 'test_a_i64_z_f16.c',
+ tfdir / 'test_a_i64_z_f32.c',
+ tfdir / 'test_a_i64_z_f64.c',
+ tfdir / 'test_a_i64_z_extF80.c',
+ tfdir / 'test_a_i64_z_f128.c',
+ tfdir / 'test_a_f16_z_ui32_rx.c',
+ tfdir / 'test_a_f16_z_ui64_rx.c',
+ tfdir / 'test_a_f16_z_i32_rx.c',
+ tfdir / 'test_a_f16_z_i64_rx.c',
+ tfdir / 'test_a_f16_z_ui32_x.c',
+ tfdir / 'test_a_f16_z_ui64_x.c',
+ tfdir / 'test_a_f16_z_i32_x.c',
+ tfdir / 'test_a_f16_z_i64_x.c',
+ tfdir / 'test_a_f16_z_f32.c',
+ tfdir / 'test_a_f16_z_f64.c',
+ tfdir / 'test_a_f16_z_extF80.c',
+ tfdir / 'test_a_f16_z_f128.c',
+ tfdir / 'test_az_f16.c',
+ tfdir / 'test_az_f16_rx.c',
+ tfdir / 'test_abz_f16.c',
+ tfdir / 'test_abcz_f16.c',
+ tfdir / 'test_ab_f16_z_bool.c',
+ tfdir / 'test_a_f32_z_ui32_rx.c',
+ tfdir / 'test_a_f32_z_ui64_rx.c',
+ tfdir / 'test_a_f32_z_i32_rx.c',
+ tfdir / 'test_a_f32_z_i64_rx.c',
+ tfdir / 'test_a_f32_z_ui32_x.c',
+ tfdir / 'test_a_f32_z_ui64_x.c',
+ tfdir / 'test_a_f32_z_i32_x.c',
+ tfdir / 'test_a_f32_z_i64_x.c',
+ tfdir / 'test_a_f32_z_f16.c',
+ tfdir / 'test_a_f32_z_f64.c',
+ tfdir / 'test_a_f32_z_extF80.c',
+ tfdir / 'test_a_f32_z_f128.c',
+ tfdir / 'test_az_f32.c',
+ tfdir / 'test_az_f32_rx.c',
+ tfdir / 'test_abz_f32.c',
+ tfdir / 'test_abcz_f32.c',
+ tfdir / 'test_ab_f32_z_bool.c',
+ tfdir / 'test_a_f64_z_ui32_rx.c',
+ tfdir / 'test_a_f64_z_ui64_rx.c',
+ tfdir / 'test_a_f64_z_i32_rx.c',
+ tfdir / 'test_a_f64_z_i64_rx.c',
+ tfdir / 'test_a_f64_z_ui32_x.c',
+ tfdir / 'test_a_f64_z_ui64_x.c',
+ tfdir / 'test_a_f64_z_i32_x.c',
+ tfdir / 'test_a_f64_z_i64_x.c',
+ tfdir / 'test_a_f64_z_f16.c',
+ tfdir / 'test_a_f64_z_f32.c',
+ tfdir / 'test_a_f64_z_extF80.c',
+ tfdir / 'test_a_f64_z_f128.c',
+ tfdir / 'test_az_f64.c',
+ tfdir / 'test_az_f64_rx.c',
+ tfdir / 'test_abz_f64.c',
+ tfdir / 'test_abcz_f64.c',
+ tfdir / 'test_ab_f64_z_bool.c',
+ tfdir / 'test_a_extF80_z_ui32_rx.c',
+ tfdir / 'test_a_extF80_z_ui64_rx.c',
+ tfdir / 'test_a_extF80_z_i32_rx.c',
+ tfdir / 'test_a_extF80_z_i64_rx.c',
+ tfdir / 'test_a_extF80_z_ui32_x.c',
+ tfdir / 'test_a_extF80_z_ui64_x.c',
+ tfdir / 'test_a_extF80_z_i32_x.c',
+ tfdir / 'test_a_extF80_z_i64_x.c',
+ tfdir / 'test_a_extF80_z_f16.c',
+ tfdir / 'test_a_extF80_z_f32.c',
+ tfdir / 'test_a_extF80_z_f64.c',
+ tfdir / 'test_a_extF80_z_f128.c',
+ tfdir / 'test_az_extF80.c',
+ tfdir / 'test_az_extF80_rx.c',
+ tfdir / 'test_abz_extF80.c',
+ tfdir / 'test_ab_extF80_z_bool.c',
+ tfdir / 'test_a_f128_z_ui32_rx.c',
+ tfdir / 'test_a_f128_z_ui64_rx.c',
+ tfdir / 'test_a_f128_z_i32_rx.c',
+ tfdir / 'test_a_f128_z_i64_rx.c',
+ tfdir / 'test_a_f128_z_ui32_x.c',
+ tfdir / 'test_a_f128_z_ui64_x.c',
+ tfdir / 'test_a_f128_z_i32_x.c',
+ tfdir / 'test_a_f128_z_i64_x.c',
+ tfdir / 'test_a_f128_z_f16.c',
+ tfdir / 'test_a_f128_z_f32.c',
+ tfdir / 'test_a_f128_z_f64.c',
+ tfdir / 'test_a_f128_z_extF80.c',
+ tfdir / 'test_az_f128.c',
+ tfdir / 'test_az_f128_rx.c',
+ tfdir / 'test_abz_f128.c',
+ tfdir / 'test_abcz_f128.c',
+ tfdir / 'test_ab_f128_z_bool.c',
+]
+
+libtestfloat = static_library(
+ 'testfloat',
+ files(
+ tfdir / 'uint128_inline.c',
+ tfdir / 'uint128.c',
+ tfdir / 'fail.c',
+ tfdir / 'functions_common.c',
+ tfdir / 'functionInfos.c',
+ tfdir / 'standardFunctionInfos.c',
+ tfdir / 'random.c',
+ tfdir / 'genCases_common.c',
+ tfgencases,
+ tfdir / 'genCases_writeTestsTotal.c',
+ tfdir / 'verCases_inline.c',
+ tfdir / 'verCases_common.c',
+ tfdir / 'verCases_writeFunctionName.c',
+ tfdir / 'readHex.c',
+ tfdir / 'writeHex.c',
+ tfwritecase,
+ tfdir / 'testLoops_common.c',
+ tftest,
+ ),
+ include_directories: sfinc,
+ c_args: tfcflags + fpcflags,
+)
+
+sfcflags = [
+ '-Wno-missing-prototypes',
+ '-Wno-redundant-decls',
+ '-Wno-return-type',
+ '-Wno-error',
+]
+
+libsoftfloat = static_library(
+ 'softfloat',
+ files(
+ # primitives
+ sfdir / 's_eq128.c',
+ sfdir / 's_le128.c',
+ sfdir / 's_lt128.c',
+ sfdir / 's_shortShiftLeft128.c',
+ sfdir / 's_shortShiftRight128.c',
+ sfdir / 's_shortShiftRightJam64.c',
+ sfdir / 's_shortShiftRightJam64Extra.c',
+ sfdir / 's_shortShiftRightJam128.c',
+ sfdir / 's_shortShiftRightJam128Extra.c',
+ sfdir / 's_shiftRightJam32.c',
+ sfdir / 's_shiftRightJam64.c',
+ sfdir / 's_shiftRightJam64Extra.c',
+ sfdir / 's_shiftRightJam128.c',
+ sfdir / 's_shiftRightJam128Extra.c',
+ sfdir / 's_shiftRightJam256M.c',
+ sfdir / 's_countLeadingZeros8.c',
+ sfdir / 's_countLeadingZeros16.c',
+ sfdir / 's_countLeadingZeros32.c',
+ sfdir / 's_countLeadingZeros64.c',
+ sfdir / 's_add128.c',
+ sfdir / 's_add256M.c',
+ sfdir / 's_sub128.c',
+ sfdir / 's_sub256M.c',
+ sfdir / 's_mul64ByShifted32To128.c',
+ sfdir / 's_mul64To128.c',
+ sfdir / 's_mul128By32.c',
+ sfdir / 's_mul128To256M.c',
+ sfdir / 's_approxRecip_1Ks.c',
+ sfdir / 's_approxRecip32_1.c',
+ sfdir / 's_approxRecipSqrt_1Ks.c',
+ sfdir / 's_approxRecipSqrt32_1.c',
+ # others
+ sfdir / 's_roundToUI32.c',
+ sfdir / 's_roundToUI64.c',
+ sfdir / 's_roundToI32.c',
+ sfdir / 's_roundToI64.c',
+ sfdir / 's_normSubnormalF16Sig.c',
+ sfdir / 's_roundPackToF16.c',
+ sfdir / 's_normRoundPackToF16.c',
+ sfdir / 's_addMagsF16.c',
+ sfdir / 's_subMagsF16.c',
+ sfdir / 's_mulAddF16.c',
+ sfdir / 's_normSubnormalF32Sig.c',
+ sfdir / 's_roundPackToF32.c',
+ sfdir / 's_normRoundPackToF32.c',
+ sfdir / 's_addMagsF32.c',
+ sfdir / 's_subMagsF32.c',
+ sfdir / 's_mulAddF32.c',
+ sfdir / 's_normSubnormalF64Sig.c',
+ sfdir / 's_roundPackToF64.c',
+ sfdir / 's_normRoundPackToF64.c',
+ sfdir / 's_addMagsF64.c',
+ sfdir / 's_subMagsF64.c',
+ sfdir / 's_mulAddF64.c',
+ sfdir / 's_normSubnormalExtF80Sig.c',
+ sfdir / 's_roundPackToExtF80.c',
+ sfdir / 's_normRoundPackToExtF80.c',
+ sfdir / 's_addMagsExtF80.c',
+ sfdir / 's_subMagsExtF80.c',
+ sfdir / 's_normSubnormalF128Sig.c',
+ sfdir / 's_roundPackToF128.c',
+ sfdir / 's_normRoundPackToF128.c',
+ sfdir / 's_addMagsF128.c',
+ sfdir / 's_subMagsF128.c',
+ sfdir / 's_mulAddF128.c',
+ sfdir / 'softfloat_state.c',
+ sfdir / 'ui32_to_f16.c',
+ sfdir / 'ui32_to_f32.c',
+ sfdir / 'ui32_to_f64.c',
+ sfdir / 'ui32_to_extF80.c',
+ sfdir / 'ui32_to_extF80M.c',
+ sfdir / 'ui32_to_f128.c',
+ sfdir / 'ui32_to_f128M.c',
+ sfdir / 'ui64_to_f16.c',
+ sfdir / 'ui64_to_f32.c',
+ sfdir / 'ui64_to_f64.c',
+ sfdir / 'ui64_to_extF80.c',
+ sfdir / 'ui64_to_extF80M.c',
+ sfdir / 'ui64_to_f128.c',
+ sfdir / 'ui64_to_f128M.c',
+ sfdir / 'i32_to_f16.c',
+ sfdir / 'i32_to_f32.c',
+ sfdir / 'i32_to_f64.c',
+ sfdir / 'i32_to_extF80.c',
+ sfdir / 'i32_to_extF80M.c',
+ sfdir / 'i32_to_f128.c',
+ sfdir / 'i32_to_f128M.c',
+ sfdir / 'i64_to_f16.c',
+ sfdir / 'i64_to_f32.c',
+ sfdir / 'i64_to_f64.c',
+ sfdir / 'i64_to_extF80.c',
+ sfdir / 'i64_to_extF80M.c',
+ sfdir / 'i64_to_f128.c',
+ sfdir / 'i64_to_f128M.c',
+ sfdir / 'f16_to_ui32.c',
+ sfdir / 'f16_to_ui64.c',
+ sfdir / 'f16_to_i32.c',
+ sfdir / 'f16_to_i64.c',
+ sfdir / 'f16_to_ui32_r_minMag.c',
+ sfdir / 'f16_to_ui64_r_minMag.c',
+ sfdir / 'f16_to_i32_r_minMag.c',
+ sfdir / 'f16_to_i64_r_minMag.c',
+ sfdir / 'f16_to_f32.c',
+ sfdir / 'f16_to_f64.c',
+ sfdir / 'f16_to_extF80.c',
+ sfdir / 'f16_to_extF80M.c',
+ sfdir / 'f16_to_f128.c',
+ sfdir / 'f16_to_f128M.c',
+ sfdir / 'f16_roundToInt.c',
+ sfdir / 'f16_add.c',
+ sfdir / 'f16_sub.c',
+ sfdir / 'f16_mul.c',
+ sfdir / 'f16_mulAdd.c',
+ sfdir / 'f16_div.c',
+ sfdir / 'f16_rem.c',
+ sfdir / 'f16_sqrt.c',
+ sfdir / 'f16_eq.c',
+ sfdir / 'f16_le.c',
+ sfdir / 'f16_lt.c',
+ sfdir / 'f16_eq_signaling.c',
+ sfdir / 'f16_le_quiet.c',
+ sfdir / 'f16_lt_quiet.c',
+ sfdir / 'f16_isSignalingNaN.c',
+ sfdir / 'f32_to_ui32.c',
+ sfdir / 'f32_to_ui64.c',
+ sfdir / 'f32_to_i32.c',
+ sfdir / 'f32_to_i64.c',
+ sfdir / 'f32_to_ui32_r_minMag.c',
+ sfdir / 'f32_to_ui64_r_minMag.c',
+ sfdir / 'f32_to_i32_r_minMag.c',
+ sfdir / 'f32_to_i64_r_minMag.c',
+ sfdir / 'f32_to_f16.c',
+ sfdir / 'f32_to_f64.c',
+ sfdir / 'f32_to_extF80.c',
+ sfdir / 'f32_to_extF80M.c',
+ sfdir / 'f32_to_f128.c',
+ sfdir / 'f32_to_f128M.c',
+ sfdir / 'f32_roundToInt.c',
+ sfdir / 'f32_add.c',
+ sfdir / 'f32_sub.c',
+ sfdir / 'f32_mul.c',
+ sfdir / 'f32_mulAdd.c',
+ sfdir / 'f32_div.c',
+ sfdir / 'f32_rem.c',
+ sfdir / 'f32_sqrt.c',
+ sfdir / 'f32_eq.c',
+ sfdir / 'f32_le.c',
+ sfdir / 'f32_lt.c',
+ sfdir / 'f32_eq_signaling.c',
+ sfdir / 'f32_le_quiet.c',
+ sfdir / 'f32_lt_quiet.c',
+ sfdir / 'f32_isSignalingNaN.c',
+ sfdir / 'f64_to_ui32.c',
+ sfdir / 'f64_to_ui64.c',
+ sfdir / 'f64_to_i32.c',
+ sfdir / 'f64_to_i64.c',
+ sfdir / 'f64_to_ui32_r_minMag.c',
+ sfdir / 'f64_to_ui64_r_minMag.c',
+ sfdir / 'f64_to_i32_r_minMag.c',
+ sfdir / 'f64_to_i64_r_minMag.c',
+ sfdir / 'f64_to_f16.c',
+ sfdir / 'f64_to_f32.c',
+ sfdir / 'f64_to_extF80.c',
+ sfdir / 'f64_to_extF80M.c',
+ sfdir / 'f64_to_f128.c',
+ sfdir / 'f64_to_f128M.c',
+ sfdir / 'f64_roundToInt.c',
+ sfdir / 'f64_add.c',
+ sfdir / 'f64_sub.c',
+ sfdir / 'f64_mul.c',
+ sfdir / 'f64_mulAdd.c',
+ sfdir / 'f64_div.c',
+ sfdir / 'f64_rem.c',
+ sfdir / 'f64_sqrt.c',
+ sfdir / 'f64_eq.c',
+ sfdir / 'f64_le.c',
+ sfdir / 'f64_lt.c',
+ sfdir / 'f64_eq_signaling.c',
+ sfdir / 'f64_le_quiet.c',
+ sfdir / 'f64_lt_quiet.c',
+ sfdir / 'f64_isSignalingNaN.c',
+ sfdir / 'extF80_to_ui32.c',
+ sfdir / 'extF80_to_ui64.c',
+ sfdir / 'extF80_to_i32.c',
+ sfdir / 'extF80_to_i64.c',
+ sfdir / 'extF80_to_ui32_r_minMag.c',
+ sfdir / 'extF80_to_ui64_r_minMag.c',
+ sfdir / 'extF80_to_i32_r_minMag.c',
+ sfdir / 'extF80_to_i64_r_minMag.c',
+ sfdir / 'extF80_to_f16.c',
+ sfdir / 'extF80_to_f32.c',
+ sfdir / 'extF80_to_f64.c',
+ sfdir / 'extF80_to_f128.c',
+ sfdir / 'extF80_roundToInt.c',
+ sfdir / 'extF80_add.c',
+ sfdir / 'extF80_sub.c',
+ sfdir / 'extF80_mul.c',
+ sfdir / 'extF80_div.c',
+ sfdir / 'extF80_rem.c',
+ sfdir / 'extF80_sqrt.c',
+ sfdir / 'extF80_eq.c',
+ sfdir / 'extF80_le.c',
+ sfdir / 'extF80_lt.c',
+ sfdir / 'extF80_eq_signaling.c',
+ sfdir / 'extF80_le_quiet.c',
+ sfdir / 'extF80_lt_quiet.c',
+ sfdir / 'extF80_isSignalingNaN.c',
+ sfdir / 'extF80M_to_ui32.c',
+ sfdir / 'extF80M_to_ui64.c',
+ sfdir / 'extF80M_to_i32.c',
+ sfdir / 'extF80M_to_i64.c',
+ sfdir / 'extF80M_to_ui32_r_minMag.c',
+ sfdir / 'extF80M_to_ui64_r_minMag.c',
+ sfdir / 'extF80M_to_i32_r_minMag.c',
+ sfdir / 'extF80M_to_i64_r_minMag.c',
+ sfdir / 'extF80M_to_f16.c',
+ sfdir / 'extF80M_to_f32.c',
+ sfdir / 'extF80M_to_f64.c',
+ sfdir / 'extF80M_to_f128M.c',
+ sfdir / 'extF80M_roundToInt.c',
+ sfdir / 'extF80M_add.c',
+ sfdir / 'extF80M_sub.c',
+ sfdir / 'extF80M_mul.c',
+ sfdir / 'extF80M_div.c',
+ sfdir / 'extF80M_rem.c',
+ sfdir / 'extF80M_sqrt.c',
+ sfdir / 'extF80M_eq.c',
+ sfdir / 'extF80M_le.c',
+ sfdir / 'extF80M_lt.c',
+ sfdir / 'extF80M_eq_signaling.c',
+ sfdir / 'extF80M_le_quiet.c',
+ sfdir / 'extF80M_lt_quiet.c',
+ sfdir / 'f128_to_ui32.c',
+ sfdir / 'f128_to_ui64.c',
+ sfdir / 'f128_to_i32.c',
+ sfdir / 'f128_to_i64.c',
+ sfdir / 'f128_to_ui32_r_minMag.c',
+ sfdir / 'f128_to_ui64_r_minMag.c',
+ sfdir / 'f128_to_i32_r_minMag.c',
+ sfdir / 'f128_to_i64_r_minMag.c',
+ sfdir / 'f128_to_f16.c',
+ sfdir / 'f128_to_f32.c',
+ sfdir / 'f128_to_extF80.c',
+ sfdir / 'f128_to_f64.c',
+ sfdir / 'f128_roundToInt.c',
+ sfdir / 'f128_add.c',
+ sfdir / 'f128_sub.c',
+ sfdir / 'f128_mul.c',
+ sfdir / 'f128_mulAdd.c',
+ sfdir / 'f128_div.c',
+ sfdir / 'f128_rem.c',
+ sfdir / 'f128_sqrt.c',
+ sfdir / 'f128_eq.c',
+ sfdir / 'f128_le.c',
+ sfdir / 'f128_lt.c',
+ sfdir / 'f128_eq_signaling.c',
+ sfdir / 'f128_le_quiet.c',
+ sfdir / 'f128_lt_quiet.c',
+ sfdir / 'f128_isSignalingNaN.c',
+ sfdir / 'f128M_to_ui32.c',
+ sfdir / 'f128M_to_ui64.c',
+ sfdir / 'f128M_to_i32.c',
+ sfdir / 'f128M_to_i64.c',
+ sfdir / 'f128M_to_ui32_r_minMag.c',
+ sfdir / 'f128M_to_ui64_r_minMag.c',
+ sfdir / 'f128M_to_i32_r_minMag.c',
+ sfdir / 'f128M_to_i64_r_minMag.c',
+ sfdir / 'f128M_to_f16.c',
+ sfdir / 'f128M_to_f32.c',
+ sfdir / 'f128M_to_extF80M.c',
+ sfdir / 'f128M_to_f64.c',
+ sfdir / 'f128M_roundToInt.c',
+ sfdir / 'f128M_add.c',
+ sfdir / 'f128M_sub.c',
+ sfdir / 'f128M_mul.c',
+ sfdir / 'f128M_mulAdd.c',
+ sfdir / 'f128M_div.c',
+ sfdir / 'f128M_rem.c',
+ sfdir / 'f128M_sqrt.c',
+ sfdir / 'f128M_eq.c',
+ sfdir / 'f128M_le.c',
+ sfdir / 'f128M_lt.c',
+ sfdir / 'f128M_eq_signaling.c',
+ sfdir / 'f128M_le_quiet.c',
+ sfdir / 'f128M_lt_quiet.c',
+ # spe
+ sfspedir / 'softfloat_raiseFlags.c',
+ sfspedir / 's_f16UIToCommonNaN.c',
+ sfspedir / 's_commonNaNToF16UI.c',
+ sfspedir / 's_propagateNaNF16UI.c',
+ sfspedir / 's_f32UIToCommonNaN.c',
+ sfspedir / 's_commonNaNToF32UI.c',
+ sfspedir / 's_propagateNaNF32UI.c',
+ sfspedir / 's_f64UIToCommonNaN.c',
+ sfspedir / 's_commonNaNToF64UI.c',
+ sfspedir / 's_propagateNaNF64UI.c',
+ sfspedir / 'extF80M_isSignalingNaN.c',
+ sfspedir / 's_extF80UIToCommonNaN.c',
+ sfspedir / 's_commonNaNToExtF80UI.c',
+ sfspedir / 's_propagateNaNExtF80UI.c',
+ sfspedir / 'f128M_isSignalingNaN.c',
+ sfspedir / 's_f128UIToCommonNaN.c',
+ sfspedir / 's_commonNaNToF128UI.c',
+ sfspedir / 's_propagateNaNF128UI.c',
+ ),
+ include_directories: sfinc,
+ c_args: sfcflags + fpcflags,
+)
+
+fpcflags += [
+ # work around TARGET_* poisoning
+ '-DHW_POISON_H',
+ # define a target to match testfloat's implementation-defined choices, such as
+ # whether to raise the invalid flag when dealing with NaNs in muladd.
+ '-DTARGET_ARM',
+ # FIXME: uiZ may be used uninitialized in this function
+ '-Wno-uninitialized',
+]
+
+fptest = executable(
+ 'fp-test',
+ ['fp-test.c', tfdir / 'slowfloat.c', '../../fpu/softfloat.c'],
+ link_with: [libtestfloat, libsoftfloat],
+ dependencies: [qemuutil],
+ include_directories: [sfinc, include_directories(tfdir)],
+ c_args: fpcflags,
+)
+softfloat_conv_tests = {
+ 'float-to-float': 'f16_to_f32 f16_to_f64 f16_to_extF80 f16_to_f128 ' +
+ 'f32_to_f16 f32_to_f64 f32_to_extF80 ' +
+ 'f64_to_f16 f64_to_f32 ' +
+ 'extF80_to_f16 extF80_to_f32 ' +
+ 'extF80_to_f64 extF80_to_f128 ' +
+ 'f128_to_f16',
+ 'int-to-float': 'i32_to_f16 i64_to_f16 i32_to_f32 i64_to_f32 ' +
+ 'i32_to_f64 i64_to_f64 i32_to_f128 i64_to_f128',
+ 'uint-to-float': 'ui32_to_f16 ui64_to_f16 ui32_to_f32 ui64_to_f32 ' +
+ 'ui32_to_f64 ui64_to_f64 ui64_to_f128 ' +
+ 'ui32_to_extF80 ui64_to_extF80',
+ 'float-to-int': 'f16_to_i32 f16_to_i32_r_minMag ' +
+ 'f32_to_i32 f32_to_i32_r_minMag ' +
+ 'f64_to_i32 f64_to_i32_r_minMag ' +
+ 'extF80_to_i32 extF80_to_i32_r_minMag ' +
+ 'f128_to_i32 f128_to_i32_r_minMag ' +
+ 'f16_to_i64 f16_to_i64_r_minMag ' +
+ 'f32_to_i64 f32_to_i64_r_minMag ' +
+ 'f64_to_i64 f64_to_i64_r_minMag ' +
+ 'extF80_to_i64 extF80_to_i64_r_minMag ' +
+ 'f128_to_i64 f128_to_i64_r_minMag',
+ 'float-to-uint': 'f16_to_ui32 f16_to_ui32_r_minMag ' +
+ 'f32_to_ui32 f32_to_ui32_r_minMag ' +
+ 'f64_to_ui32 f64_to_ui32_r_minMag ' +
+ 'extF80_to_ui32 extF80_to_ui32_r_minMag ' +
+ 'f128_to_ui32 f128_to_ui32_r_minMag ' +
+ 'f16_to_ui64 f16_to_ui64_r_minMag ' +
+ 'f32_to_ui64 f32_to_ui64_r_minMag ' +
+ 'f64_to_ui64 f64_to_ui64_r_minMag ' +
+ 'extF80_to_ui64 extF80_to_ui64_r_minMag ' +
+ 'f128_to_ui64 f128_to_ui64_r_minMag',
+ 'round-to-integer': 'f16_roundToInt f32_roundToInt ' +
+ 'f64_roundToInt f128_roundToInt'
+}
+softfloat_tests = {
+ 'eq_signaling' : 'compare',
+ 'le' : 'compare',
+ 'le_quiet' : 'compare',
+ 'lt_quiet' : 'compare',
+ 'add': 'ops',
+ 'sub': 'ops',
+ 'mul': 'ops',
+ 'div': 'ops',
+ 'rem': 'ops',
+ 'sqrt': 'ops'
+}
+# The full test suite can take a bit of time, default to a quick run
+# "-l 2 -r all" can take more than a day for some operations and is best
+# run manually
+fptest_args = ['-s', '-l', '1']
+fptest_rounding_args = ['-r', 'all']
+
+# Conversion Routines:
+# FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken)
+# extF80_roundToInt (broken)
+foreach k, v : softfloat_conv_tests
+ test('fp-test:' + k, fptest,
+ args: fptest_args + fptest_rounding_args + v.split(),
+ suite: ['softfloat', 'softfloat-conv'])
+endforeach
+
+# FIXME: extF80_{lt_quiet, rem} (broken),
+# extF80_{mulAdd} (missing)
+foreach k, v : softfloat_tests
+ extF80_broken = ['lt_quiet', 'rem'].contains(k)
+ test('fp-test:' + k, fptest,
+ args: fptest_args + fptest_rounding_args +
+ ['f16_' + k, 'f32_' + k, 'f64_' + k, 'f128_' + k] +
+ (extF80_broken ? [] : ['extF80_' + k]),
+ suite: ['softfloat', 'softfloat-' + v])
+endforeach
+test('fp-test:mulAdd', fptest,
+ # no fptest_rounding_args
+ args: fptest_args +
+ ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'],
+ suite: ['softfloat-slow', 'softfloat-ops-slow'], timeout: 60)
+
+fpbench = executable(
+ 'fp-bench',
+ ['fp-bench.c', '../../fpu/softfloat.c'],
+ link_with: [libtestfloat, libsoftfloat],
+ dependencies: [qemuutil],
+ include_directories: [sfinc, include_directories(tfdir)],
+ c_args: fpcflags,
+)
diff --git a/tests/meson.build b/tests/meson.build
index 5c52021..ec26f92 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,3 +2,7 @@ test('decodetree', sh,
args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
workdir: meson.current_source_dir() / 'decode',
suite: 'decodetree')
+
+if 'CONFIG_TCG' in config_host
+ subdir('fp')
+endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 048/143] meson: convert check-qapi-schema
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (46 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 047/143] meson: convert tests/fp and check-softfloat Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 049/143] meson: convert qom directory to Meson (tools part) Paolo Bonzini
` (99 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/Makefile.include | 218 +-----------------------------------------
tests/meson.build | 2 +
tests/qapi-schema/meson.build | 215 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 219 insertions(+), 216 deletions(-)
create mode 100644 tests/qapi-schema/meson.build
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f7ffecc..a0e5d3e 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -161,201 +161,6 @@ check-unit-y += tests/test-qapi-util$(EXESUF)
check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh
-qapi-schema += alternate-any.json
-qapi-schema += alternate-array.json
-qapi-schema += alternate-base.json
-qapi-schema += alternate-branch-if-invalid.json
-qapi-schema += alternate-clash.json
-qapi-schema += alternate-conflict-dict.json
-qapi-schema += alternate-conflict-enum-bool.json
-qapi-schema += alternate-conflict-enum-int.json
-qapi-schema += alternate-conflict-string.json
-qapi-schema += alternate-conflict-bool-string.json
-qapi-schema += alternate-conflict-num-string.json
-qapi-schema += alternate-empty.json
-qapi-schema += alternate-invalid-dict.json
-qapi-schema += alternate-nested.json
-qapi-schema += alternate-unknown.json
-qapi-schema += args-alternate.json
-qapi-schema += args-any.json
-qapi-schema += args-array-empty.json
-qapi-schema += args-array-unknown.json
-qapi-schema += args-bad-boxed.json
-qapi-schema += args-boxed-anon.json
-qapi-schema += args-boxed-string.json
-qapi-schema += args-int.json
-qapi-schema += args-invalid.json
-qapi-schema += args-member-array-bad.json
-qapi-schema += args-member-case.json
-qapi-schema += args-member-unknown.json
-qapi-schema += args-name-clash.json
-qapi-schema += args-union.json
-qapi-schema += args-unknown.json
-qapi-schema += bad-base.json
-qapi-schema += bad-data.json
-qapi-schema += bad-ident.json
-qapi-schema += bad-if.json
-qapi-schema += bad-if-empty.json
-qapi-schema += bad-if-empty-list.json
-qapi-schema += bad-if-list.json
-qapi-schema += bad-type-bool.json
-qapi-schema += bad-type-dict.json
-qapi-schema += bad-type-int.json
-qapi-schema += base-cycle-direct.json
-qapi-schema += base-cycle-indirect.json
-qapi-schema += command-int.json
-qapi-schema += comments.json
-qapi-schema += doc-bad-alternate-member.json
-qapi-schema += doc-bad-boxed-command-arg.json
-qapi-schema += doc-bad-command-arg.json
-qapi-schema += doc-bad-enum-member.json
-qapi-schema += doc-bad-event-arg.json
-qapi-schema += doc-bad-feature.json
-qapi-schema += doc-bad-section.json
-qapi-schema += doc-bad-symbol.json
-qapi-schema += doc-bad-union-member.json
-qapi-schema += doc-before-include.json
-qapi-schema += doc-before-pragma.json
-qapi-schema += doc-duplicated-arg.json
-qapi-schema += doc-duplicated-return.json
-qapi-schema += doc-duplicated-since.json
-qapi-schema += doc-empty-arg.json
-qapi-schema += doc-empty-section.json
-qapi-schema += doc-empty-symbol.json
-qapi-schema += doc-good.json
-qapi-schema += doc-interleaved-section.json
-qapi-schema += doc-invalid-end.json
-qapi-schema += doc-invalid-end2.json
-qapi-schema += doc-invalid-return.json
-qapi-schema += doc-invalid-section.json
-qapi-schema += doc-invalid-start.json
-qapi-schema += doc-missing-colon.json
-qapi-schema += doc-missing-expr.json
-qapi-schema += doc-missing-space.json
-qapi-schema += doc-missing.json
-qapi-schema += doc-no-symbol.json
-qapi-schema += doc-undoc-feature.json
-qapi-schema += double-type.json
-qapi-schema += duplicate-key.json
-qapi-schema += empty.json
-qapi-schema += enum-bad-member.json
-qapi-schema += enum-bad-name.json
-qapi-schema += enum-bad-prefix.json
-qapi-schema += enum-clash-member.json
-qapi-schema += enum-dict-member-unknown.json
-qapi-schema += enum-if-invalid.json
-qapi-schema += enum-int-member.json
-qapi-schema += enum-member-case.json
-qapi-schema += enum-missing-data.json
-qapi-schema += enum-wrong-data.json
-qapi-schema += event-boxed-empty.json
-qapi-schema += event-case.json
-qapi-schema += event-member-invalid-dict.json
-qapi-schema += event-nest-struct.json
-qapi-schema += features-bad-type.json
-qapi-schema += features-deprecated-type.json
-qapi-schema += features-duplicate-name.json
-qapi-schema += features-if-invalid.json
-qapi-schema += features-missing-name.json
-qapi-schema += features-name-bad-type.json
-qapi-schema += features-no-list.json
-qapi-schema += features-unknown-key.json
-qapi-schema += flat-union-array-branch.json
-qapi-schema += flat-union-bad-base.json
-qapi-schema += flat-union-bad-discriminator.json
-qapi-schema += flat-union-base-any.json
-qapi-schema += flat-union-base-union.json
-qapi-schema += flat-union-clash-member.json
-qapi-schema += flat-union-discriminator-bad-name.json
-qapi-schema += flat-union-empty.json
-qapi-schema += flat-union-inline.json
-qapi-schema += flat-union-inline-invalid-dict.json
-qapi-schema += flat-union-int-branch.json
-qapi-schema += flat-union-invalid-branch-key.json
-qapi-schema += flat-union-invalid-discriminator.json
-qapi-schema += flat-union-invalid-if-discriminator.json
-qapi-schema += flat-union-no-base.json
-qapi-schema += flat-union-optional-discriminator.json
-qapi-schema += flat-union-string-discriminator.json
-qapi-schema += funny-char.json
-qapi-schema += funny-word.json
-qapi-schema += ident-with-escape.json
-qapi-schema += include-before-err.json
-qapi-schema += include-cycle.json
-qapi-schema += include-extra-junk.json
-qapi-schema += include-nested-err.json
-qapi-schema += include-no-file.json
-qapi-schema += include-non-file.json
-qapi-schema += include-repetition.json
-qapi-schema += include-self-cycle.json
-qapi-schema += include-simple.json
-qapi-schema += indented-expr.json
-qapi-schema += leading-comma-list.json
-qapi-schema += leading-comma-object.json
-qapi-schema += missing-colon.json
-qapi-schema += missing-comma-list.json
-qapi-schema += missing-comma-object.json
-qapi-schema += missing-type.json
-qapi-schema += nested-struct-data.json
-qapi-schema += nested-struct-data-invalid-dict.json
-qapi-schema += non-objects.json
-qapi-schema += oob-test.json
-qapi-schema += allow-preconfig-test.json
-qapi-schema += pragma-doc-required-crap.json
-qapi-schema += pragma-extra-junk.json
-qapi-schema += pragma-name-case-whitelist-crap.json
-qapi-schema += pragma-non-dict.json
-qapi-schema += pragma-unknown.json
-qapi-schema += pragma-returns-whitelist-crap.json
-qapi-schema += qapi-schema-test.json
-qapi-schema += quoted-structural-chars.json
-qapi-schema += redefined-builtin.json
-qapi-schema += redefined-command.json
-qapi-schema += redefined-event.json
-qapi-schema += redefined-type.json
-qapi-schema += reserved-command-q.json
-qapi-schema += reserved-enum-q.json
-qapi-schema += reserved-member-has.json
-qapi-schema += reserved-member-q.json
-qapi-schema += reserved-member-u.json
-qapi-schema += reserved-member-underscore.json
-qapi-schema += reserved-type-kind.json
-qapi-schema += reserved-type-list.json
-qapi-schema += returns-alternate.json
-qapi-schema += returns-array-bad.json
-qapi-schema += returns-dict.json
-qapi-schema += returns-unknown.json
-qapi-schema += returns-whitelist.json
-qapi-schema += string-code-point-31.json
-qapi-schema += string-code-point-127.json
-qapi-schema += struct-base-clash-deep.json
-qapi-schema += struct-base-clash.json
-qapi-schema += struct-data-invalid.json
-qapi-schema += struct-member-if-invalid.json
-qapi-schema += struct-member-invalid-dict.json
-qapi-schema += struct-member-invalid.json
-qapi-schema += trailing-comma-list.json
-qapi-schema += trailing-comma-object.json
-qapi-schema += type-bypass-bad-gen.json
-qapi-schema += unclosed-list.json
-qapi-schema += unclosed-object.json
-qapi-schema += unclosed-string.json
-qapi-schema += union-base-empty.json
-qapi-schema += union-base-no-discriminator.json
-qapi-schema += union-branch-case.json
-qapi-schema += union-branch-if-invalid.json
-qapi-schema += union-branch-invalid-dict.json
-qapi-schema += union-clash-branches.json
-qapi-schema += union-empty.json
-qapi-schema += union-invalid-base.json
-qapi-schema += union-optional-branch.json
-qapi-schema += union-unknown.json
-qapi-schema += unknown-escape.json
-qapi-schema += unknown-expr-key.json
-
-
-check-qapi-schema-y := $(addprefix tests/qapi-schema/, $(qapi-schema))
-
generated-files-y += tests/test-qapi-types.h
generated-files-y += tests/include/test-qapi-types-sub-module.h
generated-files-y += tests/test-qapi-types-sub-sub-module.h
@@ -501,13 +306,6 @@ tests/test-qapi-gen-timestamp: \
@rm -f tests/test-qapi-doc.texi
@>$@
-tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/tests/qapi-schema/doc-good.json $(qapi-py)
- $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \
- -o tests/qapi-schema -p "doc-good-" $<, \
- "GEN","$@")
- @mv tests/qapi-schema/doc-good-qapi-doc.texi $@
- @rm -f tests/qapi-schema/doc-good-qapi-*.[ch] tests/qapi-schema/doc-good-qmp-*.[ch]
-
tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-vmstate1-gen-timestamp ;
tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmstate1.xml
$(call quiet-command,$(GDBUS_CODEGEN) $< \
@@ -720,7 +518,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES)
.PHONY: clean-tcg
clean-tcg: $(CLEAN_TCG_TARGET_RULES)
-# Other tests
QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
@@ -732,16 +529,6 @@ check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
$(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS)))
@$<
-.PHONY: check-tests/qapi-schema/frontend
-check-tests/qapi-schema/frontend: $(addprefix $(SRC_PATH)/, $(check-qapi-schema-y))
- $(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts \
- PYTHONIOENCODING=utf-8 $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py $^, \
- TEST, check-qapi-schema)
-
-.PHONY: check-tests/qapi-schema/doc-good.texi
-check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi
- @diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $<
-
# Python venv for running tests
.PHONY: check-venv check-acceptance
@@ -795,15 +582,14 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
# Consolidated targets
-.PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean get-vm-images
-check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi
+.PHONY: check-block check-qtest check-unit check check-clean get-vm-images
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
ifeq ($(CONFIG_TOOLS),y)
check-block: $(patsubst %,check-%, $(check-block-y))
endif
check-build: build-unit build-qtest
-check: check-block check-qapi-schema check-unit check-qtest
+check: check-block check-unit check-qtest
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
diff --git a/tests/meson.build b/tests/meson.build
index ec26f92..8be9c22 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,3 +6,5 @@ test('decodetree', sh,
if 'CONFIG_TCG' in config_host
subdir('fp')
endif
+
+subdir('qapi-schema')
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
new file mode 100644
index 0000000..ca9d59e
--- /dev/null
+++ b/tests/qapi-schema/meson.build
@@ -0,0 +1,215 @@
+test_env = environment()
+test_env.set('PYTHONPATH', meson.source_root() / 'scripts')
+test_env.set('PYTHONIOENCODING', 'utf-8')
+
+schemas = [
+ 'alternate-any.json',
+ 'alternate-array.json',
+ 'alternate-base.json',
+ 'alternate-branch-if-invalid.json',
+ 'alternate-clash.json',
+ 'alternate-conflict-dict.json',
+ 'alternate-conflict-enum-bool.json',
+ 'alternate-conflict-enum-int.json',
+ 'alternate-conflict-string.json',
+ 'alternate-conflict-bool-string.json',
+ 'alternate-conflict-num-string.json',
+ 'alternate-empty.json',
+ 'alternate-invalid-dict.json',
+ 'alternate-nested.json',
+ 'alternate-unknown.json',
+ 'args-alternate.json',
+ 'args-any.json',
+ 'args-array-empty.json',
+ 'args-array-unknown.json',
+ 'args-bad-boxed.json',
+ 'args-boxed-anon.json',
+ 'args-boxed-string.json',
+ 'args-int.json',
+ 'args-invalid.json',
+ 'args-member-array-bad.json',
+ 'args-member-case.json',
+ 'args-member-unknown.json',
+ 'args-name-clash.json',
+ 'args-union.json',
+ 'args-unknown.json',
+ 'bad-base.json',
+ 'bad-data.json',
+ 'bad-ident.json',
+ 'bad-if.json',
+ 'bad-if-empty.json',
+ 'bad-if-empty-list.json',
+ 'bad-if-list.json',
+ 'bad-type-bool.json',
+ 'bad-type-dict.json',
+ 'bad-type-int.json',
+ 'base-cycle-direct.json',
+ 'base-cycle-indirect.json',
+ 'command-int.json',
+ 'comments.json',
+ 'doc-bad-alternate-member.json',
+ 'doc-bad-boxed-command-arg.json',
+ 'doc-bad-command-arg.json',
+ 'doc-bad-enum-member.json',
+ 'doc-bad-event-arg.json',
+ 'doc-bad-feature.json',
+ 'doc-bad-section.json',
+ 'doc-bad-symbol.json',
+ 'doc-bad-union-member.json',
+ 'doc-before-include.json',
+ 'doc-before-pragma.json',
+ 'doc-duplicated-arg.json',
+ 'doc-duplicated-return.json',
+ 'doc-duplicated-since.json',
+ 'doc-empty-arg.json',
+ 'doc-empty-section.json',
+ 'doc-empty-symbol.json',
+ 'doc-good.json',
+ 'doc-interleaved-section.json',
+ 'doc-invalid-end.json',
+ 'doc-invalid-end2.json',
+ 'doc-invalid-return.json',
+ 'doc-invalid-section.json',
+ 'doc-invalid-start.json',
+ 'doc-missing-colon.json',
+ 'doc-missing-expr.json',
+ 'doc-missing-space.json',
+ 'doc-missing.json',
+ 'doc-no-symbol.json',
+ 'doc-undoc-feature.json',
+ 'double-type.json',
+ 'duplicate-key.json',
+ 'empty.json',
+ 'enum-bad-member.json',
+ 'enum-bad-name.json',
+ 'enum-bad-prefix.json',
+ 'enum-clash-member.json',
+ 'enum-dict-member-unknown.json',
+ 'enum-if-invalid.json',
+ 'enum-int-member.json',
+ 'enum-member-case.json',
+ 'enum-missing-data.json',
+ 'enum-wrong-data.json',
+ 'event-boxed-empty.json',
+ 'event-case.json',
+ 'event-member-invalid-dict.json',
+ 'event-nest-struct.json',
+ 'features-bad-type.json',
+ 'features-deprecated-type.json',
+ 'features-duplicate-name.json',
+ 'features-if-invalid.json',
+ 'features-missing-name.json',
+ 'features-name-bad-type.json',
+ 'features-no-list.json',
+ 'features-unknown-key.json',
+ 'flat-union-array-branch.json',
+ 'flat-union-bad-base.json',
+ 'flat-union-bad-discriminator.json',
+ 'flat-union-base-any.json',
+ 'flat-union-base-union.json',
+ 'flat-union-clash-member.json',
+ 'flat-union-discriminator-bad-name.json',
+ 'flat-union-empty.json',
+ 'flat-union-inline.json',
+ 'flat-union-inline-invalid-dict.json',
+ 'flat-union-int-branch.json',
+ 'flat-union-invalid-branch-key.json',
+ 'flat-union-invalid-discriminator.json',
+ 'flat-union-invalid-if-discriminator.json',
+ 'flat-union-no-base.json',
+ 'flat-union-optional-discriminator.json',
+ 'flat-union-string-discriminator.json',
+ 'funny-char.json',
+ 'funny-word.json',
+ 'ident-with-escape.json',
+ 'include-before-err.json',
+ 'include-cycle.json',
+ 'include-extra-junk.json',
+ 'include-nested-err.json',
+ 'include-no-file.json',
+ 'include-non-file.json',
+ 'include-repetition.json',
+ 'include-self-cycle.json',
+ 'include-simple.json',
+ 'indented-expr.json',
+ 'leading-comma-list.json',
+ 'leading-comma-object.json',
+ 'missing-colon.json',
+ 'missing-comma-list.json',
+ 'missing-comma-object.json',
+ 'missing-type.json',
+ 'nested-struct-data.json',
+ 'nested-struct-data-invalid-dict.json',
+ 'non-objects.json',
+ 'oob-test.json',
+ 'allow-preconfig-test.json',
+ 'pragma-doc-required-crap.json',
+ 'pragma-extra-junk.json',
+ 'pragma-name-case-whitelist-crap.json',
+ 'pragma-non-dict.json',
+ 'pragma-unknown.json',
+ 'pragma-returns-whitelist-crap.json',
+ 'qapi-schema-test.json',
+ 'quoted-structural-chars.json',
+ 'redefined-builtin.json',
+ 'redefined-command.json',
+ 'redefined-event.json',
+ 'redefined-type.json',
+ 'reserved-command-q.json',
+ 'reserved-enum-q.json',
+ 'reserved-member-has.json',
+ 'reserved-member-q.json',
+ 'reserved-member-u.json',
+ 'reserved-member-underscore.json',
+ 'reserved-type-kind.json',
+ 'reserved-type-list.json',
+ 'returns-alternate.json',
+ 'returns-array-bad.json',
+ 'returns-dict.json',
+ 'returns-unknown.json',
+ 'returns-whitelist.json',
+ 'string-code-point-31.json',
+ 'string-code-point-127.json',
+ 'struct-base-clash-deep.json',
+ 'struct-base-clash.json',
+ 'struct-data-invalid.json',
+ 'struct-member-if-invalid.json',
+ 'struct-member-invalid-dict.json',
+ 'struct-member-invalid.json',
+ 'trailing-comma-list.json',
+ 'trailing-comma-object.json',
+ 'type-bypass-bad-gen.json',
+ 'unclosed-list.json',
+ 'unclosed-object.json',
+ 'unclosed-string.json',
+ 'union-base-empty.json',
+ 'union-base-no-discriminator.json',
+ 'union-branch-case.json',
+ 'union-branch-if-invalid.json',
+ 'union-branch-invalid-dict.json',
+ 'union-clash-branches.json',
+ 'union-empty.json',
+ 'union-invalid-base.json',
+ 'union-optional-branch.json',
+ 'union-unknown.json',
+ 'unknown-escape.json',
+ 'unknown-expr-key.json',
+]
+
+test_qapi = find_program('test-qapi.py')
+
+test('QAPI schema regression tests', test_qapi, args: files(schemas),
+ env: test_env, suite: ['qapi-schema', 'qapi-frontend'])
+
+diff = find_program('diff')
+
+qapi_doc = custom_target('QAPI doc',
+ output: 'doc-good-qapi-doc.texi',
+ input: files('doc-good.json'),
+ command: [ qapi_gen, '-o', meson.current_build_dir(),
+ '-p', 'doc-good-', '@INPUT0@' ],
+ depend_files: qapi_gen_depends)
+
+test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), qapi_doc],
+ depends: qapi_doc,
+ suite: ['qapi-schema', 'qapi-doc'])
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 049/143] meson: convert qom directory to Meson (tools part)
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (47 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 048/143] meson: convert check-qapi-schema Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 050/143] meson: convert authz directory to Meson Paolo Bonzini
` (98 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 +-
Makefile.objs | 2 +-
Makefile.target | 3 ++-
meson.build | 1 +
qom/Makefile.objs | 3 ---
qom/meson.build | 15 +++++++++++++++
6 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 qom/meson.build
diff --git a/Makefile b/Makefile
index d277681..36f74aa 100644
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,6 @@ dummy := $(call unnest-vars,, \
storage-daemon-obj-y \
storage-daemon-obj-m \
crypto-obj-y \
- qom-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)
@@ -254,6 +253,7 @@ $(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y)
$(SOFTMMU_ALL_RULES): $(chardev-obj-y)
$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
$(SOFTMMU_ALL_RULES): $(io-obj-y)
+$(SOFTMMU_ALL_RULES): $(qom-obj-y)
$(SOFTMMU_ALL_RULES): config-all-devices.mak
SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
diff --git a/Makefile.objs b/Makefile.objs
index baf1565..84bfa2a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,6 +1,6 @@
#######################################################################
# Common libraries for tools and emulators
-qom-obj-y = qom/
+qom-obj-y = qom/libqom.fa
#######################################################################
# code used by both qemu system emulation and qemu-img
diff --git a/Makefile.target b/Makefile.target
index 257afc2..1e04551 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -191,13 +191,14 @@ all-obj-y := $(obj-y)
common-obj-m :=
include $(SRC_PATH)/Makefile.objs
+dummy := $(call fix-paths,../,, \
+ qom-obj-y)
dummy := $(call unnest-vars,.., \
authz-obj-y \
block-obj-y \
block-obj-m \
chardev-obj-y \
crypto-obj-y \
- qom-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)
diff --git a/meson.build b/meson.build
index fbf27a7..57475c8 100644
--- a/meson.build
+++ b/meson.build
@@ -312,6 +312,7 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+subdir('qom')
subdir('fsdev')
# Other build targets
diff --git a/qom/Makefile.objs b/qom/Makefile.objs
index 1b45d10..b962904 100644
--- a/qom/Makefile.objs
+++ b/qom/Makefile.objs
@@ -1,5 +1,2 @@
-qom-obj-y = object.o container.o qom-qobject.o
-qom-obj-y += object_interfaces.o
-
common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o
storage-daemon-obj-y += qom-qmp-cmds.o
diff --git a/qom/meson.build b/qom/meson.build
new file mode 100644
index 0000000..3c41ed3
--- /dev/null
+++ b/qom/meson.build
@@ -0,0 +1,15 @@
+qom_ss = ss.source_set()
+qom_ss.add(files(
+ 'container.c',
+ 'object.c',
+ 'object_interfaces.c',
+ 'qom-qobject.c',
+))
+
+qom_ss = qom_ss.apply(config_host, strict: false)
+libqom = static_library('qom', qom_ss.sources(),
+ dependencies: [qom_ss.dependencies()],
+ link_with: [libqemuutil],
+ name_suffix: 'fa')
+
+qom = declare_dependency(link_whole: libqom)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 050/143] meson: convert authz directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (48 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 049/143] meson: convert qom directory to Meson (tools part) Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 051/143] meson: convert crypto " Paolo Bonzini
` (97 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 -
Makefile.objs | 3 ++-
Makefile.target | 2 +-
authz/Makefile.objs | 7 -------
authz/meson.build | 19 +++++++++++++++++++
meson.build | 5 +++++
6 files changed, 27 insertions(+), 10 deletions(-)
delete mode 100644 authz/Makefile.objs
create mode 100644 authz/meson.build
diff --git a/Makefile b/Makefile
index 36f74aa..123b857 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,6 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- authz-obj-y \
chardev-obj-y \
block-obj-y \
block-obj-m \
diff --git a/Makefile.objs b/Makefile.objs
index 84bfa2a..0bc361d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -9,7 +9,8 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
chardev-obj-y = chardev/
-authz-obj-y = authz/
+authz-obj-y = authz/libauthz.fa
+authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
block-obj-y = block/ nbd/ scsi/
block-obj-y += block.o blockjob.o job.o
diff --git a/Makefile.target b/Makefile.target
index 1e04551..79b6e02 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -192,9 +192,9 @@ common-obj-m :=
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
+ authz-obj-y \
qom-obj-y)
dummy := $(call unnest-vars,.., \
- authz-obj-y \
block-obj-y \
block-obj-m \
chardev-obj-y \
diff --git a/authz/Makefile.objs b/authz/Makefile.objs
deleted file mode 100644
index ed7b273..0000000
--- a/authz/Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-authz-obj-y += base.o
-authz-obj-y += simple.o
-authz-obj-y += list.o
-authz-obj-y += listfile.o
-authz-obj-$(CONFIG_AUTH_PAM) += pamacct.o
-
-pamacct.o-libs = -lpam
diff --git a/authz/meson.build b/authz/meson.build
new file mode 100644
index 0000000..c1f6362
--- /dev/null
+++ b/authz/meson.build
@@ -0,0 +1,19 @@
+authz_ss = ss.source_set()
+authz_ss.add(genh)
+authz_ss.add(files(
+ 'base.c',
+ 'list.c',
+ 'listfile.c',
+ 'simple.c',
+))
+
+authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c'))
+
+authz_ss = authz_ss.apply(config_host, strict: false)
+libauthz = static_library('authz', authz_ss.sources(),
+ dependencies: [authz_ss.dependencies()],
+ name_suffix: 'fa',
+ build_by_default: false)
+
+authz = declare_dependency(link_whole: libauthz,
+ dependencies: qom)
diff --git a/meson.build b/meson.build
index 57475c8..81bd0d7 100644
--- a/meson.build
+++ b/meson.build
@@ -82,6 +82,10 @@ if 'CONFIG_GNUTLS' in config_host
endif
pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(),
link_args: config_host['PIXMAN_LIBS'].split())
+pam = not_found
+if 'CONFIG_AUTH_PAM' in config_host
+ pam = cc.find_library('pam')
+endif
libattr = not_found
if 'CONFIG_ATTR' in config_host
libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split())
@@ -313,6 +317,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
subdir('qom')
+subdir('authz')
subdir('fsdev')
# Other build targets
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 051/143] meson: convert crypto directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (49 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 050/143] meson: convert authz directory to Meson Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 052/143] meson: convert io " Paolo Bonzini
` (96 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 -
Makefile.objs | 2 +-
Makefile.target | 2 +-
crypto/Makefile.objs | 37 -------------------------------------
crypto/meson.build | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
meson.build | 4 ++--
qom/meson.build | 2 +-
7 files changed, 57 insertions(+), 43 deletions(-)
delete mode 100644 crypto/Makefile.objs
diff --git a/Makefile b/Makefile
index 123b857..67e932e 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,6 @@ dummy := $(call unnest-vars,, \
block-obj-m \
storage-daemon-obj-y \
storage-daemon-obj-m \
- crypto-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)
diff --git a/Makefile.objs b/Makefile.objs
index 0bc361d..018338d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -19,7 +19,7 @@ block-obj-$(CONFIG_REPLICATION) += replication.o
block-obj-m = block/
-crypto-obj-y = crypto/
+crypto-obj-y = crypto/libcrypto.fa
io-obj-y = io/
diff --git a/Makefile.target b/Makefile.target
index 79b6e02..b213955 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -193,12 +193,12 @@ common-obj-m :=
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
authz-obj-y \
+ crypto-obj-y \
qom-obj-y)
dummy := $(call unnest-vars,.., \
block-obj-y \
block-obj-m \
chardev-obj-y \
- crypto-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
deleted file mode 100644
index a988591..0000000
--- a/crypto/Makefile.objs
+++ /dev/null
@@ -1,37 +0,0 @@
-crypto-obj-y = init.o
-crypto-obj-y += hash.o
-crypto-obj-$(CONFIG_NETTLE) += hash-nettle.o
-crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += hash-gcrypt.o
-crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += hash-glib.o
-crypto-obj-y += hmac.o
-crypto-obj-$(CONFIG_NETTLE) += hmac-nettle.o
-crypto-obj-$(CONFIG_GCRYPT_HMAC) += hmac-gcrypt.o
-crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT_HMAC),n,y)) += hmac-glib.o
-crypto-obj-y += aes.o
-crypto-obj-y += desrfb.o
-crypto-obj-y += cipher.o
-crypto-obj-$(CONFIG_AF_ALG) += afalg.o
-crypto-obj-$(CONFIG_AF_ALG) += cipher-afalg.o
-crypto-obj-$(CONFIG_AF_ALG) += hash-afalg.o
-crypto-obj-$(CONFIG_GNUTLS) += tls-cipher-suites.o
-crypto-obj-y += tlscreds.o
-crypto-obj-y += tlscredsanon.o
-crypto-obj-y += tlscredspsk.o
-crypto-obj-y += tlscredsx509.o
-crypto-obj-y += tlssession.o
-crypto-obj-y += secret_common.o
-crypto-obj-y += secret.o
-crypto-obj-$(CONFIG_SECRET_KEYRING) += secret_keyring.o
-crypto-obj-y += pbkdf.o
-crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o
-crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o
-crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += pbkdf-stub.o
-crypto-obj-y += ivgen.o
-crypto-obj-y += ivgen-essiv.o
-crypto-obj-y += ivgen-plain.o
-crypto-obj-y += ivgen-plain64.o
-crypto-obj-y += afsplit.o
-crypto-obj-$(CONFIG_QEMU_PRIVATE_XTS) += xts.o
-crypto-obj-y += block.o
-crypto-obj-y += block-qcow.o
-crypto-obj-y += block-luks.o
diff --git a/crypto/meson.build b/crypto/meson.build
index 1b24431..7aab8db 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -1,3 +1,55 @@
+crypto_ss = ss.source_set()
+crypto_ss.add(genh)
+crypto_ss.add(files(
+ 'afsplit.c',
+ 'block-luks.c',
+ 'block-qcow.c',
+ 'block.c',
+ 'cipher.c',
+ 'desrfb.c',
+ 'hash.c',
+ 'hmac.c',
+ 'ivgen-essiv.c',
+ 'ivgen-plain.c',
+ 'ivgen-plain64.c',
+ 'ivgen.c',
+ 'pbkdf.c',
+ 'secret_common.c',
+ 'secret.c',
+ 'tlscreds.c',
+ 'tlscredsanon.c',
+ 'tlscredspsk.c',
+ 'tlscredsx509.c',
+ 'tlssession.c',
+))
+
+if 'CONFIG_GCRYPT' in config_host
+ wo_nettle = files('hash-gcrypt.c', 'pbkdf-gcrypt.c')
+else
+ wo_nettle = files('hash-glib.c', 'pbkdf-stub.c')
+endif
+if 'CONFIG_GCRYPT_HMAC' not in config_host
+ wo_nettle += files('hmac-glib.c')
+endif
+crypto_ss.add(when: [nettle, 'CONFIG_NETTLE'],
+ if_true: files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettle.c'),
+ if_false: wo_nettle)
+
+crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyring.c'))
+crypto_ss.add(when: 'CONFIG_QEMU_PRIVATE_XTS', if_true: files('xts.c'))
+crypto_ss.add(when: 'CONFIG_GCRYPT_HMAC', if_true: files('hmac-gcrypt.c'))
+crypto_ss.add(when: 'CONFIG_AF_ALG', if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'))
+crypto_ss.add(when: 'CONFIG_GNUTLS', if_true: files('tls-cipher-suites.c'))
+
+crypto_ss = crypto_ss.apply(config_host, strict: false)
+libcrypto = static_library('crypto', crypto_ss.sources(),
+ dependencies: [crypto_ss.dependencies()],
+ name_suffix: 'fa',
+ build_by_default: false)
+
+crypto = declare_dependency(link_whole: libcrypto,
+ dependencies: [authz, qom])
+
util_ss.add(files('aes.c'))
util_ss.add(files('init.c'))
if 'CONFIG_GCRYPT' in config_host
diff --git a/meson.build b/meson.build
index 81bd0d7..0864d07 100644
--- a/meson.build
+++ b/meson.build
@@ -300,6 +300,8 @@ subdir('qobject')
subdir('stubs')
subdir('trace')
subdir('util')
+subdir('qom')
+subdir('authz')
subdir('crypto')
subdir('storage-daemon')
subdir('ui')
@@ -316,8 +318,6 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
-subdir('qom')
-subdir('authz')
subdir('fsdev')
# Other build targets
diff --git a/qom/meson.build b/qom/meson.build
index 3c41ed3..4af044d 100644
--- a/qom/meson.build
+++ b/qom/meson.build
@@ -1,4 +1,5 @@
qom_ss = ss.source_set()
+qom_ss.add(genh)
qom_ss.add(files(
'container.c',
'object.c',
@@ -9,7 +10,6 @@ qom_ss.add(files(
qom_ss = qom_ss.apply(config_host, strict: false)
libqom = static_library('qom', qom_ss.sources(),
dependencies: [qom_ss.dependencies()],
- link_with: [libqemuutil],
name_suffix: 'fa')
qom = declare_dependency(link_whole: libqom)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 052/143] meson: convert io directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (50 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 051/143] meson: convert crypto " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 053/143] meson: convert target/s390x/gen-features.h Paolo Bonzini
` (95 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 -
Makefile.objs | 2 +-
Makefile.target | 2 +-
io/Makefile.objs | 12 ------------
io/meson.build | 25 +++++++++++++++++++++++++
meson.build | 1 +
6 files changed, 28 insertions(+), 15 deletions(-)
delete mode 100644 io/Makefile.objs
create mode 100644 io/meson.build
diff --git a/Makefile b/Makefile
index 67e932e..d775df4 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,6 @@ dummy := $(call unnest-vars,, \
block-obj-m \
storage-daemon-obj-y \
storage-daemon-obj-m \
- io-obj-y \
common-obj-y \
common-obj-m)
diff --git a/Makefile.objs b/Makefile.objs
index 018338d..0920cdb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -21,7 +21,7 @@ block-obj-m = block/
crypto-obj-y = crypto/libcrypto.fa
-io-obj-y = io/
+io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
diff --git a/Makefile.target b/Makefile.target
index b213955..f6b7a86 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -194,12 +194,12 @@ include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
authz-obj-y \
crypto-obj-y \
+ io-obj-y \
qom-obj-y)
dummy := $(call unnest-vars,.., \
block-obj-y \
block-obj-m \
chardev-obj-y \
- io-obj-y \
common-obj-y \
common-obj-m)
all-obj-y += $(common-obj-y)
diff --git a/io/Makefile.objs b/io/Makefile.objs
deleted file mode 100644
index 9a20fce..0000000
--- a/io/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-io-obj-y = channel.o
-io-obj-y += channel-buffer.o
-io-obj-y += channel-command.o
-io-obj-y += channel-file.o
-io-obj-y += channel-socket.o
-io-obj-y += channel-tls.o
-io-obj-y += channel-watch.o
-io-obj-y += channel-websock.o
-io-obj-y += channel-util.o
-io-obj-y += dns-resolver.o
-io-obj-y += net-listener.o
-io-obj-y += task.o
diff --git a/io/meson.build b/io/meson.build
new file mode 100644
index 0000000..062e011
--- /dev/null
+++ b/io/meson.build
@@ -0,0 +1,25 @@
+io_ss = ss.source_set()
+io_ss.add(genh)
+io_ss.add(files(
+ 'channel-buffer.c',
+ 'channel-command.c',
+ 'channel-file.c',
+ 'channel-socket.c',
+ 'channel-tls.c',
+ 'channel-util.c',
+ 'channel-watch.c',
+ 'channel-websock.c',
+ 'channel.c',
+ 'dns-resolver.c',
+ 'net-listener.c',
+ 'task.c',
+))
+
+io_ss = io_ss.apply(config_host, strict: false)
+libio = static_library('io', io_ss.sources(),
+ dependencies: [io_ss.dependencies()],
+ link_with: libqemuutil,
+ name_suffix: 'fa',
+ build_by_default: false)
+
+io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
diff --git a/meson.build b/meson.build
index 0864d07..7dbfc0b 100644
--- a/meson.build
+++ b/meson.build
@@ -318,6 +318,7 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+subdir('io')
subdir('fsdev')
# Other build targets
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 053/143] meson: convert target/s390x/gen-features.h
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (51 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 052/143] meson: convert io " Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 054/143] meson: infrastructure for building emulators Paolo Bonzini
` (94 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Needed by linux-user/s390x/cpu_loop.c.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 ++
meson.build | 1 +
target/meson.build | 1 +
target/s390x/Makefile.objs | 20 --------------------
target/s390x/cpu_features.h | 2 +-
target/s390x/cpu_models.h | 2 +-
target/s390x/meson.build | 8 ++++++++
7 files changed, 14 insertions(+), 22 deletions(-)
create mode 100644 target/meson.build
create mode 100644 target/s390x/meson.build
diff --git a/Makefile b/Makefile
index d775df4..1d4dfe8 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,8 @@ CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
generated-files-y = config-host.h
generated-files-y += module_block.h
+generated-files-y += target/s390x/gen-features.h
+target/s390x/gen-features.h: Makefile.ninja
generated-files-y += .git-submodule-status
diff --git a/meson.build b/meson.build
index 7dbfc0b..2c617ef 100644
--- a/meson.build
+++ b/meson.build
@@ -320,6 +320,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
subdir('io')
subdir('fsdev')
+subdir('target')
# Other build targets
if 'CONFIG_GUEST_AGENT' in config_host
diff --git a/target/meson.build b/target/meson.build
new file mode 100644
index 0000000..e29dd3e
--- /dev/null
+++ b/target/meson.build
@@ -0,0 +1 @@
+subdir('s390x')
diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
index 3e27455..9b9accc 100644
--- a/target/s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -8,23 +8,3 @@ obj-$(CONFIG_SOFTMMU) += sigp.o
obj-$(CONFIG_KVM) += kvm.o
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
-
-# build and run feature list generator
-feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/
-feat-dst = $(BUILD_DIR)/$(TARGET_DIR)
-ifneq ($(MAKECMDGOALS),clean)
-generated-files-y += $(feat-dst)gen-features.h
-endif
-
-$(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(feat-dst)gen-features.h-timestamp: $(feat-dst)gen-features
- $(call quiet-command,$< >$@,"GEN","$(TARGET_DIR)gen-features.h")
-
-$(feat-dst)gen-features: $(feat-src)gen-features.c
- $(call quiet-command,$(HOST_CC) $(QEMU_INCLUDES) -o $@ $<,"CC","$(TARGET_DIR)gen-features")
-
-clean-target:
- rm -f gen-features.h-timestamp
- rm -f gen-features.h
- rm -f gen-features
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index da695a8..2a29475 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -16,7 +16,7 @@
#include "qemu/bitmap.h"
#include "cpu_features_def.h"
-#include "gen-features.h"
+#include "target/s390x/gen-features.h"
/* CPU features are announced via different ways */
typedef enum {
diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index 88bd01a6..74d1f87 100644
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -14,7 +14,7 @@
#define TARGET_S390X_CPU_MODELS_H
#include "cpu_features.h"
-#include "gen-features.h"
+#include "target/s390x/gen-features.h"
#include "hw/core/cpu.h"
/* static CPU definition */
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
new file mode 100644
index 0000000..980f67c
--- /dev/null
+++ b/target/s390x/meson.build
@@ -0,0 +1,8 @@
+gen_features = executable('gen-features', 'gen-features.c', native: true)
+
+gen_features_h = custom_target('gen-features.h',
+ output: 'gen-features.h',
+ capture: true,
+ command: gen_features)
+
+specific_ss.add(gen_features_h)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 054/143] meson: infrastructure for building emulators
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (52 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 053/143] meson: convert target/s390x/gen-features.h Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 055/143] meson: add macos dependencies Paolo Bonzini
` (93 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 74 +++-------------------
Makefile.target | 19 +++---
configure | 6 --
hw/i386/fw_cfg.c | 2 +-
hw/i386/pc.c | 2 +-
hw/i386/pc_piix.c | 2 +-
hw/i386/x86.c | 2 +-
hw/vfio/pci-quirks.c | 2 +-
hw/virtio/virtio-mem.c | 2 +-
include/qemu/osdep.h | 2 +-
meson.build | 166 ++++++++++++++++++++++++++++++++++++++++++++++++-
rules.mak | 8 ---
scripts/create_config | 2 +
scripts/grepy.sh | 3 +
softmmu/qtest.c | 2 +-
util/meson.build | 5 +-
16 files changed, 193 insertions(+), 106 deletions(-)
create mode 100755 scripts/grepy.sh
diff --git a/Makefile b/Makefile
index 1d4dfe8..e5f68e0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,8 +105,6 @@ include $(SRC_PATH)/rules.mak
# lor is defined in rules.mak
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
-generated-files-y = config-host.h
-
generated-files-y += module_block.h
generated-files-y += target/s390x/gen-features.h
target/s390x/gen-features.h: Makefile.ninja
@@ -163,65 +161,6 @@ DOCS=
endif
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
-SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(filter %-softmmu, $(TARGET_DIRS)))
-SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK))
-
-ifeq ($(SUBDIR_DEVICES_MAK),)
-config-all-devices.mak: config-host.mak
- $(call quiet-command,echo '# no devices' > $@,"GEN","$@")
-else
-config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak
- $(call quiet-command, sed -n \
- 's|^\([^=]*\)=\(.*\)$$|\1:=$$(findstring y,$$(\1)\2)|p' \
- $(SUBDIR_DEVICES_MAK) | sort -u > $@, \
- "GEN","$@")
-endif
-
--include $(SUBDIR_DEVICES_MAK_DEP)
-
-# This has to be kept in sync with Kconfig.host.
-MINIKCONF_ARGS = \
- $(CONFIG_MINIKCONF_MODE) \
- $@ $*/config-devices.mak.d $< $(SRC_PATH)/Kconfig \
- CONFIG_TCG=$(CONFIG_TCG) \
- CONFIG_KVM=$(CONFIG_KVM) \
- CONFIG_SPICE=$(CONFIG_SPICE) \
- CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \
- CONFIG_TPM=$(CONFIG_TPM) \
- CONFIG_XEN=$(CONFIG_XEN) \
- CONFIG_OPENGL=$(CONFIG_OPENGL) \
- CONFIG_X11=$(CONFIG_X11) \
- CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \
- CONFIG_VHOST_KERNEL=$(CONFIG_VHOST_KERNEL) \
- CONFIG_VIRTFS=$(CONFIG_VIRTFS) \
- CONFIG_LINUX=$(CONFIG_LINUX) \
- CONFIG_PVRDMA=$(CONFIG_PVRDMA)
-
-MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py
-
-$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(SRC_PATH)/Kconfig $(BUILD_DIR)/config-host.mak
- $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \
- > $@.tmp, "GEN", "$@.tmp")
- $(call quiet-command, if test -f $@; then \
- if cmp -s $@.old $@; then \
- mv $@.tmp $@; \
- cp -p $@ $@.old; \
- else \
- if test -f $@.old; then \
- echo "WARNING: $@ (user modified) out of date.";\
- else \
- echo "WARNING: $@ out of date.";\
- fi; \
- echo "Run \"$(MAKE) defconfig\" to regenerate."; \
- rm $@.tmp; \
- fi; \
- else \
- mv $@.tmp $@; \
- cp -p $@ $@.old; \
- fi,"GEN","$@");
-
-defconfig:
- rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/Makefile.objs
@@ -264,10 +203,15 @@ $(SOFTMMU_FUZZ_RULES): $(io-obj-y)
$(SOFTMMU_FUZZ_RULES): config-all-devices.mak
$(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)
+# meson: this is sub-optimal but going away after conversion
+TARGET_DEPS = $(patsubst %,%-config-target.h, $(TARGET_DIRS))
+TARGET_DEPS += $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TARGET_DIRS)))
+TARGET_DEPS += $(patsubst %,libqemu-%.fa, $(TARGET_DIRS))
+
.PHONY: $(TARGET_DIRS_RULES)
# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
-$(TARGET_DIRS_RULES):
+$(TARGET_DIRS_RULES): $(TARGET_DEPS)
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
@@ -354,7 +298,6 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
- rm -f qemu-options.def
find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
@@ -363,8 +306,6 @@ clean: recurse-clean
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
- rm -f config-all-devices.mak
- rm -f $(SUBDIR_DEVICES_MAK)
VERSION ?= $(shell cat VERSION)
@@ -381,8 +322,7 @@ endef
distclean: clean
rm -f config-host.mak config-host.h* $(DOCS)
rm -f tests/tcg/config-*.mak
- rm -f config-all-devices.mak config-all-disas.mak config.status
- rm -f $(SUBDIR_DEVICES_MAK)
+ rm -f config-all-disas.mak config.status
rm -f po/*.mo tests/qemu-iotests/common.env
rm -f roms/seabios/config.mak roms/vgabios/config.mak
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
diff --git a/Makefile.target b/Makefile.target
index f6b7a86..43d2f97 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -6,8 +6,10 @@ include ../config-host.mak
include config-target.mak
include $(SRC_PATH)/rules.mak
+FULL_TARGET_NAME=$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-user)
+
ifdef CONFIG_SOFTMMU
-include config-devices.mak
+include ../$(FULL_TARGET_NAME)-config-devices.mak
endif
$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
@@ -18,6 +20,9 @@ QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_
QEMU_CFLAGS+=-iquote $(SRC_PATH)/include
+QEMU_CFLAGS += -DCONFIG_TARGET=\"../$(FULL_TARGET_NAME)-config-target.h\"
+QEMU_CFLAGS += -DCONFIG_DEVICES=\"../$(FULL_TARGET_NAME)-config-devices.h\"
+
ifdef CONFIG_USER_ONLY
# user emulator name
QEMU_PROG=qemu-$(TARGET_NAME)
@@ -36,15 +41,10 @@ QEMU_PROG_BUILD = $(QEMU_PROG)
endif
endif
+LIBQEMU = ../libqemu-$(FULL_TARGET_NAME).fa
PROGS=$(QEMU_PROG) $(QEMU_PROGW)
STPFILES=
-config-target.h: config-target.h-timestamp
-config-target.h-timestamp: config-target.mak
-
-config-devices.h: config-devices.h-timestamp
-config-devices.h-timestamp: config-devices.mak
-
ifdef CONFIG_TRACE_SYSTEMTAP
stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp $(QEMU_PROG)-log.stp
@@ -103,6 +103,7 @@ all: $(PROGS) stap
# Dummy command so that make thinks it has done something
@true
+obj-y += $(LIBQEMU)
obj-y += trace/
#########################################################
@@ -169,7 +170,6 @@ obj-y += hw/$(TARGET_BASE_ARCH)/
endif
generated-files-y += hmp-commands.h hmp-commands-info.h
-generated-files-y += config-devices.h
endif # CONFIG_SOFTMMU
@@ -210,7 +210,7 @@ all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
ifdef CONFIG_SOFTMMU
-$(QEMU_PROG_BUILD): config-devices.mak
+$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak
endif
COMMON_LDADDS = ../libqemuutil.a
@@ -262,5 +262,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp"
endif
-generated-files-y += config-target.h
Makefile: $(generated-files-y)
diff --git a/configure b/configure
index 3c54abf..bbb5cf3 100755
--- a/configure
+++ b/configure
@@ -8093,18 +8093,12 @@ fi
if supported_xen_target $target; then
echo "CONFIG_XEN=y" >> $config_target_mak
- echo "$target/config-devices.mak: CONFIG_XEN=y" >> $config_host_mak
if test "$xen_pci_passthrough" = yes; then
echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak"
fi
-else
- echo "$target/config-devices.mak: CONFIG_XEN=n" >> $config_host_mak
fi
if supported_kvm_target $target; then
echo "CONFIG_KVM=y" >> $config_target_mak
- echo "$target/config-devices.mak: CONFIG_KVM=y" >> $config_host_mak
-else
- echo "$target/config-devices.mak: CONFIG_KVM=n" >> $config_host_mak
fi
if supported_hax_target $target; then
echo "CONFIG_HAX=y" >> $config_target_mak
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index c55abfb..33441ad 100644
--- a/hw/i386/fw_cfg.c
+++ b/hw/i386/fw_cfg.c
@@ -22,7 +22,7 @@
#include "hw/nvram/fw_cfg.h"
#include "e820_memory_layout.h"
#include "kvm_i386.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 47c5ca3..cc616e4 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -92,10 +92,10 @@
#include "hw/mem/memory-device.h"
#include "sysemu/replay.h"
#include "qapi/qmp/qerror.h"
-#include "config-devices.h"
#include "e820_memory_layout.h"
#include "fw_cfg.h"
#include "trace.h"
+#include CONFIG_DEVICES
GlobalProperty pc_compat_5_0[] = {
};
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index b789e83..456e336 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
#include "qemu/units.h"
#include "hw/loader.h"
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 67bee1b..cf384b9 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -49,7 +49,7 @@
#include "multiboot.h"
#include "elf.h"
#include "standard-headers/asm-x86/bootparam.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
#include "kvm_i386.h"
#define BIOS_FILENAME "bios.bin"
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 3a14b7c..5715091 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
#include "exec/memop.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 7740fc6..8fbec77 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -29,7 +29,7 @@
#include "migration/misc.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
#include "trace.h"
/*
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 20872e7..412962d 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -29,7 +29,7 @@
#include "config-host.h"
#ifdef NEED_CPU_H
-#include "config-target.h"
+#include CONFIG_TARGET
#else
#include "exec/poison.h"
#endif
diff --git a/meson.build b/meson.build
index 2c617ef..f582de6 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,7 @@ ss = import('sourceset')
sh = find_program('sh')
cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
+config_all_disas = keyval.load(meson.current_build_dir() / 'config-all-disas.mak')
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
language: ['c', 'objc'])
@@ -130,16 +131,96 @@ if 'CONFIG_LIBUDEV' in config_host
libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
endif
+create_config = find_program('scripts/create_config')
+minikconf = find_program('scripts/minikconf.py')
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
have_system = false
+config_devices_mak_list = []
+config_devices_h = {}
+config_target_mak = {}
+kconfig_external_symbols = [
+ 'CONFIG_KVM',
+ 'CONFIG_XEN',
+ 'CONFIG_TPM',
+ 'CONFIG_SPICE',
+ 'CONFIG_IVSHMEM',
+ 'CONFIG_OPENGL',
+ 'CONFIG_X11',
+ 'CONFIG_VHOST_USER',
+ 'CONFIG_VHOST_KERNEL',
+ 'CONFIG_VIRTFS',
+ 'CONFIG_LINUX',
+ 'CONFIG_PVRDMA',
+]
foreach target : target_dirs
have_user = have_user or target.endswith('-user')
- have_system = have_system or target.endswith('-softmmu')
+ config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak') + config_host
+
+ if target.endswith('-softmmu')
+ have_system = true
+
+ base_kconfig = []
+ foreach sym : kconfig_external_symbols
+ if sym in config_target
+ base_kconfig += '@0@=y'.format(sym)
+ endif
+ endforeach
+
+ config_devices_mak = target + '-config-devices.mak'
+ config_devices_mak = configure_file(
+ input: ['default-configs' / target + '.mak', 'Kconfig'],
+ output: config_devices_mak,
+ depfile: config_devices_mak + '.d',
+ capture: true,
+ command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'],
+ config_devices_mak, '@DEPFILE@', '@INPUT@',
+ base_kconfig])
+ config_devices_h += {target: custom_target(
+ target + '-config-devices.h',
+ input: config_devices_mak,
+ output: target + '-config-devices.h',
+ capture: true,
+ command: [create_config, '@INPUT@'])}
+ config_devices_mak_list += config_devices_mak
+ config_target += keyval.load(config_devices_mak)
+ endif
+ config_target_mak += {target: config_target}
endforeach
have_tools = 'CONFIG_TOOLS' in config_host
have_block = have_system or have_tools
+grepy = find_program('scripts/grepy.sh')
+# This configuration is used to build files that are shared by
+# multiple binaries, and then extracted out of the "common"
+# static_library target.
+#
+# We do not use all_sources()/all_dependencies(), because it would
+# build literally all source files, including devices only used by
+# targets that are not built for this compilation. The CONFIG_ALL
+# pseudo symbol replaces it.
+
+if have_system
+ config_all_devices_mak = configure_file(
+ output: 'config-all-devices.mak',
+ input: config_devices_mak_list,
+ capture: true,
+ command: [grepy, '@INPUT@'],
+ )
+ config_all_devices = keyval.load(config_all_devices_mak)
+ config_all = config_all_devices
+else
+ config_all = {}
+endif
+config_all += config_host
+config_all += config_all_disas
+config_all += {
+ 'CONFIG_XEN': config_host.has_key('CONFIG_XEN_BACKEND'),
+ 'CONFIG_SOFTMMU': have_system,
+ 'CONFIG_USER_ONLY': have_user,
+ 'CONFIG_ALL': true,
+}
+
# Generators
genh = []
@@ -175,6 +256,13 @@ qemu_version = custom_target('qemu-version.h',
build_always_stale: true)
genh += qemu_version
+config_host_h = custom_target('config-host.h',
+ input: meson.current_build_dir() / 'config-host.mak',
+ output: 'config-host.h',
+ capture: true,
+ command: [create_config, '@INPUT@'])
+genh += config_host_h
+
hxdep = []
hx_headers = [
['qemu-options.hx', 'qemu-options.def'],
@@ -200,6 +288,16 @@ endforeach
util_ss = ss.source_set()
stub_ss = ss.source_set()
trace_ss = ss.source_set()
+common_ss = ss.source_set()
+softmmu_ss = ss.source_set()
+user_ss = ss.source_set()
+bsd_user_ss = ss.source_set()
+linux_user_ss = ss.source_set()
+specific_ss = ss.source_set()
+
+hw_arch = {}
+target_arch = {}
+target_softmmu_arch = {}
###############
# Trace files #
@@ -308,10 +406,10 @@ subdir('ui')
# Build targets from sourcesets
-stub_ss = stub_ss.apply(config_host, strict: false)
+stub_ss = stub_ss.apply(config_all, strict: false)
util_ss.add_all(trace_ss)
-util_ss = util_ss.apply(config_host, strict: false)
+util_ss = util_ss.apply(config_all, strict: false)
libqemuutil = static_library('qemuutil',
sources: util_ss.sources() + stub_ss.sources() + genh,
dependencies: [util_ss.dependencies(), m, glib, socket])
@@ -322,6 +420,68 @@ subdir('io')
subdir('fsdev')
subdir('target')
+common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss)
+common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
+
+common_all = common_ss.apply(config_all, strict: false)
+common_all = static_library('common',
+ build_by_default: false,
+ sources: common_all.sources() + genh,
+ dependencies: common_all.dependencies(),
+ name_suffix: 'fa')
+
+foreach target : target_dirs
+ config_target = config_target_mak[target]
+ target_name = config_target['TARGET_NAME']
+ arch = config_target['TARGET_BASE_ARCH']
+ arch_srcs = []
+
+ target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
+ if host_machine.system() == 'linux'
+ target_inc += include_directories('linux-headers', is_system: true)
+ endif
+ if target.endswith('-softmmu')
+ qemu_target_name = 'qemu-system-' + target_name
+ target_type='system'
+ arch_srcs += config_devices_h[target]
+ else
+ target_type='user'
+ qemu_target_name = 'qemu-' + target_name
+ if 'CONFIG_LINUX_USER' in config_target
+ base_dir = 'linux-user'
+ target_inc += include_directories('linux-user/host/' / config_host['ARCH'])
+ else
+ base_dir = 'bsd-user'
+ endif
+ target_inc += include_directories(
+ base_dir,
+ base_dir / config_target['TARGET_ABI_DIR'],
+ )
+ endif
+
+ target_common = common_ss.apply(config_target, strict: false)
+ objects = common_all.extract_objects(target_common.sources())
+
+ # TODO: Change to generator once obj-y goes away
+ config_target_h = custom_target(target + '-config-target.h',
+ input: meson.current_build_dir() / target / 'config-target.mak',
+ output: target + '-config-target.h',
+ capture: true,
+ command: [create_config, '@INPUT@'])
+
+ target_specific = specific_ss.apply(config_target, strict: false)
+ arch_srcs += target_specific.sources()
+
+ static_library('qemu-' + target,
+ sources: arch_srcs + [config_target_h] + genh,
+ objects: objects,
+ include_directories: target_inc,
+ c_args: ['-DNEED_CPU_H',
+ '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
+ '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)],
+ name_suffix: 'fa')
+endforeach
+
# Other build targets
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
diff --git a/rules.mak b/rules.mak
index 1aa6394..d8d35f7 100644
--- a/rules.mak
+++ b/rules.mak
@@ -203,14 +203,6 @@ notempty = $(if $1,y,n)
# Generate files with tracetool
TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
-# Generate timestamp files for .h include files
-
-config-%.h: config-%.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-
-config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config
- $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@,"GEN","$(TARGET_DIR)config-$*.h")
-
.PHONY: clean-timestamp
clean-timestamp:
rm -f *.timestamp
diff --git a/scripts/create_config b/scripts/create_config
index 6d8f08b..bc82661 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -1,5 +1,7 @@
#!/bin/sh
+test $# -gt 0 && exec < $1
+
echo "/* Automatically generated by create_config - do not modify */"
while read line; do
diff --git a/scripts/grepy.sh b/scripts/grepy.sh
new file mode 100755
index 0000000..33c74c6
--- /dev/null
+++ b/scripts/grepy.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep --no-filename '=y$' "$@" | sort -u
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index 5672b75..4e439ca 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -27,7 +27,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/cutils.h"
-#include "config-devices.h"
+#include CONFIG_DEVICES
#ifdef CONFIG_PSERIES
#include "hw/ppc/spapr_rtas.h"
#endif
diff --git a/util/meson.build b/util/meson.build
index 62113ba..9ee7425 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -62,7 +62,4 @@ util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c'))
util_ss.add(files('guest-random.c'))
util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio])
-
-if have_user then
- util_ss.add(files('selfmap.c'))
-endif
+util_ss.add(when: 'CONFIG_USER_ONLY', if_true: [files('selfmap.c')])
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 055/143] meson: add macos dependencies
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (53 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 054/143] meson: infrastructure for building emulators Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 056/143] meson: add modules infrastructure Paolo Bonzini
` (92 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
There is no probing in configure, so no need to pass them as
variables to meson. Do a regular meson dependency() instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/meson.build b/meson.build
index f582de6..fd2086e 100644
--- a/meson.build
+++ b/meson.build
@@ -48,6 +48,10 @@ m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
version_res = []
+coref = []
+iokit = []
+cocoa = []
+hvf = []
if host_machine.system() == 'windows'
socket = cc.find_library('ws2_32')
@@ -55,6 +59,11 @@ if host_machine.system() == 'windows'
version_res = win.compile_resources('version.rc',
depend_files: files('pc-bios/qemu-nsis.ico'),
include_directories: include_directories('.'))
+elif host_machine.system() == 'darwin'
+ coref = dependency('appleframeworks', modules: 'CoreFoundation')
+ iokit = dependency('appleframeworks', modules: 'IOKit')
+ cocoa = dependency('appleframeworks', modules: 'Cocoa')
+ hvf = dependency('appleframeworks', modules: 'Hypervisor')
endif
glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
link_args: config_host['GLIB_LIBS'].split())
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 056/143] meson: add modules infrastructure
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (54 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 055/143] meson: add macos dependencies Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 057/143] meson: convert chardev directory to Meson (tools part) Paolo Bonzini
` (91 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 10 +---------
Makefile.target | 6 ++++++
meson.build | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
rules.mak | 10 +++++-----
scripts/undefsym.sh | 20 ++++++++++++++++++++
5 files changed, 84 insertions(+), 14 deletions(-)
create mode 100755 scripts/undefsym.sh
diff --git a/Makefile b/Makefile
index e5f68e0..82527d0 100644
--- a/Makefile
+++ b/Makefile
@@ -251,7 +251,7 @@ slirp/all: .git-submodule-status
CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")
$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
- $(qom-obj-y)
+ $(qom-obj-y) block.syms qemu.syms
$(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
$(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))
@@ -461,14 +461,6 @@ install: all $(if $(BUILD_DOCS),install-doc) \
ifneq ($(TOOLS),)
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
endif
-ifneq ($(CONFIG_MODULES),)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
- for s in $(modules-m:.mo=$(DSOSUF)); do \
- t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
- $(INSTALL_LIB) $$s "$$t"; \
- test -z "$(STRIP)" || $(STRIP) "$$t"; \
- done
-endif
ifneq ($(HELPERS-y),)
$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
endif
diff --git a/Makefile.target b/Makefile.target
index 43d2f97..d1d8906 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,6 +162,12 @@ obj-y += qapi/
obj-y += migration/ram.o
LIBS := $(libs_softmmu) $(LIBS)
+# Temporary until emulators are linked by Meson
+LIBS := $(LIBS) @../block.syms @../qemu.syms
+ifneq ($(CONFIG_MODULES),y)
+LIBS := $(LIBS)
+endif
+
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
obj-y += hw/sparc64/
diff --git a/meson.build b/meson.build
index fd2086e..9d745f8 100644
--- a/meson.build
+++ b/meson.build
@@ -10,6 +10,7 @@ sh = find_program('sh')
cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
config_all_disas = keyval.load(meson.current_build_dir() / 'config-all-disas.mak')
+enable_modules = 'CONFIG_MODULES' in config_host
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
language: ['c', 'objc'])
@@ -297,6 +298,7 @@ endforeach
util_ss = ss.source_set()
stub_ss = ss.source_set()
trace_ss = ss.source_set()
+block_ss = ss.source_set()
common_ss = ss.source_set()
softmmu_ss = ss.source_set()
user_ss = ss.source_set()
@@ -304,6 +306,7 @@ bsd_user_ss = ss.source_set()
linux_user_ss = ss.source_set()
specific_ss = ss.source_set()
+modules = {}
hw_arch = {}
target_arch = {}
target_softmmu_arch = {}
@@ -413,6 +416,12 @@ subdir('crypto')
subdir('storage-daemon')
subdir('ui')
+
+if enable_modules
+ libmodulecommon = static_library('module-common', files('module-common.c') + genh, pic: true, c_args: '-DBUILD_DSO')
+ modulecommon = declare_dependency(link_whole: libmodulecommon, compile_args: '-DBUILD_DSO')
+endif
+
# Build targets from sourcesets
stub_ss = stub_ss.apply(config_all, strict: false)
@@ -429,6 +438,49 @@ subdir('io')
subdir('fsdev')
subdir('target')
+mods = []
+block_mods = []
+softmmu_mods = []
+foreach d, list : modules
+ foreach m : list
+ if enable_modules and host_machine.system() != 'windows'
+ sl = static_library(d + '-' + m[0], m[1], dependencies: m[2], pic: true)
+ if d == 'block'
+ block_mods += sl
+ else
+ softmmu_mods += sl
+ endif
+ mods += {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]}
+ else
+ if d == 'block'
+ block_ss.add(when: [m.get(3, []), m[2]], if_true: m[1])
+ else
+ softmmu_ss.add(when: [m.get(3, []), m[2]], if_true: m[1])
+ endif
+ endif
+ endforeach
+endforeach
+
+nm = find_program('nm')
+undefsym = find_program('scripts/undefsym.sh')
+block_syms = custom_target('block.syms', output: 'block.syms',
+ input: [libqemuutil, block_mods],
+ capture: true,
+ command: [undefsym, nm, '@INPUT@'])
+qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
+ input: [libqemuutil, softmmu_mods],
+ capture: true,
+ command: [undefsym, nm, '@INPUT@'])
+
+
+foreach m : mods
+ shared_module(m['dir'] + '-' + m['name'],
+ name_prefix: '',
+ link_whole: m['lib'],
+ install: true,
+ install_dir: config_host['qemu_moddir'])
+endforeach
+
common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss)
common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
diff --git a/rules.mak b/rules.mak
index d8d35f7..9da9dcd 100644
--- a/rules.mak
+++ b/rules.mak
@@ -61,17 +61,17 @@ endif
# This is necessary because the exectuable itself may not use the function, in
# which case the function would not be linked in. Then the DSO loading will
# fail because of the missing symbol.
-process-archive-undefs = $(filter-out %.a %.fa %.mo,$1) \
+process-archive-undefs = $(filter-out %.a %.fa %.mo %$(DSOSUF),$1) \
$(addprefix $(WL_U), \
$(filter $(call defined-symbols,$(filter %.a %.fa, $1)), \
- $(call undefined-symbols,$(filter %.mo,$1)))) \
+ $(call undefined-symbols,$(filter %.mo %$(DSOSUF),$1)))) \
$(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \
$(filter %.a,$1)
-extract-libs = $(strip $(foreach o,$(filter-out %.mo,$1),$($o-libs)))
+extract-libs = $(strip $(foreach o,$(filter-out %.mo %$(DSOSUF),$1),$($o-libs)))
expand-objs = $(strip $(sort $(filter %.o,$1)) \
- $(foreach o,$(filter %.mo,$1),$($o-objs)) \
- $(filter-out %.o %.mo,$1))
+ $(foreach o,$(filter %.mo %$(DSOSUF),$1),$($o-objs)) \
+ $(filter-out %.o %.mo %$(DSOSUF),$1))
%.o: %.c
@mkdir -p $(dir $@)
diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh
new file mode 100755
index 0000000..d4871f0
--- /dev/null
+++ b/scripts/undefsym.sh
@@ -0,0 +1,20 @@
+#! /bin/bash
+
+# Before a shared module's DSO is produced, a static library is built for it
+# and passed to this script. The script generates -Wl,-u options to force
+# the inclusion of symbol from libqemuutil.a if the shared modules need them,
+# This is necessary because the modules may use functions not needed by the
+# executable itself, which would cause the function to not be linked in.
+# Then the DSO loading would fail because of the missing symbol.
+
+if test $# -le 2; then
+ exit 0
+fi
+
+NM=$1
+staticlib=$2
+shift 2
+# Find symbols defined in static libraries and undefined in shared modules
+comm -12 \
+ <( $NM -P -g $staticlib | awk '$2!="U"{print "-Wl,-u," $1}' | sort -u) \
+ <( $NM -P -g "$@" | awk '$2=="U"{print "-Wl,-u," $1}' | sort -u)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 057/143] meson: convert chardev directory to Meson (tools part)
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (55 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 056/143] meson: add modules infrastructure Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 13:29 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 058/143] meson: convert block Paolo Bonzini
` (90 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 1 -
Makefile.objs | 4 ++--
Makefile.target | 2 +-
chardev/Makefile.objs | 19 -------------------
chardev/meson.build | 32 ++++++++++++++++++++++++++++++++
meson.build | 1 +
6 files changed, 36 insertions(+), 23 deletions(-)
create mode 100644 chardev/meson.build
diff --git a/Makefile b/Makefile
index 82527d0..92f3da9 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,6 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- chardev-obj-y \
block-obj-y \
block-obj-m \
storage-daemon-obj-y \
diff --git a/Makefile.objs b/Makefile.objs
index 0920cdb..297bd5b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -7,8 +7,6 @@ qom-obj-y = qom/libqom.fa
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
-chardev-obj-y = chardev/
-
authz-obj-y = authz/libauthz.fa
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
@@ -19,6 +17,8 @@ block-obj-$(CONFIG_REPLICATION) += replication.o
block-obj-m = block/
+chardev-obj-y = chardev/libchardev.fa
+
crypto-obj-y = crypto/libcrypto.fa
io-obj-y = io/libio.fa
diff --git a/Makefile.target b/Makefile.target
index d1d8906..6b9de09 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -199,13 +199,13 @@ common-obj-m :=
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
authz-obj-y \
+ chardev-obj-y \
crypto-obj-y \
io-obj-y \
qom-obj-y)
dummy := $(call unnest-vars,.., \
block-obj-y \
block-obj-m \
- chardev-obj-y \
common-obj-y \
common-obj-m)
all-obj-y += $(common-obj-y)
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
index 3783dad..6662d0d 100644
--- a/chardev/Makefile.objs
+++ b/chardev/Makefile.objs
@@ -1,23 +1,4 @@
-chardev-obj-y += char.o
chardev-obj-$(CONFIG_SOFTMMU) += chardev-sysemu.o
-chardev-obj-$(CONFIG_WIN32) += char-console.o
-chardev-obj-$(CONFIG_POSIX) += char-fd.o
-chardev-obj-y += char-fe.o
-chardev-obj-y += char-file.o
-chardev-obj-y += char-io.o
-chardev-obj-y += char-mux.o
-chardev-obj-y += char-null.o
-chardev-obj-$(CONFIG_POSIX) += char-parallel.o
-chardev-obj-y += char-pipe.o
-chardev-obj-$(CONFIG_POSIX) += char-pty.o
-chardev-obj-y += char-ringbuf.o
-chardev-obj-y += char-serial.o
-chardev-obj-y += char-socket.o
-chardev-obj-y += char-stdio.o
-chardev-obj-y += char-udp.o
-chardev-obj-$(CONFIG_WIN32) += char-win.o
-chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
-
common-obj-$(CONFIG_SOFTMMU) += msmouse.o wctablet.o testdev.o
ifeq ($(CONFIG_BRLAPI),y)
diff --git a/chardev/meson.build b/chardev/meson.build
new file mode 100644
index 0000000..a2e671d
--- /dev/null
+++ b/chardev/meson.build
@@ -0,0 +1,32 @@
+chardev_ss = ss.source_set()
+chardev_ss.add(files(
+ 'char-fe.c',
+ 'char-file.c',
+ 'char-io.c',
+ 'char-mux.c',
+ 'char-null.c',
+ 'char-pipe.c',
+ 'char-ringbuf.c',
+ 'char-serial.c',
+ 'char-socket.c',
+ 'char-stdio.c',
+ 'char-udp.c',
+ 'char.c',
+))
+chardev_ss.add(when: 'CONFIG_POSIX', if_true: files(
+ 'char-fd.c',
+ 'char-parallel.c',
+ 'char-pty.c',
+))
+chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
+ 'char-console.c',
+ 'char-win-stdio.c',
+ 'char-win.c',
+))
+
+chardev_ss = chardev_ss.apply(config_host, strict: false)
+libchardev = static_library('chardev', chardev_ss.sources(),
+ name_suffix: 'fa',
+ build_by_default: false)
+
+chardev = declare_dependency(link_whole: libchardev)
diff --git a/meson.build b/meson.build
index 9d745f8..9c7eb50 100644
--- a/meson.build
+++ b/meson.build
@@ -435,6 +435,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
subdir('io')
+subdir('chardev')
subdir('fsdev')
subdir('target')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 058/143] meson: convert block
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (56 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 057/143] meson: convert chardev directory to Meson (tools part) Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 059/143] meson: qemu-{img,io,nbd} Paolo Bonzini
` (89 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 8 ---
Makefile.objs | 29 ++++++++---
Makefile.target | 3 +-
block.c | 2 +-
block/Makefile.objs | 75 ---------------------------
block/meson.build | 111 ++++++++++++++++++++++++++++++++++++++++
block/monitor/Makefile.objs | 2 -
block/monitor/meson.build | 2 +
configure | 10 ++--
meson.build | 63 +++++++++++++++++++++++
nbd/Makefile.objs | 1 -
nbd/meson.build | 5 ++
rules.mak | 3 +-
scripts/modules/module_block.py | 0
scsi/Makefile.objs | 4 --
scsi/meson.build | 4 ++
16 files changed, 218 insertions(+), 104 deletions(-)
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
delete mode 100644 nbd/Makefile.objs
create mode 100644 nbd/meson.build
mode change 100644 => 100755 scripts/modules/module_block.py
delete mode 100644 scsi/Makefile.objs
create mode 100644 scsi/meson.build
diff --git a/Makefile b/Makefile
index 92f3da9..aa47783 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,6 @@ include $(SRC_PATH)/rules.mak
# lor is defined in rules.mak
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
-generated-files-y += module_block.h
generated-files-y += target/s390x/gen-features.h
target/s390x/gen-features.h: Makefile.ninja
@@ -167,8 +166,6 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- block-obj-y \
- block-obj-m \
storage-daemon-obj-y \
storage-daemon-obj-m \
common-obj-y \
@@ -289,11 +286,6 @@ ifdef CONFIG_MPATH
scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
endif
-module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
- $(call quiet-command,$(PYTHON) $< $@ \
- $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
- "GEN","$@")
-
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/Makefile.objs b/Makefile.objs
index 297bd5b..f79ff89 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -10,12 +10,19 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
authz-obj-y = authz/libauthz.fa
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
-block-obj-y = block/ nbd/ scsi/
-block-obj-y += block.o blockjob.o job.o
-block-obj-y += qemu-io-cmds.o
-block-obj-$(CONFIG_REPLICATION) += replication.o
-
-block-obj-m = block/
+block-obj-y += libblock.fa
+
+libblock.fa-libs = $(LIBNFS_LIBS)
+libblock.fa-libs += $(LIBISCSI_LIBS)
+libblock.fa-libs += $(CURL_LIBS)
+libblock.fa-libs += $(RBD_LIBS)
+libblock.fa-libs += $(GLUSTERFS_LIBS)
+libblock.fa-libs += $(VXHS_LIBS)
+libblock.fa-libs += $(LIBSSH_LIBS)
+libblock.fa-libs += $(BZIP2_LIBS)
+libblock.fa-libs += $(LZFSE_LIBS)
+libblock.fa-libs += $(if $(CONFIG_LINUX_AIO),-laio)
+libblock.fa-libs += $(LIBXML2_LIBS)
chardev-obj-y = chardev/libchardev.fa
@@ -55,6 +62,16 @@ common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
common-obj-y += migration/
+common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF)
+common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF)
+common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF)
+common-obj-$(if $(CONFIG_LIBNFS),m) += block-nfs$(DSOSUF)
+common-obj-$(if $(CONFIG_LIBSSH),m) += block-ssh$(DSOSUF)
+common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
+
+common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
+common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF)
+
common-obj-y += audio/
common-obj-m += audio/
common-obj-y += hw/
diff --git a/Makefile.target b/Makefile.target
index 6b9de09..c0575da 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -199,13 +199,12 @@ common-obj-m :=
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
authz-obj-y \
+ block-obj-y \
chardev-obj-y \
crypto-obj-y \
io-obj-y \
qom-obj-y)
dummy := $(call unnest-vars,.., \
- block-obj-y \
- block-obj-m \
common-obj-y \
common-obj-m)
all-obj-y += $(common-obj-y)
diff --git a/block.c b/block.c
index d9ac0e0..67c5028 100644
--- a/block.c
+++ b/block.c
@@ -29,7 +29,7 @@
#include "block/nbd.h"
#include "block/qdict.h"
#include "qemu/error-report.h"
-#include "module_block.h"
+#include "block/module_block.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
diff --git a/block/Makefile.objs b/block/Makefile.objs
deleted file mode 100644
index 19c6f37..0000000
--- a/block/Makefile.objs
+++ /dev/null
@@ -1,75 +0,0 @@
-block-obj-y += raw-format.o vmdk.o vpc.o
-block-obj-$(CONFIG_QCOW1) += qcow.o
-block-obj-$(CONFIG_VDI) += vdi.o
-block-obj-$(CONFIG_CLOOP) += cloop.o
-block-obj-$(CONFIG_BOCHS) += bochs.o
-block-obj-$(CONFIG_VVFAT) += vvfat.o
-block-obj-$(CONFIG_DMG) += dmg.o
-
-block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o qcow2-threads.o
-block-obj-$(CONFIG_QED) += qed.o qed-l2-cache.o qed-table.o qed-cluster.o
-block-obj-$(CONFIG_QED) += qed-check.o
-block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
-block-obj-y += quorum.o
-block-obj-y += blkdebug.o blkverify.o blkreplay.o
-block-obj-$(CONFIG_PARALLELS) += parallels.o
-block-obj-y += blklogwrites.o
-block-obj-y += block-backend.o snapshot.o qapi.o
-block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o
-block-obj-$(CONFIG_POSIX) += file-posix.o
-block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
-block-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o
-block-obj-y += null.o mirror.o commit.o io.o create.o amend.o
-block-obj-y += throttle-groups.o
-block-obj-$(CONFIG_LINUX) += nvme.o
-
-block-obj-y += nbd.o
-block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o
-block-obj-$(CONFIG_LIBISCSI) += iscsi.o
-block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
-block-obj-$(CONFIG_LIBNFS) += nfs.o
-block-obj-$(CONFIG_CURL) += curl.o
-block-obj-$(CONFIG_RBD) += rbd.o
-block-obj-$(CONFIG_GLUSTERFS) += gluster.o
-block-obj-$(CONFIG_LIBSSH) += ssh.o
-block-obj-y += accounting.o dirty-bitmap.o
-block-obj-y += write-threshold.o
-block-obj-y += backup.o
-block-obj-$(CONFIG_REPLICATION) += replication.o
-block-obj-y += throttle.o copy-on-read.o
-block-obj-y += block-copy.o
-
-block-obj-y += crypto.o
-
-block-obj-y += aio_task.o
-block-obj-y += backup-top.o
-block-obj-y += filter-compress.o
-common-obj-y += monitor/
-block-obj-y += monitor/
-
-block-obj-y += stream.o
-
-common-obj-y += qapi-sysemu.o
-
-nfs.o-libs := $(LIBNFS_LIBS)
-iscsi.o-cflags := $(LIBISCSI_CFLAGS)
-iscsi.o-libs := $(LIBISCSI_LIBS)
-curl.o-cflags := $(CURL_CFLAGS)
-curl.o-libs := $(CURL_LIBS)
-rbd.o-cflags := $(RBD_CFLAGS)
-rbd.o-libs := $(RBD_LIBS)
-gluster.o-cflags := $(GLUSTERFS_CFLAGS)
-gluster.o-libs := $(GLUSTERFS_LIBS)
-ssh.o-cflags := $(LIBSSH_CFLAGS)
-ssh.o-libs := $(LIBSSH_LIBS)
-block-obj-dmg-bz2-$(CONFIG_BZIP2) += dmg-bz2.o
-block-obj-$(if $(CONFIG_DMG),m,n) += $(block-obj-dmg-bz2-y)
-dmg-bz2.o-libs := $(BZIP2_LIBS)
-block-obj-$(if $(CONFIG_LZFSE),m,n) += dmg-lzfse.o
-dmg-lzfse.o-libs := $(LZFSE_LIBS)
-qcow.o-libs := -lz
-linux-aio.o-libs := -laio
-io_uring.o-cflags := $(LINUX_IO_URING_CFLAGS)
-io_uring.o-libs := $(LINUX_IO_URING_LIBS)
-parallels.o-cflags := $(LIBXML2_CFLAGS)
-parallels.o-libs := $(LIBXML2_LIBS)
diff --git a/block/meson.build b/block/meson.build
new file mode 100644
index 0000000..c59e9eb
--- /dev/null
+++ b/block/meson.build
@@ -0,0 +1,111 @@
+block_ss.add(genh)
+block_ss.add(files(
+ 'accounting.c',
+ 'aio_task.c',
+ 'amend.c',
+ 'backup.c',
+ 'backup-top.c',
+ 'blkdebug.c',
+ 'blklogwrites.c',
+ 'blkreplay.c',
+ 'blkverify.c',
+ 'block-backend.c',
+ 'block-copy.c',
+ 'commit.c',
+ 'copy-on-read.c',
+ 'create.c',
+ 'crypto.c',
+ 'dirty-bitmap.c',
+ 'filter-compress.c',
+ 'io.c',
+ 'mirror.c',
+ 'nbd.c',
+ 'null.c',
+ 'qapi.c',
+ 'qcow2-bitmap.c',
+ 'qcow2-cache.c',
+ 'qcow2-cluster.c',
+ 'qcow2-refcount.c',
+ 'qcow2-snapshot.c',
+ 'qcow2-threads.c',
+ 'qcow2.c',
+ 'quorum.c',
+ 'raw-format.c',
+ 'snapshot.c',
+ 'throttle-groups.c',
+ 'throttle.c',
+ 'vhdx-endian.c',
+ 'vhdx-log.c',
+ 'vhdx.c',
+ 'vmdk.c',
+ 'vpc.c',
+ 'write-threshold.c',
+))
+
+block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c'))
+block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
+block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
+block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c'))
+block_ss.add(when: 'CONFIG_VVFAT', if_true: files('vvfat.c'))
+block_ss.add(when: 'CONFIG_DMG', if_true: files('dmg.c'))
+block_ss.add(when: 'CONFIG_QED', if_true: files(
+ 'qed-check.c',
+ 'qed-cluster.c',
+ 'qed-l2-cache.c',
+ 'qed-table.c',
+ 'qed.c',
+))
+block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], if_true: files('parallels.c'))
+block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c'))
+block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit])
+block_ss.add(when: 'CONFIG_LIBISCSI', if_true: files('iscsi-opts.c'))
+block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c'))
+block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
+block_ss.add(when: 'CONFIG_SHEEPDOG', if_true: files('sheepdog.c'))
+block_ss.add(when: ['CONFIG_LINUX_AIO', libaio], if_true: files('linux-aio.c'))
+block_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('io_uring.c'))
+
+block_modules = []
+
+modsrc = []
+foreach m : [
+ ['CONFIG_CURL', 'curl', [curl, glib], 'curl.c'],
+ ['CONFIG_GLUSTERFS', 'gluster', glusterfs, 'gluster.c'],
+ ['CONFIG_LIBISCSI', 'iscsi', libiscsi, 'iscsi.c'],
+ ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'],
+ ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'],
+ ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'],
+]
+ if config_host.has_key(m[0])
+ if enable_modules
+ modsrc += files(m[3])
+ endif
+ block_modules += [[m[1], files(m[3]), m[2]]]
+ endif
+endforeach
+
+# those are not exactly regular block modules, so treat them apart
+if 'CONFIG_DMG' in config_host
+ foreach m : [
+ ['CONFIG_LZFSE', 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'],
+ ['CONFIG_BZIP2', 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c']
+ ]
+ if config_host.has_key(m[0])
+ block_modules += [[m[1], files(m[3]), m[2]]]
+ endif
+ endforeach
+endif
+
+module_block_py = find_program('scripts/modules/module_block.py')
+module_block_h = custom_target('module_block.h',
+ output: 'module_block.h',
+ input: modsrc,
+ command: [module_block_py, '@OUTPUT0@', modsrc])
+block_ss.add(module_block_h)
+
+block_ss.add(files('stream.c'))
+
+softmmu_ss.add(files('qapi-sysemu.c'))
+subdir('monitor')
+
+modules += {'block': block_modules}
diff --git a/block/monitor/Makefile.objs b/block/monitor/Makefile.objs
deleted file mode 100644
index 39acf85..0000000
--- a/block/monitor/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-y += block-hmp-cmds.o
-block-obj-y += bitmap-qmp-cmds.o
diff --git a/block/monitor/meson.build b/block/monitor/meson.build
new file mode 100644
index 0000000..374aac1
--- /dev/null
+++ b/block/monitor/meson.build
@@ -0,0 +1,2 @@
+softmmu_ss.add(files('block-hmp-cmds.c'))
+block_ss.add(files('bitmap-qmp-cmds.c'))
diff --git a/configure b/configure
index bbb5cf3..2af211f 100755
--- a/configure
+++ b/configure
@@ -4042,7 +4042,8 @@ if test "$zlib" != "no" ; then
int main(void) { zlibVersion(); return 0; }
EOF
if compile_prog "" "-lz" ; then
- LIBS="$LIBS -lz"
+ zlib_libs=-lz
+ LIBS="$LIBS $zlib_libs"
else
error_exit "zlib check failed" \
"Make sure to have the zlib libs and headers installed."
@@ -7319,7 +7320,11 @@ fi
if test "$posix_memalign" = "yes" ; then
echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak
fi
-
+if test "$zlib" != "no" ; then
+ echo "CONFIG_ZLIB=y" >> $config_host_mak
+ echo "ZLIB_CFLAGS=$zlib_cflags" >> $config_host_mak
+ echo "ZLIB_LIBS=$zlib_libs" >> $config_host_mak
+fi
if test "$spice" = "yes" ; then
echo "CONFIG_SPICE=y" >> $config_host_mak
fi
@@ -7421,7 +7426,6 @@ if test "$qom_cast_debug" = "yes" ; then
fi
if test "$rbd" = "yes" ; then
echo "CONFIG_RBD=m" >> $config_host_mak
- echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 9c7eb50..ea52f43 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,26 @@ pam = not_found
if 'CONFIG_AUTH_PAM' in config_host
pam = cc.find_library('pam')
endif
+libaio = cc.find_library('aio', required: false)
+zlib = not_found
+if 'CONFIG_ZLIB' in config_host
+ zlib = declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].split(),
+ link_args: config_host['ZLIB_LIBS'].split())
+endif
+linux_io_uring = not_found
+if 'CONFIG_LINUX_IO_URING' in config_host
+ linux_io_uring = declare_dependency(compile_args: config_host['LINUX_IO_URING_CFLAGS'].split(),
+ link_args: config_host['LINUX_IO_URING_LIBS'].split())
+endif
+libxml2 = not_found
+if 'CONFIG_LIBXML2' in config_host
+ libxml2 = declare_dependency(compile_args: config_host['LIBXML2_CFLAGS'].split(),
+ link_args: config_host['LIBXML2_LIBS'].split())
+endif
+libnfs = not_found
+if 'CONFIG_LIBNFS' in config_host
+ libnfs = declare_dependency(link_args: config_host['LIBNFS_LIBS'].split())
+endif
libattr = not_found
if 'CONFIG_ATTR' in config_host
libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split())
@@ -140,6 +160,28 @@ libudev = not_found
if 'CONFIG_LIBUDEV' in config_host
libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
endif
+rbd = not_found
+if 'CONFIG_RBD' in config_host
+ rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split())
+endif
+glusterfs = not_found
+if 'CONFIG_GLUSTERFS' in config_host
+ glusterfs = declare_dependency(compile_args: config_host['GLUSTERFS_CFLAGS'].split(),
+ link_args: config_host['GLUSTERFS_LIBS'].split())
+endif
+libssh = not_found
+if 'CONFIG_LIBSSH' in config_host
+ libssh = declare_dependency(compile_args: config_host['LIBSSH_CFLAGS'].split(),
+ link_args: config_host['LIBSSH_LIBS'].split())
+endif
+libbzip2 = not_found
+if 'CONFIG_BZIP2' in config_host
+ libbzip2 = declare_dependency(link_args: config_host['BZIP2_LIBS'].split())
+endif
+liblzfse = not_found
+if 'CONFIG_LZFSE' in config_host
+ liblzfse = declare_dependency(link_args: config_host['LZFSE_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -439,6 +481,18 @@ subdir('chardev')
subdir('fsdev')
subdir('target')
+block_ss.add(files(
+ 'block.c',
+ 'blockjob.c',
+ 'job.c',
+ 'qemu-io-cmds.c',
+))
+block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
+
+subdir('nbd')
+subdir('scsi')
+subdir('block')
+
mods = []
block_mods = []
softmmu_mods = []
@@ -473,6 +527,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
capture: true,
command: [undefsym, nm, '@INPUT@'])
+block_ss = block_ss.apply(config_host, strict: false)
+libblock = static_library('block', block_ss.sources(),
+ dependencies: block_ss.dependencies(),
+ link_depends: block_syms,
+ name_suffix: 'fa',
+ build_by_default: false)
+
+block = declare_dependency(link_whole: [libblock],
+ link_args: '@block.syms')
foreach m : mods
shared_module(m['dir'] + '-' + m['name'],
diff --git a/nbd/Makefile.objs b/nbd/Makefile.objs
deleted file mode 100644
index eb3dd44..0000000
--- a/nbd/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-block-obj-y += server.o client.o common.o
diff --git a/nbd/meson.build b/nbd/meson.build
new file mode 100644
index 0000000..0c00a77
--- /dev/null
+++ b/nbd/meson.build
@@ -0,0 +1,5 @@
+block_ss.add(files(
+ 'client.c',
+ 'common.c',
+ 'server.c',
+))
diff --git a/rules.mak b/rules.mak
index 9da9dcd..8285fe5 100644
--- a/rules.mak
+++ b/rules.mak
@@ -374,8 +374,7 @@ define unnest-vars
# Find all the .mo objects in variables and add dependency rules
# according to .mo-objs. Report error if not set
$(if $($o-objs),
- $(eval $(o:%.mo=%$(DSOSUF)): module-common.o $($o-objs)),
- $(error $o added in $v but $o-objs is not set)))
+ $(eval $(o:%.mo=%$(DSOSUF)): module-common.o $($o-objs))))
$(shell mkdir -p ./ $(sort $(dir $($v))))
# Include all the .d files
$(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.o,$($v)))))
diff --git a/scripts/modules/module_block.py b/scripts/modules/module_block.py
old mode 100644
new mode 100755
diff --git a/scsi/Makefile.objs b/scsi/Makefile.objs
deleted file mode 100644
index bb8789c..0000000
--- a/scsi/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-block-obj-y += utils.o
-
-block-obj-$(CONFIG_LINUX) += pr-manager.o pr-manager-helper.o
-block-obj-$(call lnot,$(CONFIG_LINUX)) += pr-manager-stub.o
diff --git a/scsi/meson.build b/scsi/meson.build
new file mode 100644
index 0000000..53f3a1f
--- /dev/null
+++ b/scsi/meson.build
@@ -0,0 +1,4 @@
+block_ss.add(files('utils.c'))
+block_ss.add(when: 'CONFIG_LINUX',
+ if_true: files('pr-manager.c', 'pr-manager-helper.c'),
+ if_false: files('pr-manager-stub.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 059/143] meson: qemu-{img,io,nbd}
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (57 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 058/143] meson: convert block Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 060/143] meson: qemu-pr-helper Paolo Bonzini
` (88 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
configure | 3 +--
meson.build | 14 ++++++++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index aa47783..27e66aa 100644
--- a/Makefile
+++ b/Makefile
@@ -274,11 +274,6 @@ Makefile: $(version-obj-y)
COMMON_LDADDS = libqemuutil.a
-qemu-img.o: qemu-img-cmds.h
-
-qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
diff --git a/configure b/configure
index 2af211f..809fa3b 100755
--- a/configure
+++ b/configure
@@ -6644,9 +6644,8 @@ fi
tools=""
helpers=""
if test "$want_tools" = "yes" ; then
- tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
- tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
+ tools="qemu-storage-daemon\$(EXESUF) $tools"
fi
fi
if test "$softmmu" = yes ; then
diff --git a/meson.build b/meson.build
index ea52f43..f2496e4 100644
--- a/meson.build
+++ b/meson.build
@@ -327,7 +327,7 @@ if have_system
]
endif
foreach d : hx_headers
- custom_target(d[1],
+ hxdep += custom_target(d[1],
input: files(d[0]),
output: d[1],
capture: true,
@@ -535,7 +535,8 @@ libblock = static_library('block', block_ss.sources(),
build_by_default: false)
block = declare_dependency(link_whole: [libblock],
- link_args: '@block.syms')
+ link_args: '@block.syms',
+ dependencies: [crypto, io])
foreach m : mods
shared_module(m['dir'] + '-' + m['name'],
@@ -613,6 +614,15 @@ if 'CONFIG_GUEST_AGENT' in config_host
endif
if have_tools
+ qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
+ dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
+ if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or host_machine.system().endswith('bsd')
+ qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
+ dependencies: [block, qemuutil], install: true)
+ endif
+ qemu_io = executable('qemu-io', files('qemu-io.c'),
+ dependencies: [block, qemuutil], install: true)
+
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 060/143] meson: qemu-pr-helper
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (58 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 059/143] meson: qemu-{img,io,nbd} Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 061/143] configure, Makefile; remove TOOLS and HELPERS-y variable Paolo Bonzini
` (87 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 7 +------
configure | 3 ---
meson.build | 10 ++++++++++
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 27e66aa..50e02c0 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-HELPERS-y = $(HELPERS)
+HELPERS-y =
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
@@ -276,11 +276,6 @@ COMMON_LDADDS = libqemuutil.a
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-ifdef CONFIG_MPATH
-scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
-endif
-
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/configure b/configure
index 809fa3b..962e314 100755
--- a/configure
+++ b/configure
@@ -6642,7 +6642,6 @@ if [ "$eventfd" = "yes" ]; then
fi
tools=""
-helpers=""
if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-storage-daemon\$(EXESUF) $tools"
@@ -6666,7 +6665,6 @@ if test "$softmmu" = yes ; then
fi
mpath=no
fi
- helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
error_exit "VirtFS is supported only on Linux"
@@ -7742,7 +7740,6 @@ else
QEMU_INCLUDES="-iquote ${source_path}/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
-echo "HELPERS=$helpers" >> $config_host_mak
echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
diff --git a/meson.build b/meson.build
index f2496e4..1743ae7 100644
--- a/meson.build
+++ b/meson.build
@@ -136,6 +136,10 @@ if 'CONFIG_XKBCOMMON' in config_host
link_args: config_host['XKBCOMMON_LIBS'].split())
endif
rt = cc.find_library('rt', required: false)
+libmpathpersist = not_found
+if config_host.has_key('CONFIG_MPATH')
+ libmpathpersist = cc.find_library('mpathpersist')
+endif
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
@@ -609,6 +613,7 @@ foreach target : target_dirs
endforeach
# Other build targets
+
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
endif
@@ -649,6 +654,11 @@ if have_tools
dependencies: [qemuutil, libcap_ng],
install: true,
install_dir: get_option('libexecdir'))
+
+ executable('qemu-pr-helper', files('scsi/qemu-pr-helper.c', 'scsi/utils.c'),
+ dependencies: [authz, crypto, io, qom, qemuutil,
+ libcap_ng, libudev, libmpathpersist],
+ install: true)
endif
if 'CONFIG_IVSHMEM' in config_host
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 061/143] configure, Makefile; remove TOOLS and HELPERS-y variable
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (59 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 060/143] meson: qemu-pr-helper Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 062/143] meson: convert chardev directory to Meson (emulator part) Paolo Bonzini
` (86 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Everything involving tools is now done by meson.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 22 ++--------------------
configure | 7 -------
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 50e02c0..6e8e541 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,6 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-HELPERS-y =
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -173,7 +171,7 @@ dummy := $(call unnest-vars,, \
include $(SRC_PATH)/tests/Makefile.include
-all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules
+all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
@@ -284,7 +282,7 @@ clean: recurse-clean
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
-exec rm {} +
- rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~
+ rm -f TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
@@ -439,12 +437,6 @@ install: all $(if $(BUILD_DOCS),install-doc) \
install-datadir install-localstatedir install-includedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install
-ifneq ($(TOOLS),)
- $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
-endif
-ifneq ($(HELPERS-y),)
- $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
-endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif
@@ -719,16 +711,6 @@ endif
$(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \
))) \
echo '')
- @$(if $(HELPERS-y), \
- echo 'Helper targets:'; \
- $(foreach t, $(HELPERS-y), \
- $(call print-help-run,$(t),Build $(shell basename $(t)));) \
- echo '')
- @$(if $(TOOLS), \
- echo 'Tools targets:'; \
- $(foreach t, $(TOOLS), \
- $(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \
- echo '')
@echo 'Cleaning targets:'
$(call print-help,clean,Remove most generated files but keep the config)
$(call print-help,distclean,Remove all generated files)
diff --git a/configure b/configure
index 962e314..f99b7ee 100755
--- a/configure
+++ b/configure
@@ -6641,12 +6641,6 @@ if [ "$eventfd" = "yes" ]; then
ivshmem=yes
fi
-tools=""
-if test "$want_tools" = "yes" ; then
- if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
- tools="qemu-storage-daemon\$(EXESUF) $tools"
- fi
-fi
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
@@ -7740,7 +7734,6 @@ else
QEMU_INCLUDES="-iquote ${source_path}/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
-echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 062/143] meson: convert chardev directory to Meson (emulator part)
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (60 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 061/143] configure, Makefile; remove TOOLS and HELPERS-y variable Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 063/143] meson: convert tests/qtest to meson Paolo Bonzini
` (85 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
Makefile.target | 2 ++
chardev/Makefile.objs | 10 ----------
chardev/meson.build | 11 +++++++++++
configure | 2 ++
meson.build | 14 ++++++++++++++
6 files changed, 29 insertions(+), 12 deletions(-)
delete mode 100644 chardev/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index f79ff89..4c6631a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -86,8 +86,6 @@ common-obj-y += dma-helpers.o
common-obj-$(CONFIG_TPM) += tpm.o
common-obj-y += backends/
-common-obj-y += chardev/
-common-obj-m += chardev/
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
diff --git a/Makefile.target b/Makefile.target
index c0575da..c8c4b70 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -104,6 +104,7 @@ all: $(PROGS) stap
@true
obj-y += $(LIBQEMU)
+
obj-y += trace/
#########################################################
@@ -167,6 +168,7 @@ LIBS := $(LIBS) @../block.syms @../qemu.syms
ifneq ($(CONFIG_MODULES),y)
LIBS := $(LIBS)
endif
+LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS)
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
deleted file mode 100644
index 6662d0d..0000000
--- a/chardev/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-chardev-obj-$(CONFIG_SOFTMMU) += chardev-sysemu.o
-common-obj-$(CONFIG_SOFTMMU) += msmouse.o wctablet.o testdev.o
-
-ifeq ($(CONFIG_BRLAPI),y)
-common-obj-m += baum.o
-baum.o-cflags := $(SDL_CFLAGS)
-baum.o-libs := $(BRLAPI_LIBS)
-endif
-
-common-obj-$(CONFIG_SPICE) += spice.o
diff --git a/chardev/meson.build b/chardev/meson.build
index a2e671d..2122505 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -30,3 +30,14 @@ libchardev = static_library('chardev', chardev_ss.sources(),
build_by_default: false)
chardev = declare_dependency(link_whole: libchardev)
+
+softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c'))
+softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c'))
+
+chardev_modules = []
+
+if config_host.has_key('CONFIG_BRLAPI') and config_host.has_key('CONFIG_SDL')
+ chardev_modules += [['baum', files('baum.c'), [sdl, brlapi]]]
+endif
+
+modules += { 'chardev': chardev_modules }
diff --git a/configure b/configure
index f99b7ee..1b62959 100755
--- a/configure
+++ b/configure
@@ -7318,6 +7318,8 @@ if test "$zlib" != "no" ; then
fi
if test "$spice" = "yes" ; then
echo "CONFIG_SPICE=y" >> $config_host_mak
+ echo "SPICE_CFLAGS=$spice_cflags" >> $config_host_mak
+ echo "SPICE_LIBS=$spice_libs" >> $config_host_mak
fi
if test "$smartcard" = "yes" ; then
diff --git a/meson.build b/meson.build
index 1743ae7..3daa82e 100644
--- a/meson.build
+++ b/meson.build
@@ -135,6 +135,11 @@ if 'CONFIG_XKBCOMMON' in config_host
xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
link_args: config_host['XKBCOMMON_LIBS'].split())
endif
+spice = not_found
+if 'CONFIG_SPICE' in config_host
+ spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(),
+ link_args: config_host['SPICE_LIBS'].split())
+endif
rt = cc.find_library('rt', required: false)
libmpathpersist = not_found
if config_host.has_key('CONFIG_MPATH')
@@ -164,6 +169,15 @@ libudev = not_found
if 'CONFIG_LIBUDEV' in config_host
libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
endif
+brlapi = not_found
+if 'CONFIG_BRLAPI' in config_host
+ brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
+endif
+sdl = not_found
+if 'CONFIG_SDL' in config_host
+ sdl = declare_dependency(compile_args: config_host['SDL_CFLAGS'].split(),
+ link_args: config_host['SDL_LIBS'].split())
+endif
rbd = not_found
if 'CONFIG_RBD' in config_host
rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split())
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 063/143] meson: convert tests/qtest to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (61 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 062/143] meson: convert chardev directory to Meson (emulator part) Paolo Bonzini
@ 2020-08-06 19:14 ` Paolo Bonzini
2020-08-07 17:22 ` Alexander Bulekov
2020-08-06 19:15 ` [PATCH 064/143] meson: convert audio directory to Meson Paolo Bonzini
` (84 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:14 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 3 +
tests/Makefile.include | 49 +---
tests/meson.build | 1 +
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/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/fuzz.c | 2 +-
tests/qtest/fuzz/fuzz.h | 2 +-
tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
tests/qtest/fuzz/qos_fuzz.c | 2 +-
tests/qtest/fuzz/virtio_net_fuzz.c | 2 +-
tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 +-
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 | 6 +-
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 | 254 +++++++++++++++++
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 | 2 +-
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/test-qga.c | 2 +-
tests/test-qgraph.c | 5 +-
148 files changed, 539 insertions(+), 592 deletions(-)
delete mode 100644 tests/qtest/Makefile.include
rename tests/qtest/{ => libqos}/libqtest.h (100%)
create mode 100644 tests/qtest/libqos/meson.build
create mode 100644 tests/qtest/meson.build
diff --git a/meson.build b/meson.build
index 3daa82e..a81516a 100644
--- a/meson.build
+++ b/meson.build
@@ -511,6 +511,9 @@ subdir('nbd')
subdir('scsi')
subdir('block')
+# needed for fuzzing binaries
+subdir('tests/qtest/libqos')
+
mods = []
block_mods = []
softmmu_mods = []
diff --git a/tests/Makefile.include b/tests/Makefile.include
index a0e5d3e..567ad69 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -109,6 +109,7 @@ check-unit-y += tests/test-qht$(EXESUF)
check-unit-y += tests/test-qht-par$(EXESUF)
check-unit-y += tests/test-bitops$(EXESUF)
check-unit-y += tests/test-bitcnt$(EXESUF)
+check-unit-y += tests/test-qgraph$(EXESUF)
check-unit-y += tests/check-qom-interface$(EXESUF)
check-unit-y += tests/check-qom-proplist$(EXESUF)
check-unit-y += tests/test-qemu-opts$(EXESUF)
@@ -306,19 +307,6 @@ tests/test-qapi-gen-timestamp: \
@rm -f tests/test-qapi-doc.texi
@>$@
-tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-vmstate1-gen-timestamp ;
-tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmstate1.xml
- $(call quiet-command,$(GDBUS_CODEGEN) $< \
- --interface-prefix org.qemu --generate-c-code tests/qtest/dbus-vmstate1, \
- "GEN","$(@:%-timestamp=%)")
- @>$@
-
-tests/qtest/dbus-vmstate-test.o-cflags := -DSRCDIR="$(SRC_PATH)"
-tests/qtest/dbus-vmstate1.o-cflags := $(GIO_CFLAGS)
-tests/qtest/dbus-vmstate1.o-libs := $(GIO_LIBS)
-
-tests/qtest/dbus-vmstate-test.o: tests/qtest/dbus-vmstate1.h
-
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y)
tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) tests/test-qapi-emit-events.o tests/test-qapi-events.o
@@ -333,6 +321,7 @@ tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y)
tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y)
tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y)
tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y)
+tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.o $(test-util-obj-y)
tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y)
tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y)
tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y)
@@ -396,10 +385,8 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
rm $(INITRD_WORK_DIR)/init
rmdir $(INITRD_WORK_DIR)
-include $(SRC_PATH)/tests/qtest/Makefile.include
-
tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF)
-tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
+tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-util-obj-y)
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
@@ -440,16 +427,6 @@ define do_test_tap
"TAP","$@")
endef
-.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
-$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y)
- $(call do_test_human,$(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
- QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
- QTEST_QEMU_IMG=qemu-img$(EXESUF))
-
-build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS)) $(check-qtest-y)
-
-build-unit: $(check-unit-y)
-
check-unit: $(check-unit-y)
$(call do_test_human, $^)
@@ -458,18 +435,9 @@ check-speed: $(check-speed-y)
# gtester tests with TAP output
-$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y)
- $(call do_test_tap, $(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
- QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
- QTEST_QEMU_IMG=qemu-img$(EXESUF))
-
check-report-unit.tap: $(check-unit-y)
$(call do_test_tap,$^)
-# Reports and overall runs
-
-check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
-
# Plugins
ifeq ($(CONFIG_PLUGIN),y)
.PHONY: plugins
@@ -582,19 +550,16 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
# Consolidated targets
-.PHONY: check-block check-qtest check-unit check check-clean get-vm-images
-check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
+.PHONY: check-block check-unit check check-clean get-vm-images
ifeq ($(CONFIG_TOOLS),y)
check-block: $(patsubst %,check-%, $(check-block-y))
endif
-check-build: build-unit build-qtest
+check-build: build-unit
-check: check-block check-unit check-qtest
+check: check-block check-unit
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
- rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
rm -f tests/test-qapi-gen-timestamp
- rm -f tests/qtest/dbus-vmstate1-gen-timestamp
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
check: check-block check-qapi-schema check-unit check-qtest check-decodetree
@@ -606,7 +571,5 @@ clean: check-clean
all: $(QEMU_IOTESTS_HELPERS-y)
-include $(wildcard tests/*.d)
--include $(wildcard tests/qtest/*.d)
--include $(wildcard tests/qtest/libqos/*.d)
endif
diff --git a/tests/meson.build b/tests/meson.build
index 8be9c22..d724402 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -8,3 +8,4 @@ if 'CONFIG_TCG' in config_host
endif
subdir('qapi-schema')
+subdir('qtest')
diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
deleted file mode 100644
index b0204e4..0000000
--- a/tests/qtest/Makefile.include
+++ /dev/null
@@ -1,332 +0,0 @@
-# All QTests for now are POSIX-only, but the dependencies are
-# really in libqtest, not in the testcases themselves.
-
-check-qtest-generic-y += cdrom-test
-check-qtest-generic-y += device-introspect-test
-check-qtest-generic-y += machine-none-test
-check-qtest-generic-y += qmp-test
-check-qtest-generic-y += qmp-cmd-test
-check-qtest-generic-y += qom-test
-check-qtest-generic-$(CONFIG_MODULES) += modules-test
-check-qtest-generic-y += test-hmp
-
-check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test
-check-qtest-pci-$(CONFIG_VGA) += display-vga-test
-check-qtest-pci-$(CONFIG_HDA) += intel-hda-test
-check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
-
-DBUS_DAEMON := $(shell which dbus-daemon 2>/dev/null)
-ifneq ($(GDBUS_CODEGEN),)
-ifneq ($(DBUS_DAEMON),)
-# Temporarily disabled due to Patchew failures:
-#check-qtest-pci-$(CONFIG_GIO) += dbus-vmstate-test
-endif
-endif
-
-check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-i386-y += fdc-test
-check-qtest-i386-y += ide-test
-check-qtest-i386-$(CONFIG_TOOLS) += ahci-test
-check-qtest-i386-y += hd-geo-test
-check-qtest-i386-y += boot-order-test
-check-qtest-i386-y += bios-tables-test
-check-qtest-i386-$(CONFIG_SGA) += boot-serial-test
-check-qtest-i386-$(CONFIG_SLIRP) += pxe-test
-check-qtest-i386-y += rtc-test
-check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += ipmi-kcs-test
-ifdef CONFIG_LINUX
-check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += ipmi-bt-test
-endif
-check-qtest-i386-y += i440fx-test
-check-qtest-i386-y += fw_cfg-test
-check-qtest-i386-y += device-plug-test
-check-qtest-i386-y += drive_del-test
-check-qtest-i386-$(CONFIG_WDT_IB700) += wdt_ib700-test
-check-qtest-i386-y += tco-test
-check-qtest-i386-y += $(check-qtest-pci-y)
-check-qtest-i386-$(CONFIG_PVPANIC) += pvpanic-test
-check-qtest-i386-$(CONFIG_I82801B11) += i82801b11-test
-check-qtest-i386-$(CONFIG_IOH3420) += ioh3420-test
-check-qtest-i386-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
-check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += usb-hcd-ehci-test
-check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
-check-qtest-i386-y += cpu-plug-test
-check-qtest-i386-y += q35-test
-check-qtest-i386-y += vmgenid-test
-check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
-check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
-check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
-check-qtest-i386-y += migration-test
-check-qtest-i386-y += test-x86-cpuid-compat
-check-qtest-i386-y += numa-test
-
-check-qtest-x86_64-y += $(check-qtest-i386-y)
-
-check-qtest-avr-y += boot-serial-test
-
-check-qtest-alpha-y += boot-serial-test
-check-qtest-alpha-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-hppa-y += boot-serial-test
-check-qtest-hppa-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-m68k-y = boot-serial-test
-
-check-qtest-microblaze-y += boot-serial-test
-
-check-qtest-mips-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips64-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips64el-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-moxie-y += boot-serial-test
-
-check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-ppc-y += boot-order-test
-check-qtest-ppc-y += prom-env-test
-check-qtest-ppc-y += drive_del-test
-check-qtest-ppc-y += boot-serial-test
-check-qtest-ppc-$(CONFIG_M48T59) += m48t59-test
-
-check-qtest-ppc64-y += $(check-qtest-ppc-y)
-check-qtest-ppc64-$(CONFIG_PSERIES) += device-plug-test
-check-qtest-ppc64-$(CONFIG_POWERNV) += pnv-xscom-test
-check-qtest-ppc64-y += migration-test
-check-qtest-ppc64-$(CONFIG_PSERIES) += rtas-test
-check-qtest-ppc64-$(CONFIG_SLIRP) += pxe-test
-check-qtest-ppc64-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
-check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
-check-qtest-ppc64-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-ppc64-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += test-filter-redirector
-check-qtest-ppc64-$(CONFIG_VGA) += display-vga-test
-check-qtest-ppc64-y += numa-test
-check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
-check-qtest-ppc64-y += cpu-plug-test
-
-check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = endianness-test
-
-check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = endianness-test
-
-check-qtest-sparc-y += prom-env-test
-check-qtest-sparc-y += m48t59-test
-check-qtest-sparc-y += boot-serial-test
-
-check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-sparc64-y += prom-env-test
-check-qtest-sparc64-y += boot-serial-test
-
-check-qtest-arm-y += arm-cpu-features
-check-qtest-arm-y += microbit-test
-check-qtest-arm-y += m25p80-test
-check-qtest-arm-y += test-arm-mptimer
-check-qtest-arm-y += boot-serial-test
-check-qtest-arm-y += hexloader-test
-check-qtest-arm-$(CONFIG_PFLASH_CFI02) += pflash-cfi02-test
-
-check-qtest-aarch64-y += arm-cpu-features
-check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-test
-check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-swtpm-test
-check-qtest-aarch64-y += numa-test
-check-qtest-aarch64-y += boot-serial-test
-check-qtest-aarch64-y += migration-test
-
-# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional
-ifneq ($(ARCH),arm)
-check-qtest-aarch64-y += bios-tables-test
-endif
-
-check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
-
-check-qtest-xtensaeb-y += $(check-qtest-xtensa-y)
-
-check-qtest-s390x-y = boot-serial-test
-check-qtest-s390x-$(CONFIG_SLIRP) += pxe-test
-check-qtest-s390x-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-s390x-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-s390x-$(CONFIG_POSIX) += test-filter-redirector
-check-qtest-s390x-y += drive_del-test
-check-qtest-s390x-y += device-plug-test
-check-qtest-s390x-y += virtio-ccw-test
-check-qtest-s390x-y += cpu-plug-test
-check-qtest-s390x-y += migration-test
-
-# libqos / qgraph :
-libqgraph-obj-y = tests/qtest/libqos/qgraph.o
-
-libqos-core-obj-y = $(libqgraph-obj-y) tests/qtest/libqos/pci.o tests/qtest/libqos/fw_cfg.o
-libqos-core-obj-y += tests/qtest/libqos/malloc.o
-libqos-core-obj-y += tests/qtest/libqos/libqos.o
-libqos-spapr-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/malloc-spapr.o
-libqos-spapr-obj-y += tests/qtest/libqos/libqos-spapr.o
-libqos-spapr-obj-y += tests/qtest/libqos/rtas.o
-libqos-spapr-obj-y += tests/qtest/libqos/pci-spapr.o
-libqos-pc-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/pci-pc.o
-libqos-pc-obj-y += tests/qtest/libqos/malloc-pc.o tests/qtest/libqos/libqos-pc.o
-libqos-pc-obj-y += tests/qtest/libqos/ahci.o
-libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/qtest/libqos/usb.o
-
-# qos devices:
-libqos-obj-y = $(libqgraph-obj-y)
-libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
-libqos-obj-y += tests/qtest/libqos/qos_external.o
-libqos-obj-y += tests/qtest/libqos/e1000e.o
-libqos-obj-y += tests/qtest/libqos/i2c.o
-libqos-obj-y += tests/qtest/libqos/i2c-imx.o
-libqos-obj-y += tests/qtest/libqos/i2c-omap.o
-libqos-obj-y += tests/qtest/libqos/sdhci.o
-libqos-obj-y += tests/qtest/libqos/tpci200.o
-libqos-obj-y += tests/qtest/libqos/virtio.o
-libqos-obj-$(CONFIG_VIRTFS) += tests/qtest/libqos/virtio-9p.o
-libqos-obj-y += tests/qtest/libqos/virtio-balloon.o
-libqos-obj-y += tests/qtest/libqos/virtio-blk.o
-libqos-obj-y += tests/qtest/libqos/virtio-mmio.o
-libqos-obj-y += tests/qtest/libqos/virtio-net.o
-libqos-obj-y += tests/qtest/libqos/virtio-pci.o
-libqos-obj-y += tests/qtest/libqos/virtio-pci-modern.o
-libqos-obj-y += tests/qtest/libqos/virtio-rng.o
-libqos-obj-y += tests/qtest/libqos/virtio-scsi.o
-libqos-obj-y += tests/qtest/libqos/virtio-serial.o
-
-# qos machines:
-libqos-obj-y += tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-imx25-pdk-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-n800-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-raspi2-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-sabrelite-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-smdkc210-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-virt-machine.o
-libqos-obj-y += tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o
-libqos-obj-y += tests/qtest/libqos/ppc64_pseries-machine.o
-libqos-obj-y += tests/qtest/libqos/x86_64_pc-machine.o
-
-# qos tests:
-qos-test-obj-y += tests/qtest/qos-test.o
-qos-test-obj-y += tests/qtest/ac97-test.o
-qos-test-obj-y += tests/qtest/ds1338-test.o
-qos-test-obj-y += tests/qtest/e1000-test.o
-qos-test-obj-y += tests/qtest/e1000e-test.o
-qos-test-obj-y += tests/qtest/eepro100-test.o
-qos-test-obj-y += tests/qtest/es1370-test.o
-qos-test-obj-y += tests/qtest/ipoctal232-test.o
-qos-test-obj-y += tests/qtest/megasas-test.o
-qos-test-obj-y += tests/qtest/ne2000-test.o
-qos-test-obj-y += tests/qtest/tulip-test.o
-qos-test-obj-y += tests/qtest/nvme-test.o
-qos-test-obj-y += tests/qtest/pca9552-test.o
-qos-test-obj-y += tests/qtest/pci-test.o
-qos-test-obj-y += tests/qtest/pcnet-test.o
-qos-test-obj-y += tests/qtest/sdhci-test.o
-qos-test-obj-y += tests/qtest/spapr-phb-test.o
-qos-test-obj-y += tests/qtest/tmp105-test.o
-qos-test-obj-y += tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
-qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)
-qos-test-obj-y += tests/qtest/virtio-test.o
-qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o
-qos-test-obj-y += tests/qtest/virtio-blk-test.o
-qos-test-obj-y += tests/qtest/virtio-net-test.o
-qos-test-obj-y += tests/qtest/virtio-rng-test.o
-qos-test-obj-y += tests/qtest/virtio-scsi-test.o
-qos-test-obj-y += tests/qtest/virtio-serial-test.o
-qos-test-obj-y += tests/qtest/vmxnet3-test.o
-
-check-unit-y += tests/test-qgraph$(EXESUF)
-tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)
-
-check-qtest-generic-y += qos-test
-tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y)
-
-# QTest dependencies:
-tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o
-tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o
-tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect-test.o
-tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o
-tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o
-tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o
-tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o
-tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o
-tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-obj-y)
-tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj-y)
-tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o
-tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y)
-tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
-tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o
-tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o
-tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o $(libqos-obj-y)
-tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libqos-obj-y)
-tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(libqos-obj-y)
-tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \
- tests/qtest/tpm-emu.o $(test-io-obj-y) \
- tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y)
-tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
-tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o
-tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o
-tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-obj-y)
-tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y)
-tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-obj-y)
-tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-obj-y)
-tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o
-tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o
-tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y)
-tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o
-tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o
-tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o
-tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o
-tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o
-tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o
-tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
-tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o
-tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o
-tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o
-tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o
-tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o
-tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
-tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
-tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
-tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o
-tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o tests/qtest/migration-helpers.o
-tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-obj-y)
-tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o $(qtest-obj-y)
-tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.o $(qtest-obj-y)
-tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
-tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
-tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
-tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
-tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
-tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
-tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
-tests/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o
-tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o tests/qtest/tpm-emu.o \
- tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
-tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/tpm-emu.o $(test-io-obj-y)
-tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \
- tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
-tests/qtest/tpm-tis-device-swtpm-test$(EXESUF): tests/qtest/tpm-tis-device-swtpm-test.o tests/qtest/tpm-emu.o \
- tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
-tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
-tests/qtest/tpm-tis-device-test$(EXESUF): tests/qtest/tpm-tis-device-test.o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
-
-# QTest rules
-
-TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
-QTEST_TARGETS =
-# The qtests are not runnable (yet) under TSan due to a known issue.
-# https://github.com/google/sanitizers/issues/1116
-ifndef CONFIG_TSAN
-ifeq ($(CONFIG_POSIX),y)
-QTEST_TARGETS = $(TARGETS)
-check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/qtest/%$(EXESUF)))
-check-qtest-y += $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF))
-endif
-endif
-
-qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y)
-$(check-qtest-y): $(qtest-obj-y)
diff --git a/tests/qtest/ac97-test.c b/tests/qtest/ac97-test.c
index b084e31..e09f249 100644
--- a/tests/qtest/ac97-test.c
+++ b/tests/qtest/ac97-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/acpi-utils.h b/tests/qtest/acpi-utils.h
index 0c86780..261784d 100644
--- a/tests/qtest/acpi-utils.h
+++ b/tests/qtest/acpi-utils.h
@@ -13,7 +13,7 @@
#ifndef TEST_ACPI_UTILS_H
#define TEST_ACPI_UTILS_H
-#include "libqtest.h"
+#include "libqos/libqtest.h"
/* DSDT and SSDTs format */
typedef struct {
diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
index c8d42ce..ca4294f 100644
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include <getopt.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/libqos-pc.h"
#include "libqos/ahci.h"
#include "libqos/pci-pc.h"
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
index f7e062c..77b5e30 100644
--- a/tests/qtest/arm-cpu-features.c
+++ b/tests/qtest/arm-cpu-features.c
@@ -10,7 +10,7 @@
*/
#include "qemu/osdep.h"
#include "qemu/bitops.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qjson.h"
diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c
index 2f1c072..fac580d 100644
--- a/tests/qtest/boot-order-test.c
+++ b/tests/qtest/boot-order-test.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "libqos/fw_cfg.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "standard-headers/linux/qemu_fw_cfg.h"
diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
index 9e66c6d..24df5c4 100644
--- a/tests/qtest/boot-sector.c
+++ b/tests/qtest/boot-sector.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "boot-sector.h"
#include "qemu-common.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#define LOW(x) ((x) & 0xff)
#define HIGH(x) ((x) >> 8)
diff --git a/tests/qtest/boot-sector.h b/tests/qtest/boot-sector.h
index 6ee6bb4..b339fde 100644
--- a/tests/qtest/boot-sector.h
+++ b/tests/qtest/boot-sector.h
@@ -14,7 +14,7 @@
#ifndef TEST_BOOT_SECTOR_H
#define TEST_BOOT_SECTOR_H
-#include "libqtest.h"
+#include "libqos/libqtest.h"
/* Create boot disk file. fname must be a suitable string for mkstemp() */
int boot_sector_init(char *fname);
diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index bfe7624..b6b1c23 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -14,7 +14,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/libqos-spapr.h"
static const uint8_t bios_avr[] = {
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index 833a050..e9afab6 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "boot-sector.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c
index 2e5e47d..aca9b98 100644
--- a/tests/qtest/dbus-vmstate-test.c
+++ b/tests/qtest/dbus-vmstate-test.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
#include <gio/gio.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu-common.h"
#include "dbus-vmstate1.h"
#include "migration-helpers.h"
diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c
index d68b785..9f22340 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -22,7 +22,7 @@
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
const char common_args[] = "-nodefaults -machine none";
diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c
index 318e422..9214892 100644
--- a/tests/qtest/device-plug-test.c
+++ b/tests/qtest/device-plug-test.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c
index 5f8839b..2ab11ad 100644
--- a/tests/qtest/drive_del-test.c
+++ b/tests/qtest/drive_del-test.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/virtio.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/ds1338-test.c b/tests/qtest/ds1338-test.c
index f6ade9a..c5d46bc 100644
--- a/tests/qtest/ds1338-test.c
+++ b/tests/qtest/ds1338-test.c
@@ -18,7 +18,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/i2c.h"
#define DS1338_ADDR 0x68
diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c
index c387984..ea286d1 100644
--- a/tests/qtest/e1000-test.c
+++ b/tests/qtest/e1000-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/eepro100-test.c b/tests/qtest/eepro100-test.c
index 8dbffff..d72ad09 100644
--- a/tests/qtest/eepro100-test.c
+++ b/tests/qtest/eepro100-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c
index cc088ac..4e79e22 100644
--- a/tests/qtest/endianness-test.c
+++ b/tests/qtest/endianness-test.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/bswap.h"
typedef struct TestCase TestCase;
diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c
index adccdac..2fd7fd2 100644
--- a/tests/qtest/es1370-test.c
+++ b/tests/qtest/es1370-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
index 031594a..1ceea84 100644
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@@ -20,7 +20,7 @@
#include "sysemu/sysemu.h"
#include "qemu/main-loop.h"
#include "qemu/rcu.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
#include "tests/qtest/libqos/qgraph.h"
#include "fuzz.h"
diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h
index 9ca3d10..8eb765e 100644
--- a/tests/qtest/fuzz/fuzz.h
+++ b/tests/qtest/fuzz/fuzz.h
@@ -18,7 +18,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
/**
* A libfuzzer fuzzing target
diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
index bf966d4..f45373f 100644
--- a/tests/qtest/fuzz/i440fx_fuzz.c
+++ b/tests/qtest/fuzz/i440fx_fuzz.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
#include "tests/qtest/libqos/pci.h"
#include "tests/qtest/libqos/pci-pc.h"
#include "fuzz.h"
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index d52f3eb..b943577 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -25,7 +25,7 @@
#include "sysemu/sysemu.h"
#include "qemu/main-loop.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
#include "tests/qtest/libqos/malloc.h"
#include "tests/qtest/libqos/qgraph.h"
#include "tests/qtest/libqos/qgraph_internal.h"
diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_net_fuzz.c
index a33bd73..277a9e2 100644
--- a/tests/qtest/fuzz/virtio_net_fuzz.c
+++ b/tests/qtest/fuzz/virtio_net_fuzz.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "standard-headers/linux/virtio_config.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
#include "tests/qtest/libqos/virtio-net.h"
#include "fuzz.h"
#include "fork_fuzz.h"
diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c
index 3a9ea13..977ac42 100644
--- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
+++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
-#include "tests/qtest/libqtest.h"
+#include "tests/qtest/libqos/libqtest.h"
#include "libqos/virtio-scsi.h"
#include "libqos/virtio.h"
#include "libqos/virtio-pci.h"
diff --git a/tests/qtest/fw_cfg-test.c b/tests/qtest/fw_cfg-test.c
index 5dc807b..95b3907 100644
--- a/tests/qtest/fw_cfg-test.c
+++ b/tests/qtest/fw_cfg-test.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "standard-headers/linux/qemu_fw_cfg.h"
#include "libqos/fw_cfg.h"
#include "qemu/bswap.h"
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index 48e8e02..f7b7cfb 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "qemu/bswap.h"
#include "qapi/qmp/qlist.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/fw_cfg.h"
#include "libqos/libqos.h"
#include "standard-headers/linux/qemu_fw_cfg.h"
diff --git a/tests/qtest/hexloader-test.c b/tests/qtest/hexloader-test.c
index 8b7aa2d..5615020 100644
--- a/tests/qtest/hexloader-test.c
+++ b/tests/qtest/hexloader-test.c
@@ -10,7 +10,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
/* Load 'test.hex' and verify that the in-memory contents are as expected.
* 'test.hex' is a memory test pattern stored in Hexadecimal Object
diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
index 5cfd97f..3f8081e 100644
--- a/tests/qtest/ide-test.c
+++ b/tests/qtest/ide-test.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/libqos.h"
#include "libqos/pci-pc.h"
#include "libqos/malloc-pc.h"
diff --git a/tests/qtest/ipoctal232-test.c b/tests/qtest/ipoctal232-test.c
index 53a8c9b..65ce10b 100644
--- a/tests/qtest/ipoctal232-test.c
+++ b/tests/qtest/ipoctal232-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
index ecda256..d5c8b9f 100644
--- a/tests/qtest/ivshmem-test.c
+++ b/tests/qtest/ivshmem-test.c
@@ -13,7 +13,7 @@
#include "contrib/ivshmem-server/ivshmem-server.h"
#include "libqos/libqos-pc.h"
#include "libqos/libqos-spapr.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu-common.h"
#define TMPSHMSIZE (1 << 20)
diff --git a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
index 8f827ae..79631cc 100644
--- a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
+++ b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "sdhci.h"
typedef struct QXlnxZCU102Machine QXlnxZCU102Machine;
diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
index cc1b08e..2946abc 100644
--- a/tests/qtest/libqos/ahci.c
+++ b/tests/qtest/libqos/ahci.c
@@ -25,8 +25,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/ahci.h"
-#include "libqos/pci-pc.h"
+#include "ahci.h"
+#include "pci-pc.h"
#include "qemu-common.h"
#include "qemu/host-utils.h"
@@ -579,7 +579,7 @@ void ahci_write_fis(AHCIQState *ahci, AHCICommand *cmd)
/* NCQ commands use exclusively 8 bit fields and needs no adjustment.
* Only the count field needs to be adjusted for non-NCQ commands.
* The auxiliary FIS fields are defined per-command and are not currently
- * implemented in libqos/ahci.o, but may or may not need to be flipped. */
+ * implemented in ahci.o, but may or may not need to be flipped. */
if (!cmd->props->ncq) {
tmp.count = cpu_to_le16(tmp.count);
}
diff --git a/tests/qtest/libqos/ahci.h b/tests/qtest/libqos/ahci.h
index 44ab110..88835b6 100644
--- a/tests/qtest/libqos/ahci.h
+++ b/tests/qtest/libqos/ahci.h
@@ -25,9 +25,9 @@
* THE SOFTWARE.
*/
-#include "libqos/libqos.h"
-#include "libqos/pci.h"
-#include "libqos/malloc-pc.h"
+#include "libqos.h"
+#include "pci.h"
+#include "malloc-pc.h"
/*** Supplementary PCI Config Space IDs & Masks ***/
#define PCI_DEVICE_ID_INTEL_Q35_AHCI (0x2922)
diff --git a/tests/qtest/libqos/arm-imx25-pdk-machine.c b/tests/qtest/libqos/arm-imx25-pdk-machine.c
index 0da3f19..6692adf 100644
--- a/tests/qtest/libqos/arm-imx25-pdk-machine.c
+++ b/tests/qtest/libqos/arm-imx25-pdk-machine.c
@@ -20,9 +20,9 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
-#include "libqos/i2c.h"
+#include "malloc.h"
+#include "qgraph.h"
+#include "i2c.h"
#define ARM_PAGE_SIZE 4096
#define IMX25_PDK_RAM_START 0x80000000
diff --git a/tests/qtest/libqos/arm-n800-machine.c b/tests/qtest/libqos/arm-n800-machine.c
index 35f8207..ff2049c 100644
--- a/tests/qtest/libqos/arm-n800-machine.c
+++ b/tests/qtest/libqos/arm-n800-machine.c
@@ -20,9 +20,9 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
-#include "libqos/i2c.h"
+#include "malloc.h"
+#include "qgraph.h"
+#include "i2c.h"
#define ARM_PAGE_SIZE 4096
#define N800_RAM_START 0x80000000
diff --git a/tests/qtest/libqos/arm-raspi2-machine.c b/tests/qtest/libqos/arm-raspi2-machine.c
index 8480d80..35bb470 100644
--- a/tests/qtest/libqos/arm-raspi2-machine.c
+++ b/tests/qtest/libqos/arm-raspi2-machine.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "sdhci.h"
#define ARM_PAGE_SIZE 4096
diff --git a/tests/qtest/libqos/arm-sabrelite-machine.c b/tests/qtest/libqos/arm-sabrelite-machine.c
index f6e403b..72425f0 100644
--- a/tests/qtest/libqos/arm-sabrelite-machine.c
+++ b/tests/qtest/libqos/arm-sabrelite-machine.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "sdhci.h"
#define ARM_PAGE_SIZE 4096
diff --git a/tests/qtest/libqos/arm-smdkc210-machine.c b/tests/qtest/libqos/arm-smdkc210-machine.c
index eebac7f..321b882 100644
--- a/tests/qtest/libqos/arm-smdkc210-machine.c
+++ b/tests/qtest/libqos/arm-smdkc210-machine.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "sdhci.h"
#define ARM_PAGE_SIZE 4096
diff --git a/tests/qtest/libqos/arm-virt-machine.c b/tests/qtest/libqos/arm-virt-machine.c
index 9316598..e0f5932 100644
--- a/tests/qtest/libqos/arm-virt-machine.c
+++ b/tests/qtest/libqos/arm-virt-machine.c
@@ -19,9 +19,9 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-mmio.h"
+#include "malloc.h"
+#include "qgraph.h"
+#include "virtio-mmio.h"
#define ARM_PAGE_SIZE 4096
#define VIRTIO_MMIO_BASE_ADDR 0x0A003E00
diff --git a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
index 473acce..56e53c7 100644
--- a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
+++ b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "sdhci.h"
typedef struct QXilinxZynqA9Machine QXilinxZynqA9Machine;
diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c
index e2927ed..a451f61 100644
--- a/tests/qtest/libqos/e1000e.c
+++ b/tests/qtest/libqos/e1000e.c
@@ -18,13 +18,13 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/pci-pc.h"
+#include "pci-pc.h"
#include "qemu/sockets.h"
#include "qemu/iov.h"
#include "qemu/module.h"
#include "qemu/bitops.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "e1000e.h"
#define E1000E_IMS (0x00d0)
diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h
index 35183b2..a22f5fd 100644
--- a/tests/qtest/libqos/e1000e.h
+++ b/tests/qtest/libqos/e1000e.h
@@ -19,7 +19,7 @@
#ifndef QGRAPH_E1000E_H
#define QGRAPH_E1000E_H
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#include "pci.h"
#define E1000E_RX0_MSG_ID (0)
diff --git a/tests/qtest/libqos/fw_cfg.c b/tests/qtest/libqos/fw_cfg.c
index 1f46258..6b8e1ba 100644
--- a/tests/qtest/libqos/fw_cfg.c
+++ b/tests/qtest/libqos/fw_cfg.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "libqos/fw_cfg.h"
+#include "fw_cfg.h"
#include "libqtest.h"
#include "qemu/bswap.h"
#include "hw/nvram/fw_cfg.h"
diff --git a/tests/qtest/libqos/i2c-imx.c b/tests/qtest/libqos/i2c-imx.c
index f33ece5..8f9a7e3 100644
--- a/tests/qtest/libqos/i2c-imx.c
+++ b/tests/qtest/libqos/i2c-imx.c
@@ -18,7 +18,7 @@
*/
#include "qemu/osdep.h"
-#include "libqos/i2c.h"
+#include "i2c.h"
#include "libqtest.h"
diff --git a/tests/qtest/libqos/i2c-omap.c b/tests/qtest/libqos/i2c-omap.c
index 9ae8214..eb4e453 100644
--- a/tests/qtest/libqos/i2c-omap.c
+++ b/tests/qtest/libqos/i2c-omap.c
@@ -7,7 +7,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "libqos/i2c.h"
+#include "i2c.h"
#include "qemu/bswap.h"
diff --git a/tests/qtest/libqos/i2c.c b/tests/qtest/libqos/i2c.c
index 38f800d..ade1bdb 100644
--- a/tests/qtest/libqos/i2c.c
+++ b/tests/qtest/libqos/i2c.c
@@ -7,7 +7,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "libqos/i2c.h"
+#include "i2c.h"
#include "libqtest.h"
void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
diff --git a/tests/qtest/libqos/i2c.h b/tests/qtest/libqos/i2c.h
index c65f087..1341bac 100644
--- a/tests/qtest/libqos/i2c.h
+++ b/tests/qtest/libqos/i2c.h
@@ -10,7 +10,7 @@
#define LIBQOS_I2C_H
#include "libqtest.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
typedef struct I2CAdapter I2CAdapter;
struct I2CAdapter {
diff --git a/tests/qtest/libqos/libqos-pc.c b/tests/qtest/libqos/libqos-pc.c
index d04abc5..db420a5 100644
--- a/tests/qtest/libqos/libqos-pc.c
+++ b/tests/qtest/libqos/libqos-pc.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
-#include "libqos/libqos-pc.h"
-#include "libqos/malloc-pc.h"
-#include "libqos/pci-pc.h"
+#include "libqos-pc.h"
+#include "malloc-pc.h"
+#include "pci-pc.h"
static QOSOps qos_ops = {
.alloc_init = pc_alloc_init,
diff --git a/tests/qtest/libqos/libqos-pc.h b/tests/qtest/libqos/libqos-pc.h
index a0e4c45..1a9923e 100644
--- a/tests/qtest/libqos/libqos-pc.h
+++ b/tests/qtest/libqos/libqos-pc.h
@@ -1,7 +1,7 @@
#ifndef LIBQOS_PC_H
#define LIBQOS_PC_H
-#include "libqos/libqos.h"
+#include "libqos.h"
QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap);
QOSState *qtest_pc_boot(const char *cmdline_fmt, ...);
diff --git a/tests/qtest/libqos/libqos-spapr.c b/tests/qtest/libqos/libqos-spapr.c
index 8766d54..db0e87b 100644
--- a/tests/qtest/libqos/libqos-spapr.c
+++ b/tests/qtest/libqos/libqos-spapr.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
-#include "libqos/libqos-spapr.h"
-#include "libqos/malloc-spapr.h"
-#include "libqos/pci-spapr.h"
+#include "libqos-spapr.h"
+#include "malloc-spapr.h"
+#include "pci-spapr.h"
static QOSOps qos_ops = {
.alloc_init = spapr_alloc_init,
diff --git a/tests/qtest/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-spapr.h
index 49bd72d..c613389 100644
--- a/tests/qtest/libqos/libqos-spapr.h
+++ b/tests/qtest/libqos/libqos-spapr.h
@@ -1,7 +1,7 @@
#ifndef LIBQOS_SPAPR_H
#define LIBQOS_SPAPR_H
-#include "libqos/libqos.h"
+#include "libqos.h"
QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap);
QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...);
diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c
index f229eb2..2251e86 100644
--- a/tests/qtest/libqos/libqos.c
+++ b/tests/qtest/libqos/libqos.c
@@ -2,8 +2,8 @@
#include <sys/wait.h>
#include "libqtest.h"
-#include "libqos/libqos.h"
-#include "libqos/pci.h"
+#include "libqos.h"
+#include "pci.h"
#include "qapi/qmp/qdict.h"
/*** Test Setup & Teardown ***/
diff --git a/tests/qtest/libqos/libqos.h b/tests/qtest/libqos/libqos.h
index 8e971c2..e0b2bfe 100644
--- a/tests/qtest/libqos/libqos.h
+++ b/tests/qtest/libqos/libqos.h
@@ -2,8 +2,8 @@
#define LIBQOS_H
#include "libqtest.h"
-#include "libqos/pci.h"
-#include "libqos/malloc.h"
+#include "pci.h"
+#include "malloc.h"
typedef struct QOSState QOSState;
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqos/libqtest.h
similarity index 100%
rename from tests/qtest/libqtest.h
rename to tests/qtest/libqos/libqtest.h
diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c
index 6f92ce4..16ff960 100644
--- a/tests/qtest/libqos/malloc-pc.c
+++ b/tests/qtest/libqos/malloc-pc.c
@@ -11,8 +11,8 @@
*/
#include "qemu/osdep.h"
-#include "libqos/malloc-pc.h"
-#include "libqos/fw_cfg.h"
+#include "malloc-pc.h"
+#include "fw_cfg.h"
#include "standard-headers/linux/qemu_fw_cfg.h"
diff --git a/tests/qtest/libqos/malloc-pc.h b/tests/qtest/libqos/malloc-pc.h
index 21e75ae..d8d7985 100644
--- a/tests/qtest/libqos/malloc-pc.h
+++ b/tests/qtest/libqos/malloc-pc.h
@@ -13,7 +13,7 @@
#ifndef LIBQOS_MALLOC_PC_H
#define LIBQOS_MALLOC_PC_H
-#include "libqos/malloc.h"
+#include "malloc.h"
void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags);
diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-spapr.c
index 2a6b7e3..84862e4 100644
--- a/tests/qtest/libqos/malloc-spapr.c
+++ b/tests/qtest/libqos/malloc-spapr.c
@@ -6,7 +6,7 @@
*/
#include "qemu/osdep.h"
-#include "libqos/malloc-spapr.h"
+#include "malloc-spapr.h"
#include "qemu-common.h"
diff --git a/tests/qtest/libqos/malloc-spapr.h b/tests/qtest/libqos/malloc-spapr.h
index e5fe9bf..f99572f 100644
--- a/tests/qtest/libqos/malloc-spapr.h
+++ b/tests/qtest/libqos/malloc-spapr.h
@@ -8,7 +8,7 @@
#ifndef LIBQOS_MALLOC_SPAPR_H
#define LIBQOS_MALLOC_SPAPR_H
-#include "libqos/malloc.h"
+#include "malloc.h"
void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags);
diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
index 615422a..f708b01 100644
--- a/tests/qtest/libqos/malloc.c
+++ b/tests/qtest/libqos/malloc.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqos/malloc.h"
+#include "malloc.h"
#include "qemu-common.h"
#include "qemu/host-utils.h"
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
new file mode 100644
index 0000000..e39e779
--- /dev/null
+++ b/tests/qtest/libqos/meson.build
@@ -0,0 +1,57 @@
+libqos = static_library('libqos',
+ files('../libqtest.c',
+ 'qgraph.c',
+ 'qos_external.c',
+ 'pci.c',
+ 'fw_cfg.c',
+ 'malloc.c',
+ 'libqos.c',
+
+ # spapr
+ 'malloc-spapr.c',
+ 'libqos-spapr.c',
+ 'rtas.c',
+ 'pci-spapr.c',
+
+ # pc
+ 'pci-pc.c',
+ 'malloc-pc.c',
+ 'libqos-pc.c',
+ 'ahci.c',
+
+ # usb
+ 'usb.c',
+
+ # qgraph devices:
+ 'e1000e.c',
+ 'i2c.c',
+ 'i2c-imx.c',
+ 'i2c-omap.c',
+ 'sdhci.c',
+ 'tpci200.c',
+ 'virtio.c',
+ 'virtio-9p.c',
+ 'virtio-balloon.c',
+ 'virtio-blk.c',
+ 'virtio-mmio.c',
+ 'virtio-net.c',
+ 'virtio-pci.c',
+ 'virtio-pci-modern.c',
+ 'virtio-rng.c',
+ 'virtio-scsi.c',
+ 'virtio-serial.c',
+
+ # qgraph machines:
+ 'aarch64-xlnx-zcu102-machine.c',
+ 'arm-imx25-pdk-machine.c',
+ 'arm-n800-machine.c',
+ 'arm-raspi2-machine.c',
+ 'arm-sabrelite-machine.c',
+ 'arm-smdkc210-machine.c',
+ 'arm-virt-machine.c',
+ 'arm-xilinx-zynq-a9-machine.c',
+ 'ppc64_pseries-machine.c',
+ 'x86_64_pc-machine.c',
+))
+
+qos = declare_dependency(link_whole: libqos)
diff --git a/tests/qtest/libqos/pci-pc.c b/tests/qtest/libqos/pci-pc.c
index 3bb2eb3..f978442 100644
--- a/tests/qtest/libqos/pci-pc.c
+++ b/tests/qtest/libqos/pci-pc.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/pci-pc.h"
+#include "pci-pc.h"
#include "qapi/qmp/qdict.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/libqos/pci-pc.h b/tests/qtest/libqos/pci-pc.h
index 4690005..49ec950 100644
--- a/tests/qtest/libqos/pci-pc.h
+++ b/tests/qtest/libqos/pci-pc.h
@@ -13,9 +13,9 @@
#ifndef LIBQOS_PCI_PC_H
#define LIBQOS_PCI_PC_H
-#include "libqos/pci.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "pci.h"
+#include "malloc.h"
+#include "qgraph.h"
typedef struct QPCIBusPC {
QOSGraphObject obj;
diff --git a/tests/qtest/libqos/pci-spapr.c b/tests/qtest/libqos/pci-spapr.c
index d6f8c01..2622269 100644
--- a/tests/qtest/libqos/pci-spapr.c
+++ b/tests/qtest/libqos/pci-spapr.c
@@ -7,9 +7,9 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/pci-spapr.h"
-#include "libqos/rtas.h"
-#include "libqos/qgraph.h"
+#include "pci-spapr.h"
+#include "rtas.h"
+#include "qgraph.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/libqos/pci-spapr.h b/tests/qtest/libqos/pci-spapr.h
index d9e2563..20a4371 100644
--- a/tests/qtest/libqos/pci-spapr.h
+++ b/tests/qtest/libqos/pci-spapr.h
@@ -8,9 +8,9 @@
#ifndef LIBQOS_PCI_SPAPR_H
#define LIBQOS_PCI_SPAPR_H
-#include "libqos/malloc.h"
-#include "libqos/pci.h"
-#include "libqos/qgraph.h"
+#include "malloc.h"
+#include "pci.h"
+#include "qgraph.h"
/* From include/hw/pci-host/spapr.h */
diff --git a/tests/qtest/libqos/pci.c b/tests/qtest/libqos/pci.c
index 2309a72..e1e9618 100644
--- a/tests/qtest/libqos/pci.c
+++ b/tests/qtest/libqos/pci.c
@@ -11,11 +11,11 @@
*/
#include "qemu/osdep.h"
-#include "libqos/pci.h"
+#include "pci.h"
#include "hw/pci/pci_regs.h"
#include "qemu/host-utils.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id,
void (*func)(QPCIDevice *dev, int devfn, void *data),
diff --git a/tests/qtest/libqos/pci.h b/tests/qtest/libqos/pci.h
index 590c175..ee64fde 100644
--- a/tests/qtest/libqos/pci.h
+++ b/tests/qtest/libqos/pci.h
@@ -14,7 +14,7 @@
#define LIBQOS_PCI_H
#include "libqtest.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#define QPCI_PIO_LIMIT 0x10000
diff --git a/tests/qtest/libqos/ppc64_pseries-machine.c b/tests/qtest/libqos/ppc64_pseries-machine.c
index 5d7bd88..24ca179 100644
--- a/tests/qtest/libqos/ppc64_pseries-machine.c
+++ b/tests/qtest/libqos/ppc64_pseries-machine.c
@@ -18,10 +18,10 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#include "pci-spapr.h"
#include "qemu/module.h"
-#include "libqos/malloc-spapr.h"
+#include "malloc-spapr.h"
typedef struct QSPAPR_pci_host QSPAPR_pci_host;
typedef struct Qppc64_pseriesMachine Qppc64_pseriesMachine;
diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c
index eb0af8a..fc49cfa 100644
--- a/tests/qtest/libqos/qgraph.c
+++ b/tests/qtest/libqos/qgraph.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/queue.h"
-#include "libqos/qgraph_internal.h"
-#include "libqos/qgraph.h"
+#include "qgraph_internal.h"
+#include "qgraph.h"
#define QGRAPH_PRINT_DEBUG 0
#define QOS_ROOT ""
diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h
index db1244e..1054326 100644
--- a/tests/qtest/libqos/qgraph.h
+++ b/tests/qtest/libqos/qgraph.h
@@ -106,7 +106,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
* <example>
* <title>Creating new driver an its interface</title>
* <programlisting>
- #include "libqos/qgraph.h"
+ #include "qgraph.h"
struct My_driver {
QOSGraphObject obj;
@@ -190,7 +190,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
* <example>
* <title>Creating new test</title>
* <programlisting>
- * #include "libqos/qgraph.h"
+ * #include "qgraph.h"
*
* static void my_test_function(void *obj, void *data)
* {
@@ -230,7 +230,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
* a valid test path will be:
* "/x86_64/pc/other_node/my_driver/my_interface/my_test".
*
- * Additional examples are also in libqos/test-qgraph.c
+ * Additional examples are also in test-qgraph.c
*
* Command line:
* Command line is built by using node names and optional arguments
diff --git a/tests/qtest/libqos/qgraph_internal.h b/tests/qtest/libqos/qgraph_internal.h
index aa3123f..968fa69 100644
--- a/tests/qtest/libqos/qgraph_internal.h
+++ b/tests/qtest/libqos/qgraph_internal.h
@@ -20,11 +20,11 @@
#define QGRAPH_INTERNAL_H
/* This header is declaring additional helper functions defined in
- * libqos/qgraph.c
+ * qgraph.c
* It should not be included in tests
*/
-#include "libqos/qgraph.h"
+#include "qgraph.h"
typedef struct QOSGraphMachine QOSGraphMachine;
typedef enum QOSEdgeType QOSEdgeType;
diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c
index 0dfc05c..10ee0f7 100644
--- a/tests/qtest/libqos/qos_external.c
+++ b/tests/qtest/libqos/qos_external.c
@@ -24,10 +24,10 @@
#include "qapi/qmp/qstring.h"
#include "qemu/module.h"
#include "qapi/qmp/qlist.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
-#include "libqos/qgraph_internal.h"
-#include "libqos/qos_external.h"
+#include "malloc.h"
+#include "qgraph.h"
+#include "qgraph_internal.h"
+#include "qos_external.h"
static void machine_apply_to_node(const char *name)
{
diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_external.h
index 56a2f37..8446e3d 100644
--- a/tests/qtest/libqos/qos_external.h
+++ b/tests/qtest/libqos/qos_external.h
@@ -19,7 +19,9 @@
#ifndef QOS_EXTERNAL_H
#define QOS_EXTERNAL_H
-#include "libqos/malloc.h"
+#include "qgraph.h"
+
+#include "malloc.h"
#include "qapi/qapi-types-machine.h"
#include "qapi/qapi-types-qom.h"
diff --git a/tests/qtest/libqos/rtas.c b/tests/qtest/libqos/rtas.c
index d81ff42..db29d55 100644
--- a/tests/qtest/libqos/rtas.c
+++ b/tests/qtest/libqos/rtas.c
@@ -5,7 +5,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/rtas.h"
+#include "rtas.h"
static void qrtas_copy_args(QTestState *qts, uint64_t target_args,
uint32_t nargs, uint32_t *args)
diff --git a/tests/qtest/libqos/rtas.h b/tests/qtest/libqos/rtas.h
index 459e23a..f38f99d 100644
--- a/tests/qtest/libqos/rtas.h
+++ b/tests/qtest/libqos/rtas.h
@@ -5,7 +5,7 @@
#ifndef LIBQOS_RTAS_H
#define LIBQOS_RTAS_H
-#include "libqos/malloc.h"
+#include "malloc.h"
int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc,
struct tm *tm, uint32_t *ns);
diff --git a/tests/qtest/libqos/sdhci.c b/tests/qtest/libqos/sdhci.c
index fbf2e36..65f0d07 100644
--- a/tests/qtest/libqos/sdhci.c
+++ b/tests/qtest/libqos/sdhci.c
@@ -18,7 +18,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#include "pci.h"
#include "qemu/module.h"
#include "sdhci.h"
diff --git a/tests/qtest/libqos/sdhci.h b/tests/qtest/libqos/sdhci.h
index 1acd309..22d647b 100644
--- a/tests/qtest/libqos/sdhci.h
+++ b/tests/qtest/libqos/sdhci.h
@@ -19,7 +19,7 @@
#ifndef QGRAPH_QSDHCI_H
#define QGRAPH_QSDHCI_H
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#include "pci.h"
typedef struct QSDHCI QSDHCI;
diff --git a/tests/qtest/libqos/tpci200.c b/tests/qtest/libqos/tpci200.c
index ae590a4..1787b1f 100644
--- a/tests/qtest/libqos/tpci200.c
+++ b/tests/qtest/libqos/tpci200.c
@@ -10,8 +10,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/qgraph.h"
-#include "libqos/pci.h"
+#include "qgraph.h"
+#include "pci.h"
typedef struct QTpci200 QTpci200;
typedef struct QIpack QIpack;
diff --git a/tests/qtest/libqos/usb.c b/tests/qtest/libqos/usb.c
index d7a9cb3..8b45b02 100644
--- a/tests/qtest/libqos/usb.c
+++ b/tests/qtest/libqos/usb.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "hw/usb/uhci-regs.h"
-#include "libqos/usb.h"
+#include "usb.h"
void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar)
{
diff --git a/tests/qtest/libqos/usb.h b/tests/qtest/libqos/usb.h
index eeced39..50030d7 100644
--- a/tests/qtest/libqos/usb.h
+++ b/tests/qtest/libqos/usb.h
@@ -1,7 +1,7 @@
#ifndef LIBQOS_USB_H
#define LIBQOS_USB_H
-#include "libqos/pci-pc.h"
+#include "pci-pc.h"
struct qhc {
QPCIDevice *dev;
diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c
index c87b561..2e30006 100644
--- a/tests/qtest/libqos/virtio-9p.c
+++ b/tests/qtest/libqos/virtio-9p.c
@@ -20,8 +20,8 @@
#include "libqtest.h"
#include "qemu/module.h"
#include "standard-headers/linux/virtio_ids.h"
-#include "libqos/virtio-9p.h"
-#include "libqos/qgraph.h"
+#include "virtio-9p.h"
+#include "qgraph.h"
static QGuestAllocator *alloc;
diff --git a/tests/qtest/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h
index be9621a..b1e6bad 100644
--- a/tests/qtest/libqos/virtio-9p.h
+++ b/tests/qtest/libqos/virtio-9p.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_9P_H
#define TESTS_LIBQOS_VIRTIO_9P_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtio9P QVirtio9P;
typedef struct QVirtio9PPCI QVirtio9PPCI;
diff --git a/tests/qtest/libqos/virtio-balloon.c b/tests/qtest/libqos/virtio-balloon.c
index 9745f4a..a3da5c2 100644
--- a/tests/qtest/libqos/virtio-balloon.c
+++ b/tests/qtest/libqos/virtio-balloon.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-balloon.h"
+#include "qgraph.h"
+#include "virtio-balloon.h"
/* virtio-balloon-device */
static void *qvirtio_balloon_get_driver(QVirtioBalloon *v_balloon,
diff --git a/tests/qtest/libqos/virtio-balloon.h b/tests/qtest/libqos/virtio-balloon.h
index 5b91930..309894c 100644
--- a/tests/qtest/libqos/virtio-balloon.h
+++ b/tests/qtest/libqos/virtio-balloon.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_BALLOON_H
#define TESTS_LIBQOS_VIRTIO_BALLOON_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioBalloon QVirtioBalloon;
typedef struct QVirtioBalloonPCI QVirtioBalloonPCI;
diff --git a/tests/qtest/libqos/virtio-blk.c b/tests/qtest/libqos/virtio-blk.c
index 5fc6940..5da0259 100644
--- a/tests/qtest/libqos/virtio-blk.c
+++ b/tests/qtest/libqos/virtio-blk.c
@@ -20,8 +20,8 @@
#include "libqtest.h"
#include "qemu/module.h"
#include "standard-headers/linux/virtio_blk.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-blk.h"
+#include "qgraph.h"
+#include "virtio-blk.h"
#define PCI_SLOT 0x04
#define PCI_FN 0x00
diff --git a/tests/qtest/libqos/virtio-blk.h b/tests/qtest/libqos/virtio-blk.h
index 5170f13..dcef388 100644
--- a/tests/qtest/libqos/virtio-blk.h
+++ b/tests/qtest/libqos/virtio-blk.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_BLK_H
#define TESTS_LIBQOS_VIRTIO_BLK_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioBlk QVirtioBlk;
typedef struct QVirtioBlkPCI QVirtioBlkPCI;
diff --git a/tests/qtest/libqos/virtio-mmio.c b/tests/qtest/libqos/virtio-mmio.c
index e0a2bd7..75efda3 100644
--- a/tests/qtest/libqos/virtio-mmio.c
+++ b/tests/qtest/libqos/virtio-mmio.c
@@ -10,10 +10,10 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-mmio.h"
-#include "libqos/malloc.h"
-#include "libqos/qgraph.h"
+#include "virtio.h"
+#include "virtio-mmio.h"
+#include "malloc.h"
+#include "qgraph.h"
#include "standard-headers/linux/virtio_ring.h"
static uint8_t qvirtio_mmio_config_readb(QVirtioDevice *d, uint64_t off)
diff --git a/tests/qtest/libqos/virtio-mmio.h b/tests/qtest/libqos/virtio-mmio.h
index 0e45778..30803bc 100644
--- a/tests/qtest/libqos/virtio-mmio.h
+++ b/tests/qtest/libqos/virtio-mmio.h
@@ -10,8 +10,8 @@
#ifndef LIBQOS_VIRTIO_MMIO_H
#define LIBQOS_VIRTIO_MMIO_H
-#include "libqos/virtio.h"
-#include "libqos/qgraph.h"
+#include "virtio.h"
+#include "qgraph.h"
#define QVIRTIO_MMIO_MAGIC_VALUE 0x000
#define QVIRTIO_MMIO_VERSION 0x004
diff --git a/tests/qtest/libqos/virtio-net.c b/tests/qtest/libqos/virtio-net.c
index a9e253a..1cae07f 100644
--- a/tests/qtest/libqos/virtio-net.c
+++ b/tests/qtest/libqos/virtio-net.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-net.h"
+#include "qgraph.h"
+#include "virtio-net.h"
#include "hw/virtio/virtio-net.h"
diff --git a/tests/qtest/libqos/virtio-net.h b/tests/qtest/libqos/virtio-net.h
index b8cbec0..5ba2161 100644
--- a/tests/qtest/libqos/virtio-net.h
+++ b/tests/qtest/libqos/virtio-net.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_NET_H
#define TESTS_LIBQOS_VIRTIO_NET_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioNet QVirtioNet;
typedef struct QVirtioNetPCI QVirtioNetPCI;
diff --git a/tests/qtest/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pci.c
index 62851c2..cd3c0f5 100644
--- a/tests/qtest/libqos/virtio-pci.c
+++ b/tests/qtest/libqos/virtio-pci.c
@@ -9,13 +9,13 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
-#include "libqos/pci.h"
-#include "libqos/pci-pc.h"
-#include "libqos/malloc.h"
-#include "libqos/malloc-pc.h"
-#include "libqos/qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
+#include "pci.h"
+#include "pci-pc.h"
+#include "malloc.h"
+#include "malloc-pc.h"
+#include "qgraph.h"
#include "standard-headers/linux/virtio_ring.h"
#include "standard-headers/linux/virtio_pci.h"
diff --git a/tests/qtest/libqos/virtio-pci.h b/tests/qtest/libqos/virtio-pci.h
index 294d556..f5115ca 100644
--- a/tests/qtest/libqos/virtio-pci.h
+++ b/tests/qtest/libqos/virtio-pci.h
@@ -10,9 +10,9 @@
#ifndef LIBQOS_VIRTIO_PCI_H
#define LIBQOS_VIRTIO_PCI_H
-#include "libqos/virtio.h"
-#include "libqos/pci.h"
-#include "libqos/qgraph.h"
+#include "virtio.h"
+#include "pci.h"
+#include "qgraph.h"
typedef struct QVirtioPCIMSIXOps QVirtioPCIMSIXOps;
diff --git a/tests/qtest/libqos/virtio-rng.c b/tests/qtest/libqos/virtio-rng.c
index 46f8d95..2e09dd7 100644
--- a/tests/qtest/libqos/virtio-rng.c
+++ b/tests/qtest/libqos/virtio-rng.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-rng.h"
+#include "qgraph.h"
+#include "virtio-rng.h"
/* virtio-rng-device */
static void *qvirtio_rng_get_driver(QVirtioRng *v_rng,
diff --git a/tests/qtest/libqos/virtio-rng.h b/tests/qtest/libqos/virtio-rng.h
index 9342372..9ca102b 100644
--- a/tests/qtest/libqos/virtio-rng.h
+++ b/tests/qtest/libqos/virtio-rng.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_RNG_H
#define TESTS_LIBQOS_VIRTIO_RNG_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioRng QVirtioRng;
typedef struct QVirtioRngPCI QVirtioRngPCI;
diff --git a/tests/qtest/libqos/virtio-scsi.c b/tests/qtest/libqos/virtio-scsi.c
index c8c3598..5644e32 100644
--- a/tests/qtest/libqos/virtio-scsi.c
+++ b/tests/qtest/libqos/virtio-scsi.c
@@ -20,8 +20,8 @@
#include "libqtest.h"
#include "qemu/module.h"
#include "standard-headers/linux/virtio_ids.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-scsi.h"
+#include "qgraph.h"
+#include "virtio-scsi.h"
/* virtio-scsi-device */
static void *qvirtio_scsi_get_driver(QVirtioSCSI *v_scsi,
diff --git a/tests/qtest/libqos/virtio-scsi.h b/tests/qtest/libqos/virtio-scsi.h
index 9e3774d..531315e 100644
--- a/tests/qtest/libqos/virtio-scsi.h
+++ b/tests/qtest/libqos/virtio-scsi.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_SCSI_H
#define TESTS_LIBQOS_VIRTIO_SCSI_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioSCSI QVirtioSCSI;
typedef struct QVirtioSCSIPCI QVirtioSCSIPCI;
diff --git a/tests/qtest/libqos/virtio-serial.c b/tests/qtest/libqos/virtio-serial.c
index b956540..ee34afd 100644
--- a/tests/qtest/libqos/virtio-serial.c
+++ b/tests/qtest/libqos/virtio-serial.c
@@ -19,8 +19,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/module.h"
-#include "libqos/qgraph.h"
-#include "libqos/virtio-serial.h"
+#include "qgraph.h"
+#include "virtio-serial.h"
static void *qvirtio_serial_get_driver(QVirtioSerial *v_serial,
const char *interface)
diff --git a/tests/qtest/libqos/virtio-serial.h b/tests/qtest/libqos/virtio-serial.h
index 3328c6c..3db43b2 100644
--- a/tests/qtest/libqos/virtio-serial.h
+++ b/tests/qtest/libqos/virtio-serial.h
@@ -19,9 +19,9 @@
#ifndef TESTS_LIBQOS_VIRTIO_SERIAL_H
#define TESTS_LIBQOS_VIRTIO_SERIAL_H
-#include "libqos/qgraph.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "qgraph.h"
+#include "virtio.h"
+#include "virtio-pci.h"
typedef struct QVirtioSerial QVirtioSerial;
typedef struct QVirtioSerialPCI QVirtioSerialPCI;
diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c
index 9aa3606..6fe7bf9 100644
--- a/tests/qtest/libqos/virtio.c
+++ b/tests/qtest/libqos/virtio.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qemu/bswap.h"
#include "libqtest.h"
-#include "libqos/virtio.h"
+#include "virtio.h"
#include "standard-headers/linux/virtio_config.h"
#include "standard-headers/linux/virtio_ring.h"
diff --git a/tests/qtest/libqos/virtio.h b/tests/qtest/libqos/virtio.h
index 529ef75..b8bd06e 100644
--- a/tests/qtest/libqos/virtio.h
+++ b/tests/qtest/libqos/virtio.h
@@ -10,7 +10,7 @@
#ifndef LIBQOS_VIRTIO_H
#define LIBQOS_VIRTIO_H
-#include "libqos/malloc.h"
+#include "malloc.h"
#include "standard-headers/linux/virtio_ring.h"
#define QVIRTIO_F_BAD_FEATURE 0x40000000ull
diff --git a/tests/qtest/libqos/x86_64_pc-machine.c b/tests/qtest/libqos/x86_64_pc-machine.c
index 0edb1c9..ad96742 100644
--- a/tests/qtest/libqos/x86_64_pc-machine.c
+++ b/tests/qtest/libqos/x86_64_pc-machine.c
@@ -18,7 +18,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "libqos/qgraph.h"
+#include "qgraph.h"
#include "pci-pc.h"
#include "qemu/module.h"
#include "malloc-pc.h"
diff --git a/tests/qtest/libqtest-single.h b/tests/qtest/libqtest-single.h
index 6f1bb13..176979a 100644
--- a/tests/qtest/libqtest-single.h
+++ b/tests/qtest/libqtest-single.h
@@ -11,7 +11,7 @@
#ifndef LIBQTEST_SINGLE_H
#define LIBQTEST_SINGLE_H
-#include "libqtest.h"
+#include "libqos/libqtest.h"
QTestState *global_qtest __attribute__((common, weak));
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index fd46805..26f1223 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -20,7 +20,7 @@
#include <sys/wait.h>
#include <sys/un.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu-common.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c
index b94a123..6db3234 100644
--- a/tests/qtest/m48t59-test.c
+++ b/tests/qtest/m48t59-test.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#define RTC_SECONDS 0x9
#define RTC_MINUTES 0xa
diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index 57107f1..aab06b9 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu/cutils.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/megasas-test.c b/tests/qtest/megasas-test.c
index d6796b9..eae70ff 100644
--- a/tests/qtest/megasas-test.c
+++ b/tests/qtest/megasas-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/bswap.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
new file mode 100644
index 0000000..820c15c
--- /dev/null
+++ b/tests/qtest/meson.build
@@ -0,0 +1,254 @@
+# All QTests for now are POSIX-only, but the dependencies are
+# really in libqtest, not in the testcases themselves.
+if not config_host.has_key('CONFIG_POSIX')
+ subdir_done()
+endif
+
+qtests_generic = [
+ 'cdrom-test',
+ 'device-introspect-test',
+ 'machine-none-test',
+ 'qmp-test',
+ 'qmp-cmd-test',
+ 'qom-test',
+ 'test-hmp',
+ 'qos-test',
+]
+if config_host.has_key('CONFIG_MODULES')
+ qtests_generic += [ 'modules-test' ]
+endif
+
+qtests_pci = \
+ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : [])
+
+qtests_i386 = \
+ (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
+ (have_tools ? ['ahci-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['test-filter-redirector'] : []) + \
+ (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \
+ (config_host.has_key('CONFIG_LINUX') and \
+ config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_PVPANIC') ? ['pvpanic-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_USB_UHCI') and \
+ config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-swtpm-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test'] : []) + \
+ qtests_pci + \
+ ['fdc-test',
+ 'ide-test',
+ 'ahci-test',
+ 'hd-geo-test',
+ 'boot-order-test',
+ 'bios-tables-test',
+ 'rtc-test',
+ 'i440fx-test',
+ 'fw_cfg-test',
+ 'device-plug-test',
+ 'drive_del-test',
+ 'tco-test',
+ 'cpu-plug-test',
+ 'q35-test',
+ 'vmgenid-test',
+ 'migration-test',
+ 'test-x86-cpuid-compat',
+ 'numa-test']
+
+dbus_daemon = find_program('dbus-daemon')
+if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
+ # Temporarily disabled due to Patchew failures:
+ #qtests_i386 += ['dbus-vmstate-test']
+ dbus_vmstate1 = custom_target('dbus-vmstate description',
+ output: ['dbus-vmstate1.h', 'dbus-vmstate1.c'],
+ input: files('dbus-vmstate1.xml'),
+ command: [config_host['GDBUS_CODEGEN'],
+ '@INPUT@',
+ '--interface-prefix', 'org.qemu',
+ '--generate-c-code', '@BASENAME@'])
+endif
+
+qtests_x86_64 = qtests_i386
+
+qtests_alpha = [ 'boot-serial-test' ] + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
+
+qtests_avr = [ 'boot-serial-test' ]
+
+qtests_hppa = [ 'boot-serial-test' ] + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
+
+qtests_m68k = [ 'boot-serial-test' ]
+qtests_microblaze = [ 'boot-serial-test' ]
+qtests_microblazeel = qtests_microblaze
+
+qtests_mips = \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
+
+qtests_mips64 = \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
+
+qtests_mips64el = \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
+
+qtests_moxie = [ 'boot-serial-test' ]
+
+qtests_ppc = \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
+ ['boot-order-test', 'prom-env-test', 'drive_del-test', 'boot-serial-test'] \
+
+qtests_ppc64 = \
+ (config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \
+ (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
+ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
+ qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test']
+
+qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
+qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
+
+qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test']
+
+qtests_sparc64 = \
+ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
+ ['prom-env-test', 'boot-serial-test']
+
+qtests_arm = \
+ (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \
+ ['arm-cpu-features',
+ 'microbit-test',
+ 'm25p80-test',
+ 'test-arm-mptimer',
+ 'boot-serial-test',
+ 'hexloader-test']
+
+# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
+qtests_aarch64 = \
+ (cpu != 'arm' ? ['bios-tables-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
+ ['numa-test',
+ 'boot-serial-test',
+ 'migration-test']
+
+qtests_s390x = \
+ (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
+ ['boot-serial-test',
+ 'drive_del-test',
+ 'device-plug-test',
+ 'virtio-ccw-test',
+ 'cpu-plug-test',
+ 'migration-test']
+
+qos_test_srcs = files(
+ 'ac97-test.c',
+ 'ds1338-test.c',
+ 'e1000-test.c',
+ 'e1000e-test.c',
+ 'eepro100-test.c',
+ 'es1370-test.c',
+ 'ipoctal232-test.c',
+ 'megasas-test.c',
+ 'ne2000-test.c',
+ 'tulip-test.c',
+ 'nvme-test.c',
+ 'pca9552-test.c',
+ 'pci-test.c',
+ 'pcnet-test.c',
+ 'sdhci-test.c',
+ 'spapr-phb-test.c',
+ 'tmp105-test.c',
+ 'usb-hcd-ohci-test.c',
+ 'vhost-user-test.c',
+ 'virtio-test.c',
+ 'virtio-9p-test.c',
+ 'virtio-blk-test.c',
+ 'virtio-net-test.c',
+ 'virtio-rng-test.c',
+ 'virtio-scsi-test.c',
+ 'virtio-serial-test.c',
+ 'vmxnet3-test.c',
+)
+
+extra_qtest_deps = {
+ 'bios-tables-test': [io],
+ 'ivshmem-test': [rt],
+ 'qos-test': [chardev, io],
+ 'tpm-crb-swtpm-test': [io],
+ 'tpm-crb-test': [io],
+ 'tpm-tis-swtpm-test': [io],
+ 'tpm-tis-test': [io],
+ 'tpm-tis-device-swtpm-test': [io],
+ 'tpm-tis-device-test': [io],
+}
+extra_qtest_srcs = {
+ 'bios-tables-test': files('boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'),
+ 'pxe-test': files('boot-sector.c'),
+ 'cdrom-test': files('boot-sector.c'),
+ 'migration-test': files('migration-helpers.c'),
+ 'ivshmem-test': files('../../contrib/ivshmem-server/ivshmem-server.c'),
+ 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1.to_list(),
+ 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
+ 'tpm-crb-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
+ 'tpm-crb-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
+ 'tpm-tis-device-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
+ 'tpm-tis-device-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
+ 'tpm-tis-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
+ 'tpm-tis-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
+ 'qos-test': qos_test_srcs
+}
+
+
+qtest_executables = {}
+foreach dir : target_dirs
+ if not dir.endswith('-softmmu')
+ continue
+ endif
+
+ target_base = dir.split('-')[0]
+ qtests = get_variable('qtests_' + target_base, []) + qtests_generic
+
+ qtest_env = environment()
+ qtest_env.set('QTEST_QEMU_IMG', './qemu-img')
+ qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
+ qtest_env.set('QTEST_QEMU_BINARY', '@0@-softmmu/qemu-system-@0@'.format(target_base))
+
+ foreach test : qtests
+ # Executables are shared across targets, declare them only the first time we
+ # encounter them
+ if not qtest_executables.has_key(test)
+ qtest_executables += {
+ test: executable(test,
+ files(test + '.c') + extra_qtest_srcs.get(test, []),
+ dependencies: [qemuutil, qos] + extra_qtest_deps.get(test, []))
+ }
+ endif
+ # FIXME: missing dependency on the emulator binary and qemu-img
+ test('qtest-@0@: @1@'.format(target_base, test),
+ qtest_executables[test],
+ env: qtest_env,
+ args: ['--tap', '-k'],
+ protocol: 'tap',
+ suite: ['qtest', 'qtest-' + target_base])
+ endforeach
+endforeach
diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
index 04e199e..2b25557 100644
--- a/tests/qtest/microbit-test.c
+++ b/tests/qtest/microbit-test.c
@@ -16,7 +16,7 @@
#include "qemu/osdep.h"
#include "exec/hwaddr.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "hw/arm/nrf51.h"
#include "hw/char/nrf51_uart.h"
diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h
index a11808b..d63bba9 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration-helpers.h
@@ -12,7 +12,7 @@
#ifndef MIGRATION_HELPERS_H_
#define MIGRATION_HELPERS_H_
-#include "libqtest.h"
+#include "libqos/libqtest.h"
extern bool got_stop;
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 21ea5ba..00a233c 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qemu/module.h"
@@ -25,7 +25,7 @@
#include "qapi/qobject-output-visitor.h"
#include "migration-helpers.h"
-#include "migration/migration-test.h"
+#include "tests/migration/migration-test.h"
/* TODO actually test the results and get rid of this */
#define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS__))
diff --git a/tests/qtest/modules-test.c b/tests/qtest/modules-test.c
index 8821768..c238b3f 100644
--- a/tests/qtest/modules-test.c
+++ b/tests/qtest/modules-test.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
const char common_args[] = "-nodefaults -machine none";
diff --git a/tests/qtest/ne2000-test.c b/tests/qtest/ne2000-test.c
index 3fc0e55..43cfc45 100644
--- a/tests/qtest/ne2000-test.c
+++ b/tests/qtest/ne2000-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c
index e1ed6d4..b25ebf9 100644
--- a/tests/qtest/numa-test.c
+++ b/tests/qtest/numa-test.c
@@ -10,7 +10,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/qtest/nvme-test.c b/tests/qtest/nvme-test.c
index ff04421..d32c953 100644
--- a/tests/qtest/nvme-test.c
+++ b/tests/qtest/nvme-test.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "qemu/units.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c
index d80ed93..42a1312 100644
--- a/tests/qtest/pca9552-test.c
+++ b/tests/qtest/pca9552-test.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
#include "hw/misc/pca9552_regs.h"
diff --git a/tests/qtest/pci-test.c b/tests/qtest/pci-test.c
index 4b2092b..e15d4d9 100644
--- a/tests/qtest/pci-test.c
+++ b/tests/qtest/pci-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/pcnet-test.c b/tests/qtest/pcnet-test.c
index 900944f..7583aeb 100644
--- a/tests/qtest/pcnet-test.c
+++ b/tests/qtest/pcnet-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-test.c
index 17aa669..afb702b 100644
--- a/tests/qtest/pflash-cfi02-test.c
+++ b/tests/qtest/pflash-cfi02-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
/*
* To test the pflash_cfi02 device, we run QEMU with the musicpal machine with
diff --git a/tests/qtest/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c
index 2c46d5c..c8d4043 100644
--- a/tests/qtest/pnv-xscom-test.c
+++ b/tests/qtest/pnv-xscom-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
typedef enum PnvChipType {
PNV_CHIP_POWER8E, /* AKA Murano (default) */
diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
index 60e6ec3..f41d801 100644
--- a/tests/qtest/prom-env-test.c
+++ b/tests/qtest/prom-env-test.c
@@ -20,7 +20,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/libqos-spapr.h"
#define MAGIC 0xcafec0de
diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c
index ff9176a..e576394 100644
--- a/tests/qtest/pvpanic-test.c
+++ b/tests/qtest/pvpanic-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
static void test_panic(void)
diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
index 1161a77..32bbae3 100644
--- a/tests/qtest/pxe-test.c
+++ b/tests/qtest/pxe-test.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
#include "qemu-common.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "boot-sector.h"
#include "libqos/libqos-spapr.h"
diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c
index c922d81..b7cf144 100644
--- a/tests/qtest/q35-test.c
+++ b/tests/qtest/q35-test.c
@@ -10,7 +10,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "hw/pci-host/q35.h"
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index f7b1aa7..f34e688 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c
index 1a8876b..5950c3e 100644
--- a/tests/qtest/qmp-test.c
+++ b/tests/qtest/qmp-test.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-control.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index 1acf0d7..eb34af8 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -13,7 +13,7 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qemu/cutils.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
static void test_properties(QTestState *qts, const char *path, bool recurse)
{
diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c
index 167b42d..a7e83e7 100644
--- a/tests/qtest/rtas-test.c
+++ b/tests/qtest/rtas-test.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/libqos-spapr.h"
#include "libqos/rtas.h"
diff --git a/tests/qtest/sdhci-test.c b/tests/qtest/sdhci-test.c
index 6275e76..a110cfe 100644
--- a/tests/qtest/sdhci-test.c
+++ b/tests/qtest/sdhci-test.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "hw/registerfields.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/pci-pc.h"
#include "hw/pci/pci.h"
diff --git a/tests/qtest/spapr-phb-test.c b/tests/qtest/spapr-phb-test.c
index 093dc22..ea8d596 100644
--- a/tests/qtest/spapr-phb-test.c
+++ b/tests/qtest/spapr-phb-test.c
@@ -9,7 +9,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c
index 254f735..47bc7ad 100644
--- a/tests/qtest/tco-test.c
+++ b/tests/qtest/tco-test.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c
index 1e3ced8..bc0dee6 100644
--- a/tests/qtest/test-filter-mirror.c
+++ b/tests/qtest/test-filter-mirror.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter-redirector.c
index e4d5322..829db8c 100644
--- a/tests/qtest/test-filter-redirector.c
+++ b/tests/qtest/test-filter-redirector.c
@@ -52,7 +52,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c
index d5e7ebd..aea1384 100644
--- a/tests/qtest/test-hmp.c
+++ b/tests/qtest/test-hmp.c
@@ -15,7 +15,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
static int verbose;
diff --git a/tests/qtest/tpm-crb-swtpm-test.c b/tests/qtest/tpm-crb-swtpm-test.c
index 55fdb56..1d82a48 100644
--- a/tests/qtest/tpm-crb-swtpm-test.c
+++ b/tests/qtest/tpm-crb-swtpm-test.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "tpm-tests.h"
#include "hw/acpi/tpm.h"
diff --git a/tests/qtest/tpm-tis-device-swtpm-test.c b/tests/qtest/tpm-tis-device-swtpm-test.c
index 7b20035..f7126ef 100644
--- a/tests/qtest/tpm-tis-device-swtpm-test.c
+++ b/tests/qtest/tpm-tis-device-swtpm-test.c
@@ -16,7 +16,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "tpm-tests.h"
#include "hw/acpi/tpm.h"
diff --git a/tests/qtest/tpm-tis-swtpm-test.c b/tests/qtest/tpm-tis-swtpm-test.c
index 90131cb..fa590e6 100644
--- a/tests/qtest/tpm-tis-swtpm-test.c
+++ b/tests/qtest/tpm-tis-swtpm-test.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "tpm-tests.h"
#include "hw/acpi/tpm.h"
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index 58a9593..e2b29ef 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include "hw/acpi/tpm.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "tpm-util.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/tulip-test.c b/tests/qtest/tulip-test.c
index 2fb6c4d..da16cbf 100644
--- a/tests/qtest/tulip-test.c
+++ b/tests/qtest/tulip-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/virtio-rng-test.c b/tests/qtest/virtio-rng-test.c
index 092ba13..e6b8cd8 100644
--- a/tests/qtest/virtio-rng-test.c
+++ b/tests/qtest/virtio-rng-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/virtio-rng.h"
diff --git a/tests/qtest/virtio-test.c b/tests/qtest/virtio-test.c
index f7c6afd..6313417 100644
--- a/tests/qtest/virtio-test.c
+++ b/tests/qtest/virtio-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
index efba76e..6781a51 100644
--- a/tests/qtest/vmgenid-test.c
+++ b/tests/qtest/vmgenid-test.c
@@ -14,7 +14,7 @@
#include "hw/acpi/acpi-defs.h"
#include "boot-sector.h"
#include "acpi-utils.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"
diff --git a/tests/qtest/vmxnet3-test.c b/tests/qtest/vmxnet3-test.c
index a810252..97c23fd 100644
--- a/tests/qtest/vmxnet3-test.c
+++ b/tests/qtest/vmxnet3-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qemu/module.h"
#include "libqos/qgraph.h"
#include "libqos/pci.h"
diff --git a/tests/qtest/wdt_ib700-test.c b/tests/qtest/wdt_ib700-test.c
index 797288d..6c36e43 100644
--- a/tests/qtest/wdt_ib700-test.c
+++ b/tests/qtest/wdt_ib700-test.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/timer.h"
diff --git a/tests/test-qga.c b/tests/test-qga.c
index d1b4c3e..4ac4c22 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "libqtest.h"
+#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/test-qgraph.c b/tests/test-qgraph.c
index 5c7e457..267291c 100644
--- a/tests/test-qgraph.c
+++ b/tests/test-qgraph.c
@@ -17,9 +17,8 @@
*/
#include "qemu/osdep.h"
-#include "libqtest.h"
-#include "libqos/qgraph.h"
-#include "libqos/qgraph_internal.h"
+#include "qtest/libqos/qgraph.h"
+#include "qtest/libqos/qgraph_internal.h"
#define MACHINE_PC "x86_64/pc"
#define MACHINE_RASPI2 "arm/raspi2"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 064/143] meson: convert audio directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (62 preceding siblings ...)
2020-08-06 19:14 ` [PATCH 063/143] meson: convert tests/qtest to meson Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 065/143] meson: convert ui " Paolo Bonzini
` (83 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 8 ++++++--
Makefile.target | 3 ++-
audio/Makefile.objs | 35 -----------------------------------
audio/meson.build | 32 ++++++++++++++++++++++++++++++++
configure | 16 ++++++++++++++++
meson.build | 29 ++++++++++++++++++++++++++++-
6 files changed, 84 insertions(+), 39 deletions(-)
delete mode 100644 audio/Makefile.objs
create mode 100644 audio/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 4c6631a..cd916a9 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -48,6 +48,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = blockdev.o blockdev-nbd.o block/
+
common-obj-y += bootdevice.o iothread.o
common-obj-y += dump/
common-obj-y += job-qmp.o
@@ -62,6 +63,11 @@ common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
common-obj-y += migration/
+common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
+common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
+common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF)
+common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF)
+
common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF)
common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF)
common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF)
@@ -72,8 +78,6 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF)
-common-obj-y += audio/
-common-obj-m += audio/
common-obj-y += hw/
common-obj-m += hw/
diff --git a/Makefile.target b/Makefile.target
index c8c4b70..ff0e1b2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -166,9 +166,10 @@ LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
LIBS := $(LIBS) @../block.syms @../qemu.syms
ifneq ($(CONFIG_MODULES),y)
-LIBS := $(LIBS)
+LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS)
endif
LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS)
+LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
diff --git a/audio/Makefile.objs b/audio/Makefile.objs
deleted file mode 100644
index b4a4c11..0000000
--- a/audio/Makefile.objs
+++ /dev/null
@@ -1,35 +0,0 @@
-common-obj-y = audio.o audio_legacy.o noaudio.o wavaudio.o mixeng.o
-common-obj-$(CONFIG_SPICE) += spiceaudio.o
-common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o
-common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o
-common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
-common-obj-y += wavcapture.o
-
-coreaudio.o-libs := $(COREAUDIO_LIBS)
-dsoundaudio.o-libs := $(DSOUND_LIBS)
-
-# alsa module
-common-obj-$(CONFIG_AUDIO_ALSA) += alsa.mo
-alsa.mo-objs = alsaaudio.o
-alsa.mo-libs := $(ALSA_LIBS)
-
-# oss module
-common-obj-$(CONFIG_AUDIO_OSS) += oss.mo
-oss.mo-objs = ossaudio.o
-oss.mo-libs := $(OSS_LIBS)
-
-# pulseaudio module
-common-obj-$(CONFIG_AUDIO_PA) += pa.mo
-pa.mo-objs = paaudio.o
-pa.mo-libs := $(PULSE_LIBS)
-
-# sdl module
-common-obj-$(CONFIG_AUDIO_SDL) += sdl.mo
-sdl.mo-objs = sdlaudio.o
-sdl.mo-cflags := $(SDL_CFLAGS)
-sdl.mo-libs := $(SDL_LIBS)
-
-# jack module
-common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
-jack.mo-objs = jackaudio.o
-jack.mo-libs := $(JACK_LIBS)
diff --git a/audio/meson.build b/audio/meson.build
new file mode 100644
index 0000000..0813722
--- /dev/null
+++ b/audio/meson.build
@@ -0,0 +1,32 @@
+softmmu_ss.add(files(
+ 'audio.c',
+ 'audio_legacy.c',
+ 'mixeng.c',
+ 'noaudio.c',
+ 'wavaudio.c',
+ 'wavcapture.c',
+))
+
+softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spiceaudio.c'))
+softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], if_true: files('coreaudio.c'))
+softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true: files('dsoundaudio.c'))
+softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: files('audio_win_int.c'))
+
+audio_modules = []
+if 'CONFIG_AUDIO_ALSA' in config_host
+ audio_modules += [['alsa', files('alsaaudio.c'), alsa]]
+endif
+if 'CONFIG_AUDIO_OSS' in config_host
+ audio_modules += [['oss', files('ossaudio.c'), oss]]
+endif
+if 'CONFIG_AUDIO_PA' in config_host
+ audio_modules += [['pa', files('paaudio.c'), pulse]]
+endif
+if 'CONFIG_AUDIO_SDL' in config_host
+ audio_modules += [['sdl', files('sdlaudio.c'), sdl]]
+endif
+if 'CONFIG_AUDIO_JACK' in config_host
+ audio_modules += [['jack', files('jackaudio.c'), jack]]
+endif
+
+modules += {'audio': audio_modules}
diff --git a/configure b/configure
index 1b62959..653f55b 100755
--- a/configure
+++ b/configure
@@ -3700,6 +3700,8 @@ for drv in $audio_drv_list; do
alsa | try-alsa)
if $pkg_config alsa --exists; then
alsa_libs=$($pkg_config alsa --libs)
+ alsa_cflags=$($pkg_config alsa --cflags)
+ alsa=yes
if test "$drv" = "try-alsa"; then
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa/alsa/')
fi
@@ -3715,7 +3717,9 @@ for drv in $audio_drv_list; do
pa | try-pa)
if $pkg_config libpulse --exists; then
+ libpulse=yes
pulse_libs=$($pkg_config libpulse --libs)
+ pulse_cflags=$($pkg_config libpulse --cflags)
if test "$drv" = "try-pa"; then
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/')
fi
@@ -3758,6 +3762,7 @@ for drv in $audio_drv_list; do
jack | try-jack)
if $pkg_config jack --exists; then
+ libjack=yes
jack_libs=$($pkg_config jack --libs)
if test "$drv" = "try-jack"; then
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-jack/jack/')
@@ -6961,11 +6966,22 @@ for drv in $audio_drv_list; do
echo "$def=y" >> $config_host_mak ;;
esac
done
+if test "$alsa" = "yes" ; then
+ echo "CONFIG_ALSA=y" >> $config_host_mak
+fi
echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak
+echo "ALSA_CFLAGS=$alsa_cflags" >> $config_host_mak
+if test "$libpulse" = "yes" ; then
+ echo "CONFIG_LIBPULSE=y" >> $config_host_mak
+fi
echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
+echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
echo "OSS_LIBS=$oss_libs" >> $config_host_mak
+if test "$libjack" = "yes" ; then
+ echo "CONFIG_LIBJACK=y" >> $config_host_mak
+fi
echo "JACK_LIBS=$jack_libs" >> $config_host_mak
if test "$audio_win_int" = "yes" ; then
echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index a81516a..6fd88bb 100644
--- a/meson.build
+++ b/meson.build
@@ -135,6 +135,20 @@ if 'CONFIG_XKBCOMMON' in config_host
xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
link_args: config_host['XKBCOMMON_LIBS'].split())
endif
+pulse = not_found
+if 'CONFIG_LIBPULSE' in config_host
+ pulse = declare_dependency(compile_args: config_host['PULSE_CFLAGS'].split(),
+ link_args: config_host['PULSE_LIBS'].split())
+endif
+alsa = not_found
+if 'CONFIG_ALSA' in config_host
+ alsa = declare_dependency(compile_args: config_host['ALSA_CFLAGS'].split(),
+ link_args: config_host['ALSA_LIBS'].split())
+endif
+jack = not_found
+if 'CONFIG_LIBJACK' in config_host
+ jack = declare_dependency(link_args: config_host['JACK_LIBS'].split())
+endif
spice = not_found
if 'CONFIG_SPICE' in config_host
spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(),
@@ -200,6 +214,18 @@ liblzfse = not_found
if 'CONFIG_LZFSE' in config_host
liblzfse = declare_dependency(link_args: config_host['LZFSE_LIBS'].split())
endif
+oss = not_found
+if 'CONFIG_AUDIO_OSS' in config_host
+ oss = declare_dependency(link_args: config_host['OSS_LIBS'].split())
+endif
+dsound = not_found
+if 'CONFIG_AUDIO_DSOUND' in config_host
+ dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
+endif
+coreaudio = not_found
+if 'CONFIG_AUDIO_COREAUDIO' in config_host
+ coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -494,6 +520,7 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+subdir('audio')
subdir('io')
subdir('chardev')
subdir('fsdev')
@@ -526,7 +553,7 @@ foreach d, list : modules
else
softmmu_mods += sl
endif
- mods += {'dir': d, 'name': m[0], 'lib': sl, 'deps': m[2]}
+ mods += {'dir': d, 'name': m[0], 'lib': [sl, libmodulecommon], 'deps': m[2]}
else
if d == 'block'
block_ss.add(when: [m.get(3, []), m[2]], if_true: m[1])
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 065/143] meson: convert ui directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (63 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 064/143] meson: convert audio directory to Meson Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 066/143] meson: convert root " Paolo Bonzini
` (82 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 8 +++---
Makefile.target | 8 +++---
configure | 6 +++++
meson.build | 50 +++++++++++++++++++++++++++++++++++
ui/Makefile.objs | 73 ---------------------------------------------------
ui/meson.build | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ui/shader.c | 6 ++---
7 files changed, 148 insertions(+), 83 deletions(-)
delete mode 100644 ui/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index cd916a9..2463df8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -68,6 +68,11 @@ common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF)
+common-obj-$(if $(CONFIG_CURSES),m) += ui-curses$(DSOSUF)
+common-obj-$(if $(CONFIG_GTK),m) += ui-gtk$(DSOSUF)
+common-obj-$(if $(CONFIG_SDL),m) += ui-sdl$(DSOSUF)
+common-obj-$(if $(CONFIG_SPICE),m) += ui-spice-app$(DSOSUF)
+
common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF)
common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF)
common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF)
@@ -83,9 +88,6 @@ common-obj-m += hw/
common-obj-y += replay/
-common-obj-y += ui/
-common-obj-m += ui/
-
common-obj-y += dma-helpers.o
common-obj-$(CONFIG_TPM) += tpm.o
diff --git a/Makefile.target b/Makefile.target
index ff0e1b2..16f1e78 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -167,8 +167,9 @@ LIBS := $(libs_softmmu) $(LIBS)
LIBS := $(LIBS) @../block.syms @../qemu.syms
ifneq ($(CONFIG_MODULES),y)
LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS)
+LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS)
endif
-LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS)
+LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS)
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
# Hardware support
@@ -207,9 +208,8 @@ dummy := $(call fix-paths,../,, \
crypto-obj-y \
io-obj-y \
qom-obj-y)
-dummy := $(call unnest-vars,.., \
- common-obj-y \
- common-obj-m)
+dummy := $(call unnest-vars,..,common-obj-y)
+
all-obj-y += $(common-obj-y)
all-obj-y += $(qom-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y)
diff --git a/configure b/configure
index 653f55b..c1bc16b 100755
--- a/configure
+++ b/configure
@@ -6994,12 +6994,18 @@ fi
if test "$vnc_sasl" = "yes" ; then
echo "CONFIG_VNC_SASL=y" >> $config_host_mak
fi
+echo "SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
+echo "SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
if test "$vnc_jpeg" = "yes" ; then
echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
fi
+echo "JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
+echo "JPEG_LIBS=$vnc_jpeg_libs" >> $config_host_mak
if test "$vnc_png" = "yes" ; then
echo "CONFIG_VNC_PNG=y" >> $config_host_mak
fi
+echo "PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
+echo "PNG_LIBS=$vnc_png_libs" >> $config_host_mak
if test "$xkbcommon" = "yes" ; then
echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 6fd88bb..9b0aa18 100644
--- a/meson.build
+++ b/meson.build
@@ -226,6 +226,56 @@ coreaudio = not_found
if 'CONFIG_AUDIO_COREAUDIO' in config_host
coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split())
endif
+opengl = not_found
+if 'CONFIG_OPENGL' in config_host
+ opengl = declare_dependency(link_args: config_host['OPENGL_LIBS'].split())
+else
+endif
+gtk = not_found
+if 'CONFIG_GTK' in config_host
+ gtk = declare_dependency(compile_args: config_host['GTK_CFLAGS'].split(),
+ link_args: config_host['GTK_LIBS'].split())
+endif
+vte = not_found
+if 'CONFIG_VTE' in config_host
+ vte = declare_dependency(compile_args: config_host['VTE_CFLAGS'].split(),
+ link_args: config_host['VTE_LIBS'].split())
+endif
+x11 = not_found
+if 'CONFIG_X11' in config_host
+ x11 = declare_dependency(compile_args: config_host['X11_CFLAGS'].split(),
+ link_args: config_host['X11_LIBS'].split())
+endif
+curses = not_found
+if 'CONFIG_CURSES' in config_host
+ curses = declare_dependency(compile_args: config_host['CURSES_CFLAGS'].split(),
+ link_args: config_host['CURSES_LIBS'].split())
+endif
+iconv = not_found
+if 'CONFIG_ICONV' in config_host
+ iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(),
+ link_args: config_host['ICONV_LIBS'].split())
+endif
+gio = not_found
+if 'CONFIG_GIO' in config_host
+ gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),
+ link_args: config_host['GIO_LIBS'].split())
+endif
+png = not_found
+if 'CONFIG_VNC_PNG' in config_host
+ png = declare_dependency(compile_args: config_host['PNG_CFLAGS'].split(),
+ link_args: config_host['PNG_LIBS'].split())
+endif
+jpeg = not_found
+if 'CONFIG_VNC_JPEG' in config_host
+ jpeg = declare_dependency(compile_args: config_host['JPEG_CFLAGS'].split(),
+ link_args: config_host['JPEG_LIBS'].split())
+endif
+sasl = not_found
+if 'CONFIG_VNC_SASL' in config_host
+ sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(),
+ link_args: config_host['SASL_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
deleted file mode 100644
index 504b196..0000000
--- a/ui/Makefile.objs
+++ /dev/null
@@ -1,73 +0,0 @@
-vnc-obj-y += vnc.o
-vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
-vnc-obj-y += vnc-enc-tight.o vnc-palette.o
-vnc-obj-y += vnc-enc-zrle.o
-vnc-obj-y += vnc-auth-vencrypt.o
-vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
-vnc-obj-y += vnc-ws.o
-vnc-obj-y += vnc-jobs.o
-
-common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o
-common-obj-y += input.o input-keymap.o input-legacy.o kbd-state.o
-common-obj-y += input-barrier.o
-common-obj-$(CONFIG_LINUX) += input-linux.o
-common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
-common-obj-$(CONFIG_COCOA) += cocoa.o
-common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
-common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
-ifneq (,$(findstring m,$(CONFIG_SDL)$(CONFIG_GTK)))
-common-obj-$(CONFIG_WIN32) += win32-kbd-hook.o
-endif
-
-# ui-sdl module
-common-obj-$(CONFIG_SDL) += sdl.mo
-sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o
-ifeq ($(CONFIG_OPENGL),y)
-sdl.mo-objs += sdl2-gl.o
-endif
-sdl.mo-cflags := $(SDL_CFLAGS)
-sdl.mo-libs := $(SDL_LIBS)
-
-# ui-gtk module
-common-obj-$(CONFIG_GTK) += gtk.mo
-gtk.mo-objs := gtk.o
-gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
-gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
-ifeq ($(CONFIG_OPENGL),y)
-gtk.mo-objs += gtk-egl.o
-gtk.mo-libs += $(OPENGL_LIBS)
-ifeq ($(CONFIG_GTK_GL),y)
-gtk.mo-objs += gtk-gl-area.o
-endif
-endif
-
-ifeq ($(CONFIG_X11),y)
-sdl.mo-objs += x_keymap.o
-gtk.mo-objs += x_keymap.o
-x_keymap.o-cflags := $(X11_CFLAGS)
-x_keymap.o-libs := $(X11_LIBS)
-endif
-
-common-obj-$(CONFIG_CURSES) += curses.mo
-curses.mo-objs := curses.o
-curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS)
-curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS)
-
-ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy)
-common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo
-endif
-spice-app.mo-objs := spice-app.o
-spice-app.mo-cflags := $(GIO_CFLAGS)
-spice-app.mo-libs := $(GIO_LIBS)
-
-common-obj-$(CONFIG_OPENGL) += shader.o
-common-obj-$(CONFIG_OPENGL) += console-gl.o
-common-obj-$(CONFIG_OPENGL) += egl-helpers.o
-common-obj-$(CONFIG_OPENGL) += egl-context.o
-common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
-
-shader.o-libs += $(OPENGL_LIBS)
-console-gl.o-libs += $(OPENGL_LIBS)
-egl-helpers.o-libs += $(OPENGL_LIBS)
-egl-context.o-libs += $(OPENGL_LIBS)
-egl-headless.o-libs += $(OPENGL_LIBS)
diff --git a/ui/meson.build b/ui/meson.build
index 8157754..36a70c3 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -1,3 +1,81 @@
+softmmu_ss.add(files(
+ 'console.c',
+ 'cursor.c',
+ 'input-keymap.c',
+ 'input-legacy.c',
+ 'input-barrier.c',
+ 'input.c',
+ 'kbd-state.c',
+ 'keymaps.c',
+ 'qemu-pixman.c',
+))
+softmmu_ss.add(pixman)
+
+softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c'))
+softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice-input.c', 'spice-display.c'))
+softmmu_ss.add(when: [cocoa, 'CONFIG_COCOA'], if_true: files('cocoa.m'))
+
+vnc_ss = ss.source_set()
+vnc_ss.add(files(
+ 'vnc.c',
+ 'vnc-enc-zlib.c',
+ 'vnc-enc-hextile.c',
+ 'vnc-enc-tight.c',
+ 'vnc-palette.c',
+ 'vnc-enc-zrle.c',
+ 'vnc-auth-vencrypt.c',
+ 'vnc-ws.c',
+ 'vnc-jobs.c',
+))
+vnc_ss.add(zlib)
+vnc_ss.add(when: 'CONFIG_VNC_SASL', if_true: [files('vnc-auth-sasl.c'), sasl])
+softmmu_ss.add_all(when: 'CONFIG_VNC', if_true: vnc_ss)
+softmmu_ss.add(when: 'CONFIG_VNC', if_false: files('vnc-stubs.c'))
+softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c', 'egl-context.c'))
+softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL_DMABUF'], if_true: files('egl-headless.c'))
+softmmu_ss.add(when: 'CONFIG_VNC_PNG', if_true: png)
+softmmu_ss.add(when: 'CONFIG_VNC_JPEG', if_true: jpeg)
+
+ui_modules = []
+
+if config_host.has_key('CONFIG_CURSES')
+ ui_modules += [['curses', files('curses.c'), [curses, iconv]]]
+endif
+
+if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE')
+ softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
+
+ gtk_ss = ss.source_set()
+ gtk_ss.add(gtk, vte, files('gtk.c'))
+ gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
+ gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c'))
+ gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.c'))
+ gtk_ss = gtk_ss.apply(config_host, strict: false)
+ ui_modules += [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]]
+endif
+
+if config_host.has_key('CONFIG_SDL')
+ softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
+
+ sdl_ss = ss.source_set()
+ sdl_ss.add(pixman, glib, files(
+ 'sdl2-2d.c',
+ 'sdl2-input.c',
+ 'sdl2.c',
+ ))
+ sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c'))
+ sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
+ sdl_ss = sdl_ss.apply(config_host, strict: false)
+ ui_modules += [['sdl', sdl_ss.sources(), sdl_ss.dependencies()]]
+endif
+
+if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO')
+ spice_ss = ss.source_set()
+ spice_ss.add(spice, gio, files('spice-app.c'))
+ spice_ss = spice_ss.apply(config_host, strict: false)
+ ui_modules += [['spice-app', spice_ss.sources(), spice_ss.dependencies()]]
+endif
+
keymap_gen = find_program('keycodemapdb/tools/keymap-gen')
keymaps = [
@@ -34,3 +112,5 @@ foreach e : keymaps
endforeach
subdir('shader')
+
+modules += {'ui': ui_modules}
diff --git a/ui/shader.c b/ui/shader.c
index d78829f..e8b8d32 100644
--- a/ui/shader.c
+++ b/ui/shader.c
@@ -27,9 +27,9 @@
#include "qemu/osdep.h"
#include "ui/shader.h"
-#include "shader/texture-blit-vert.h"
-#include "shader/texture-blit-flip-vert.h"
-#include "shader/texture-blit-frag.h"
+#include "ui/shader/texture-blit-vert.h"
+#include "ui/shader/texture-blit-flip-vert.h"
+#include "ui/shader/texture-blit-frag.h"
struct QemuGLShader {
GLint texture_blit_prog;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 066/143] meson: convert root directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (64 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 065/143] meson: convert ui " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 067/143] meson: convert most of softmmu/ Paolo Bonzini
` (81 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 21 ++-------------------
Makefile.target | 2 +-
configure | 2 ++
meson.build | 30 ++++++++++++++++++++++++++++++
4 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 2463df8..a5c919d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -47,17 +47,10 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = blockdev.o blockdev-nbd.o block/
-
-common-obj-y += bootdevice.o iothread.o
+common-obj-y = block/
common-obj-y += dump/
-common-obj-y += job-qmp.o
common-obj-y += monitor/
common-obj-y += net/
-common-obj-y += qdev-monitor.o
-common-obj-$(CONFIG_WIN32) += os-win32.o
-common-obj-$(CONFIG_POSIX) += os-posix.o
-
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
@@ -87,25 +80,15 @@ common-obj-y += hw/
common-obj-m += hw/
common-obj-y += replay/
-
-common-obj-y += dma-helpers.o
-common-obj-$(CONFIG_TPM) += tpm.o
-
common-obj-y += backends/
-common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
-qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
-qemu-seccomp.o-libs := $(SECCOMP_LIBS)
-
-common-obj-$(CONFIG_FDT) += device_tree.o
-
common-obj-y += qapi/
endif # CONFIG_SOFTMMU
#######################################################################
# Target-independent parts used in system and user emulation
-common-obj-y += cpus-common.o
+
common-obj-y += hw/
common-obj-y += qom/
common-obj-y += disas/
diff --git a/Makefile.target b/Makefile.target
index 16f1e78..5f926e5 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -169,7 +169,7 @@ ifneq ($(CONFIG_MODULES),y)
LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS)
LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS)
endif
-LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS)
+LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS)
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
# Hardware support
diff --git a/configure b/configure
index c1bc16b..508aa60 100755
--- a/configure
+++ b/configure
@@ -7305,6 +7305,8 @@ if test "$preadv" = "yes" ; then
fi
if test "$fdt" != "no" ; then
echo "CONFIG_FDT=y" >> $config_host_mak
+ echo "FDT_CFLAGS=$fdt_cflags" >> $config_host_mak
+ echo "FDT_LIBS=$fdt_ldflags $fdt_libs" >> $config_host_mak
fi
if test "$membarrier" = "yes" ; then
echo "CONFIG_MEMBARRIER=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 9b0aa18..266ff64 100644
--- a/meson.build
+++ b/meson.build
@@ -47,6 +47,7 @@ targetos = host_machine.system()
m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
+winmm = []
socket = []
version_res = []
coref = []
@@ -55,6 +56,7 @@ cocoa = []
hvf = []
if host_machine.system() == 'windows'
socket = cc.find_library('ws2_32')
+ winmm = cc.find_library('winmm')
win = import('windows')
version_res = win.compile_resources('version.rc',
@@ -276,6 +278,11 @@ if 'CONFIG_VNC_SASL' in config_host
sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(),
link_args: config_host['SASL_LIBS'].split())
endif
+fdt = not_found
+if 'CONFIG_FDT' in config_host
+ fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
+ link_args: config_host['FDT_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -435,6 +442,7 @@ util_ss = ss.source_set()
stub_ss = ss.source_set()
trace_ss = ss.source_set()
block_ss = ss.source_set()
+blockdev_ss = ss.source_set()
common_ss = ss.source_set()
softmmu_ss = ss.source_set()
user_ss = ss.source_set()
@@ -588,6 +596,28 @@ subdir('nbd')
subdir('scsi')
subdir('block')
+blockdev_ss.add(files(
+ 'blockdev.c',
+ 'blockdev-nbd.c',
+ 'iothread.c',
+ 'job-qmp.c',
+), sdl)
+blockdev_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
+blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
+
+softmmu_ss.add_all(blockdev_ss)
+softmmu_ss.add(files(
+ 'bootdevice.c',
+ 'dma-helpers.c',
+ 'qdev-monitor.c',
+), sdl)
+
+softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
+softmmu_ss.add(when: 'CONFIG_SECCOMP', if_true: [files('qemu-seccomp.c'), seccomp])
+softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
+
+common_ss.add(files('cpus-common.c'))
+
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 067/143] meson: convert most of softmmu/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (65 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 066/143] meson: convert root " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 068/143] " Paolo Bonzini
` (80 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel
Leave out main.c and vl.c, they're special due to fuzzing.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 ++
softmmu/Makefile.objs | 11 -----------
softmmu/meson.build | 9 +++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 softmmu/meson.build
diff --git a/meson.build b/meson.build
index 266ff64..bab875e 100644
--- a/meson.build
+++ b/meson.build
@@ -618,6 +618,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
+subdir('softmmu')
+
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
index a414a74..dd15c24 100644
--- a/softmmu/Makefile.objs
+++ b/softmmu/Makefile.objs
@@ -1,14 +1,3 @@
softmmu-main-y = softmmu/main.o
-
-obj-y += arch_init.o
-obj-y += cpus.o
-obj-y += cpu-throttle.o
-obj-y += balloon.o
-obj-y += ioport.o
-obj-y += memory.o
-obj-y += memory_mapping.o
-
-obj-y += qtest.o
-
obj-y += vl.o
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
diff --git a/softmmu/meson.build b/softmmu/meson.build
new file mode 100644
index 0000000..d4ac51b
--- /dev/null
+++ b/softmmu/meson.build
@@ -0,0 +1,9 @@
+specific_ss.add(files(
+ 'arch_init.c',
+ 'balloon.c',
+ 'cpus.c',
+ 'cpu-throttle.c',
+ 'ioport.c',
+ 'memory.c',
+ 'memory_mapping.c',
+ 'qtest.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 068/143] meson: convert most of softmmu/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (66 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 067/143] meson: convert most of softmmu/ Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-07 13:36 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 069/143] meson: convert trace/ Paolo Bonzini
` (79 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel
Leave out main.c, it's special due to fuzzing.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/softmmu/meson.build b/softmmu/meson.build
index d4ac51b..95d38df 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -1,4 +1,4 @@
-specific_ss.add(files(
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
'arch_init.c',
'balloon.c',
'cpus.c',
@@ -6,4 +6,5 @@ specific_ss.add(files(
'ioport.c',
'memory.c',
'memory_mapping.c',
- 'qtest.c'))
+ 'qtest.c',
+ 'vl.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 069/143] meson: convert trace/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (67 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 068/143] " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 070/143] meson: convert block/ Paolo Bonzini
` (78 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
trace/Makefile.objs | 8 --------
trace/meson.build | 5 ++++-
2 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 trace/Makefile.objs
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
deleted file mode 100644
index a429474..0000000
--- a/trace/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: makefile -*-
-
-
-##################################################
-# Translation level
-
-obj-y += generated-helpers.o
-obj-y += control-target.o
diff --git a/trace/meson.build b/trace/meson.build
index 8ea8db7..b113425 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,3 +1,5 @@
+specific_ss.add(files('control-target.c'))
+
# common options
tracetool = [
find_program('scripts/tracetool.py'),
@@ -67,12 +69,13 @@ foreach d : [
['generated-helpers.h', 'tcg-helper-h'],
['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'],
]
- custom_target(d[0],
+ gen = custom_target(d[0],
output: d[0],
input: meson.source_root() / 'trace-events',
command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ],
build_by_default: true, # to be removed when added to a target
capture: true)
+ specific_ss.add(gen)
endforeach
if 'CONFIG_TRACE_UST' in config_host
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 070/143] meson: convert block/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (68 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 069/143] meson: convert trace/ Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-07 13:37 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 071/143] meson: convert dump/ Paolo Bonzini
` (77 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index a5c919d..0f3074b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = block/
-common-obj-y += dump/
+common-obj-y = dump/
common-obj-y += monitor/
common-obj-y += net/
common-obj-$(CONFIG_LINUX) += fsdev/
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 071/143] meson: convert dump/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (69 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 070/143] meson: convert block/ Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 072/143] meson: convert common QMP bits for qemu and qemu-storage-daemon Paolo Bonzini
` (76 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 3 +--
Makefile.target | 1 -
configure | 4 ++++
dump/Makefile.objs | 3 ---
dump/meson.build | 4 ++++
meson.build | 9 +++++++++
6 files changed, 18 insertions(+), 6 deletions(-)
delete mode 100644 dump/Makefile.objs
create mode 100644 dump/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 0f3074b..11ca458 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = dump/
-common-obj-y += monitor/
+common-obj-y = monitor/
common-obj-y += net/
common-obj-$(CONFIG_LINUX) += fsdev/
diff --git a/Makefile.target b/Makefile.target
index 5f926e5..c8f7a6c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -156,7 +156,6 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
-obj-y += dump/
obj-y += hw/
obj-y += monitor/
obj-y += qapi/
diff --git a/configure b/configure
index 508aa60..e99af16 100755
--- a/configure
+++ b/configure
@@ -2551,6 +2551,7 @@ int main(void) { lzo_version(); return 0; }
EOF
if compile_prog "" "-llzo2" ; then
libs_softmmu="$libs_softmmu -llzo2"
+ lzo_libs="-llzo2"
lzo="yes"
else
if test "$lzo" = "yes"; then
@@ -2570,6 +2571,7 @@ int main(void) { snappy_max_compressed_length(4096); return 0; }
EOF
if compile_prog "" "-lsnappy" ; then
libs_softmmu="$libs_softmmu -lsnappy"
+ snappy_libs='-lsnappy'
snappy="yes"
else
if test "$snappy" = "yes"; then
@@ -7393,10 +7395,12 @@ fi
if test "$lzo" = "yes" ; then
echo "CONFIG_LZO=y" >> $config_host_mak
+ echo "LZO_LIBS=$lzo_libs" >> $config_host_mak
fi
if test "$snappy" = "yes" ; then
echo "CONFIG_SNAPPY=y" >> $config_host_mak
+ echo "SNAPPY_LIBS=$snappy_libs" >> $config_host_mak
fi
if test "$bzip2" = "yes" ; then
diff --git a/dump/Makefile.objs b/dump/Makefile.objs
deleted file mode 100644
index d2a5db3..0000000
--- a/dump/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += dump.o
-common-obj-y += dump-hmp-cmds.o
-obj-$(TARGET_X86_64) += win_dump.o
diff --git a/dump/meson.build b/dump/meson.build
new file mode 100644
index 0000000..2eff29c
--- /dev/null
+++ b/dump/meson.build
@@ -0,0 +1,4 @@
+softmmu_ss.add(files('dump-hmp-cmds.c'))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy, lzo])
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true: files('win_dump.c'))
diff --git a/meson.build b/meson.build
index bab875e..f025ac5 100644
--- a/meson.build
+++ b/meson.build
@@ -283,6 +283,14 @@ if 'CONFIG_FDT' in config_host
fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
link_args: config_host['FDT_LIBS'].split())
endif
+snappy = not_found
+if 'CONFIG_SNAPPY' in config_host
+ snappy = declare_dependency(link_args: config_host['SNAPPY_LIBS'].split())
+endif
+lzo = not_found
+if 'CONFIG_LZO' in config_host
+ lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -583,6 +591,7 @@ subdir('io')
subdir('chardev')
subdir('fsdev')
subdir('target')
+subdir('dump')
block_ss.add(files(
'block.c',
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 072/143] meson: convert common QMP bits for qemu and qemu-storage-daemon
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (70 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 071/143] meson: convert dump/ Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 073/143] meson: convert qemu-storage-daemon Paolo Bonzini
` (75 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 8 +++++---
Makefile.target | 1 -
meson.build | 10 ++++++++++
monitor/Makefile.objs | 6 ------
monitor/meson.build | 9 +++++++++
qom/Makefile.objs | 2 --
qom/meson.build | 3 +++
7 files changed, 27 insertions(+), 12 deletions(-)
delete mode 100644 monitor/Makefile.objs
create mode 100644 monitor/meson.build
delete mode 100644 qom/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 11ca458..9b9bb40 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -36,10 +36,11 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects are
# used for system emulation, too, but specified separately there)
-storage-daemon-obj-y = block/ monitor/ qapi/ qom/ storage-daemon/
+storage-daemon-obj-y = block/ qapi/ qom/ storage-daemon/
storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o job-qmp.o
storage-daemon-obj-$(CONFIG_WIN32) += os-win32.o
storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
+storage-daemon-obj-y += libqmp.fa
######################################################################
# Target independent part of system emulation. The long term path is to
@@ -47,8 +48,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = monitor/
-common-obj-y += net/
+common-obj-y = net/
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
@@ -82,6 +82,8 @@ common-obj-y += backends/
common-obj-y += qapi/
+common-obj-y += libqmp.fa
+
endif # CONFIG_SOFTMMU
#######################################################################
diff --git a/Makefile.target b/Makefile.target
index c8f7a6c..54a9ef1 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
obj-y += hw/
-obj-y += monitor/
obj-y += qapi/
obj-y += migration/ram.o
LIBS := $(libs_softmmu) $(LIBS)
diff --git a/meson.build b/meson.build
index f025ac5..cfc57f8 100644
--- a/meson.build
+++ b/meson.build
@@ -451,6 +451,7 @@ stub_ss = ss.source_set()
trace_ss = ss.source_set()
block_ss = ss.source_set()
blockdev_ss = ss.source_set()
+qmp_ss = ss.source_set()
common_ss = ss.source_set()
softmmu_ss = ss.source_set()
user_ss = ss.source_set()
@@ -628,6 +629,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
subdir('softmmu')
+subdir('monitor')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
@@ -677,6 +679,14 @@ block = declare_dependency(link_whole: [libblock],
link_args: '@block.syms',
dependencies: [crypto, io])
+qmp_ss = qmp_ss.apply(config_host, strict: false)
+libqmp = static_library('qmp', qmp_ss.sources(),
+ dependencies: qmp_ss.dependencies(),
+ name_suffix: 'fa',
+ build_by_default: false)
+
+qmp = declare_dependency(link_whole: [libqmp])
+
foreach m : mods
shared_module(m['dir'] + '-' + m['name'],
name_prefix: '',
diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs
deleted file mode 100644
index a8533c9..0000000
--- a/monitor/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-y += misc.o
-common-obj-y += monitor.o qmp.o hmp.o
-common-obj-y += qmp-cmds.o qmp-cmds-control.o
-common-obj-y += hmp-cmds.o
-
-storage-daemon-obj-y += monitor.o qmp.o qmp-cmds-control.o
diff --git a/monitor/meson.build b/monitor/meson.build
new file mode 100644
index 0000000..0484a64
--- /dev/null
+++ b/monitor/meson.build
@@ -0,0 +1,9 @@
+qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
+
+softmmu_ss.add(files(
+ 'hmp-cmds.c',
+ 'hmp.c',
+ 'qmp-cmds.c',
+))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('misc.c'))
diff --git a/qom/Makefile.objs b/qom/Makefile.objs
deleted file mode 100644
index b962904..0000000
--- a/qom/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o
-storage-daemon-obj-y += qom-qmp-cmds.o
diff --git a/qom/meson.build b/qom/meson.build
index 4af044d..35815f6 100644
--- a/qom/meson.build
+++ b/qom/meson.build
@@ -7,6 +7,9 @@ qom_ss.add(files(
'qom-qobject.c',
))
+qmp_ss.add(files('qom-qmp-cmds.c'))
+softmmu_ss.add(files('qom-hmp-cmds.c'))
+
qom_ss = qom_ss.apply(config_host, strict: false)
libqom = static_library('qom', qom_ss.sources(),
dependencies: [qom_ss.dependencies()],
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 073/143] meson: convert qemu-storage-daemon
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (71 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 072/143] meson: convert common QMP bits for qemu and qemu-storage-daemon Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 074/143] meson: convert replay directory to Meson Paolo Bonzini
` (74 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
Makefile.objs | 10 ----------
meson.build | 2 +-
storage-daemon/Makefile.objs | 3 ---
storage-daemon/meson.build | 12 ++++++++++++
storage-daemon/qapi/meson.build | 5 +----
.../qemu-storage-daemon.c | 0
7 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 storage-daemon/Makefile.objs
rename qemu-storage-daemon.c => storage-daemon/qemu-storage-daemon.c (100%)
diff --git a/Makefile b/Makefile
index 6e8e541..d9d6b59 100644
--- a/Makefile
+++ b/Makefile
@@ -164,8 +164,6 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- storage-daemon-obj-y \
- storage-daemon-obj-m \
common-obj-y \
common-obj-m)
@@ -181,7 +179,6 @@ TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), $(T
SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
$(SOFTMMU_ALL_RULES): $(authz-obj-y)
$(SOFTMMU_ALL_RULES): $(block-obj-y)
-$(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y)
$(SOFTMMU_ALL_RULES): $(chardev-obj-y)
$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
$(SOFTMMU_ALL_RULES): $(io-obj-y)
@@ -272,8 +269,6 @@ Makefile: $(version-obj-y)
COMMON_LDADDS = libqemuutil.a
-qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
-
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/Makefile.objs b/Makefile.objs
index 9b9bb40..bbb6f8c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -32,16 +32,6 @@ io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
-#######################################################################
-# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects are
-# used for system emulation, too, but specified separately there)
-
-storage-daemon-obj-y = block/ qapi/ qom/ storage-daemon/
-storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o job-qmp.o
-storage-daemon-obj-$(CONFIG_WIN32) += os-win32.o
-storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
-storage-daemon-obj-y += libqmp.fa
-
######################################################################
# Target independent part of system emulation. The long term path is to
# suppress *all* target specific code in case of system emulation, i.e. a
diff --git a/meson.build b/meson.build
index cfc57f8..2071686 100644
--- a/meson.build
+++ b/meson.build
@@ -566,7 +566,6 @@ subdir('util')
subdir('qom')
subdir('authz')
subdir('crypto')
-subdir('storage-daemon')
subdir('ui')
@@ -773,6 +772,7 @@ if have_tools
qemu_io = executable('qemu-io', files('qemu-io.c'),
dependencies: [block, qemuutil], install: true)
+ subdir('storage-daemon')
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs
deleted file mode 100644
index 41c0d02..0000000
--- a/storage-daemon/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-storage-daemon-obj-y = qapi/libqsd-qapi.fa
-
-qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/qapi/qapi-init-commands.h
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 35f8949..ab2aa87 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -1 +1,13 @@
+qsd_ss = ss.source_set()
+qsd_ss.add(files('qemu-storage-daemon.c'))
+qsd_ss.add(block, chardev, qmp, qom, qemuutil)
+qsd_ss.add_all(blockdev_ss)
+
subdir('qapi')
+
+if have_tools
+ qsd_ss = qsd_ss.apply(config_host, strict: false)
+ executable('qemu-storage-daemon',
+ qsd_ss.sources(),
+ dependencies: qsd_ss.dependencies())
+endif
diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.build
index a4e24f3..cd064ac 100644
--- a/storage-daemon/qapi/meson.build
+++ b/storage-daemon/qapi/meson.build
@@ -4,7 +4,4 @@ qsd_qapi_files = custom_target('QAPI files for qemu-storage-daemon',
command: [ qapi_gen, '-o', 'storage-daemon/qapi', '@INPUT@' ],
depend_files: [ qapi_inputs, qapi_gen_depends ])
-static_library('qsd-qapi',
- qsd_qapi_files.to_list(),
- name_suffix: 'fa',
- build_by_default: false)
+qsd_ss.add(qsd_qapi_files.to_list())
diff --git a/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
similarity index 100%
rename from qemu-storage-daemon.c
rename to storage-daemon/qemu-storage-daemon.c
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 074/143] meson: convert replay directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (72 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 073/143] meson: convert qemu-storage-daemon Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 075/143] meson: convert migration " Paolo Bonzini
` (73 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 1 -
meson.build | 1 +
replay/Makefile.objs | 10 ----------
replay/meson.build | 12 ++++++++++++
4 files changed, 13 insertions(+), 11 deletions(-)
delete mode 100644 replay/Makefile.objs
create mode 100644 replay/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index bbb6f8c..544877a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -67,7 +67,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF
common-obj-y += hw/
common-obj-m += hw/
-common-obj-y += replay/
common-obj-y += backends/
common-obj-y += qapi/
diff --git a/meson.build b/meson.build
index 2071686..c592241 100644
--- a/meson.build
+++ b/meson.build
@@ -629,6 +629,7 @@ common_ss.add(files('cpus-common.c'))
subdir('softmmu')
subdir('monitor')
+subdir('replay')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
diff --git a/replay/Makefile.objs b/replay/Makefile.objs
deleted file mode 100644
index 939be96..0000000
--- a/replay/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-common-obj-y += replay.o
-common-obj-y += replay-internal.o
-common-obj-y += replay-events.o
-common-obj-y += replay-time.o
-common-obj-y += replay-input.o
-common-obj-y += replay-char.o
-common-obj-y += replay-snapshot.o
-common-obj-y += replay-net.o
-common-obj-y += replay-audio.o
-common-obj-y += replay-random.o
diff --git a/replay/meson.build b/replay/meson.build
new file mode 100644
index 0000000..8783aea
--- /dev/null
+++ b/replay/meson.build
@@ -0,0 +1,12 @@
+softmmu_ss.add(files(
+ 'replay.c',
+ 'replay-internal.c',
+ 'replay-events.c',
+ 'replay-time.c',
+ 'replay-input.c',
+ 'replay-char.c',
+ 'replay-snapshot.c',
+ 'replay-net.c',
+ 'replay-audio.c',
+ 'replay-random.c',
+))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 075/143] meson: convert migration directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (73 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 074/143] meson: convert replay directory to Meson Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 076/143] meson: convert net " Paolo Bonzini
` (72 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 1 -
Makefile.target | 1 -
meson.build | 5 +++++
migration/Makefile.objs | 18 ------------------
migration/meson.build | 29 +++++++++++++++++++++++++++++
5 files changed, 34 insertions(+), 20 deletions(-)
delete mode 100644 migration/Makefile.objs
create mode 100644 migration/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 544877a..aabf709 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -42,7 +42,6 @@ common-obj-y = net/
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
-common-obj-y += migration/
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
diff --git a/Makefile.target b/Makefile.target
index 54a9ef1..4d912df 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -158,7 +158,6 @@ obj-y += softmmu/
obj-y += gdbstub.o
obj-y += hw/
obj-y += qapi/
-obj-y += migration/ram.o
LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
diff --git a/meson.build b/meson.build
index c592241..f0af36f 100644
--- a/meson.build
+++ b/meson.build
@@ -291,6 +291,10 @@ lzo = not_found
if 'CONFIG_LZO' in config_host
lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split())
endif
+rdma = not_found
+if 'CONFIG_RDMA' in config_host
+ rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -628,6 +632,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
subdir('softmmu')
+subdir('migration')
subdir('monitor')
subdir('replay')
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
deleted file mode 100644
index 0fc619e..0000000
--- a/migration/Makefile.objs
+++ /dev/null
@@ -1,18 +0,0 @@
-common-obj-y += migration.o socket.o fd.o exec.o
-common-obj-y += tls.o channel.o savevm.o
-common-obj-y += colo.o colo-failover.o
-common-obj-y += vmstate.o vmstate-types.o page_cache.o
-common-obj-y += qemu-file.o global_state.o
-common-obj-y += qemu-file-channel.o
-common-obj-y += xbzrle.o postcopy-ram.o
-common-obj-y += qjson.o
-common-obj-y += block-dirty-bitmap.o
-common-obj-y += multifd.o
-common-obj-y += multifd-zlib.o
-common-obj-$(CONFIG_ZSTD) += multifd-zstd.o
-
-common-obj-$(CONFIG_RDMA) += rdma.o
-
-common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o
-
-rdma.o-libs := $(RDMA_LIBS)
diff --git a/migration/meson.build b/migration/meson.build
new file mode 100644
index 0000000..99afbac
--- /dev/null
+++ b/migration/meson.build
@@ -0,0 +1,29 @@
+softmmu_ss.add(files(
+ 'block-dirty-bitmap.c',
+ 'channel.c',
+ 'colo-failover.c',
+ 'colo.c',
+ 'exec.c',
+ 'fd.c',
+ 'global_state.c',
+ 'migration.c',
+ 'multifd.c',
+ 'multifd-zlib.c',
+ 'page_cache.c',
+ 'postcopy-ram.c',
+ 'qemu-file-channel.c',
+ 'qemu-file.c',
+ 'qjson.c',
+ 'savevm.c',
+ 'socket.c',
+ 'tls.c',
+ 'vmstate-types.c',
+ 'vmstate.c',
+ 'xbzrle.c',
+))
+
+softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c'))
+softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c'))
+softmmu_ss.add(when: 'CONFIG_ZSTD', if_true: files('multifd-zstd.c'))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('ram.c')])
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 076/143] meson: convert net directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (74 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 075/143] meson: convert migration " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 077/143] meson: convert backends " Paolo Bonzini
` (71 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 3 +--
Makefile.target | 1 +
meson.build | 10 ++++++++++
net/Makefile.objs | 32 --------------------------------
net/can/Makefile.objs | 2 --
net/can/meson.build | 5 +++++
net/meson.build | 40 ++++++++++++++++++++++++++++++++++++++++
7 files changed, 57 insertions(+), 36 deletions(-)
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
diff --git a/Makefile.objs b/Makefile.objs
index aabf709..8e73682 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -38,8 +38,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = net/
-common-obj-$(CONFIG_LINUX) += fsdev/
+common-obj-$(CONFIG_LINUX) = fsdev/
common-obj-y += accel/
diff --git a/Makefile.target b/Makefile.target
index 4d912df..bf3fda9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -168,6 +168,7 @@ LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS)
endif
LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS)
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
+LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
diff --git a/meson.build b/meson.build
index f0af36f..73ad78d 100644
--- a/meson.build
+++ b/meson.build
@@ -137,6 +137,15 @@ if 'CONFIG_XKBCOMMON' in config_host
xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
link_args: config_host['XKBCOMMON_LIBS'].split())
endif
+slirp = not_found
+if config_host.has_key('CONFIG_SLIRP')
+ slirp = declare_dependency(compile_args: config_host['SLIRP_CFLAGS'].split(),
+ link_args: config_host['SLIRP_LIBS'].split())
+endif
+vde = not_found
+if config_host.has_key('CONFIG_VDE')
+ vde = declare_dependency(link_args: config_host['VDE_LIBS'].split())
+endif
pulse = not_found
if 'CONFIG_LIBPULSE' in config_host
pulse = declare_dependency(compile_args: config_host['PULSE_CFLAGS'].split(),
@@ -634,6 +643,7 @@ common_ss.add(files('cpus-common.c'))
subdir('softmmu')
subdir('migration')
subdir('monitor')
+subdir('net')
subdir('replay')
# needed for fuzzing binaries
diff --git a/net/Makefile.objs b/net/Makefile.objs
deleted file mode 100644
index 5ab4554..0000000
--- a/net/Makefile.objs
+++ /dev/null
@@ -1,32 +0,0 @@
-common-obj-y = net.o queue.o checksum.o util.o hub.o
-common-obj-y += socket.o
-common-obj-y += dump.o
-common-obj-y += eth.o
-common-obj-y += announce.o
-common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
-common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) += vhost-user.o
-common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o
-common-obj-$(CONFIG_ALL) += vhost-user-stub.o
-common-obj-$(CONFIG_SLIRP) += slirp.o
-slirp.o-cflags := $(SLIRP_CFLAGS)
-slirp.o-libs := $(SLIRP_LIBS)
-common-obj-$(CONFIG_VDE) += vde.o
-common-obj-$(CONFIG_NETMAP) += netmap.o
-common-obj-y += filter.o
-common-obj-y += filter-buffer.o
-common-obj-y += filter-mirror.o
-common-obj-y += colo-compare.o
-common-obj-y += colo.o
-common-obj-y += filter-rewriter.o
-common-obj-y += filter-replay.o
-
-tap-obj-$(CONFIG_LINUX) = tap-linux.o
-tap-obj-$(CONFIG_BSD) = tap-bsd.o
-tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
-tap-obj-y ?= tap-stub.o
-common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
-common-obj-$(CONFIG_WIN32) += tap-win32.o
-common-obj-$(CONFIG_VHOST_NET_VDPA) += vhost-vdpa.o
-vde.o-libs = $(VDE_LIBS)
-
-common-obj-$(CONFIG_CAN_BUS) += can/
diff --git a/net/can/Makefile.objs b/net/can/Makefile.objs
deleted file mode 100644
index 9f35dc5..0000000
--- a/net/can/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-y += can_core.o can_host.o
-common-obj-$(CONFIG_LINUX) += can_socketcan.o
diff --git a/net/can/meson.build b/net/can/meson.build
new file mode 100644
index 0000000..f53d9ec
--- /dev/null
+++ b/net/can/meson.build
@@ -0,0 +1,5 @@
+can_ss = ss.source_set()
+can_ss.add(files('can_core.c', 'can_host.c'))
+can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
diff --git a/net/meson.build b/net/meson.build
new file mode 100644
index 0000000..6c2ec47
--- /dev/null
+++ b/net/meson.build
@@ -0,0 +1,40 @@
+softmmu_ss.add(files(
+ 'announce.c',
+ 'checksum.c',
+ 'colo-compare.c',
+ 'colo.c',
+ 'dump.c',
+ 'eth.c',
+ 'filter-buffer.c',
+ 'filter-mirror.c',
+ 'filter-replay.c',
+ 'filter-rewriter.c',
+ 'filter.c',
+ 'hub.c',
+ 'net.c',
+ 'queue.c',
+ 'socket.c',
+ 'util.c',
+))
+
+softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c'))
+softmmu_ss.add(when: ['CONFIG_SLIRP', slirp], if_true: files('slirp.c'))
+softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c'))
+softmmu_ss.add(when: 'CONFIG_NETMAP', if_true: files('netmap.c'))
+vhost_user_ss = ss.source_set()
+vhost_user_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
+softmmu_ss.add_all(when: 'CONFIG_VHOST_NET_USER', if_true: vhost_user_ss)
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
+
+softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
+softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
+softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
+tap_posix = ['tap.c']
+if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS')
+ tap_posix += 'tap-stub.c'
+endif
+softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
+softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
+softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c'))
+
+subdir('can')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 077/143] meson: convert backends directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (75 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 076/143] meson: convert net " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 078/143] meson: convert fsdev/ Paolo Bonzini
` (70 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
backends/Makefile.objs | 23 -----------------------
backends/meson.build | 19 +++++++++++++++++++
backends/tpm/Makefile.objs | 4 ----
backends/tpm/meson.build | 8 ++++++++
configure | 2 ++
meson.build | 5 +++++
7 files changed, 34 insertions(+), 29 deletions(-)
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
diff --git a/Makefile.objs b/Makefile.objs
index 8e73682..65b0ae6 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -65,8 +65,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF
common-obj-y += hw/
common-obj-m += hw/
-common-obj-y += backends/
-
common-obj-y += qapi/
common-obj-y += libqmp.fa
diff --git a/backends/Makefile.objs b/backends/Makefile.objs
deleted file mode 100644
index 22d204c..0000000
--- a/backends/Makefile.objs
+++ /dev/null
@@ -1,23 +0,0 @@
-common-obj-y += rng.o rng-egd.o rng-builtin.o
-common-obj-$(CONFIG_POSIX) += rng-random.o
-
-common-obj-$(CONFIG_TPM) += tpm/
-
-common-obj-y += hostmem.o hostmem-ram.o
-common-obj-$(CONFIG_POSIX) += hostmem-file.o
-
-common-obj-y += cryptodev.o
-common-obj-y += cryptodev-builtin.o
-
-ifeq ($(CONFIG_VIRTIO_CRYPTO),y)
-common-obj-y += cryptodev-vhost.o
-common-obj-$(CONFIG_VHOST_CRYPTO) += cryptodev-vhost-user.o
-endif
-
-common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o
-
-common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
-
-common-obj-$(CONFIG_GIO) += dbus-vmstate.o
-dbus-vmstate.o-cflags = $(GIO_CFLAGS)
-dbus-vmstate.o-libs = $(GIO_LIBS)
diff --git a/backends/meson.build b/backends/meson.build
new file mode 100644
index 0000000..484456e
--- /dev/null
+++ b/backends/meson.build
@@ -0,0 +1,19 @@
+softmmu_ss.add([files(
+ 'cryptodev-builtin.c',
+ 'cryptodev.c',
+ 'hostmem-ram.c',
+ 'hostmem.c',
+ 'rng-builtin.c',
+ 'rng-egd.c',
+ 'rng.c',
+), numa])
+
+softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c'))
+softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c'))
+softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c'))
+softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'], if_true: files('vhost-user.c'))
+softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
+softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_true: files('cryptodev-vhost-user.c'))
+softmmu_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus-vmstate.c'), gio])
+
+subdir('tpm')
diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs
deleted file mode 100644
index db2731f..0000000
--- a/backends/tpm/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-common-obj-y += tpm_backend.o
-common-obj-y += tpm_util.o
-common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
-common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build
new file mode 100644
index 0000000..8579290
--- /dev/null
+++ b/backends/tpm/meson.build
@@ -0,0 +1,8 @@
+tpm_ss = ss.source_set()
+
+tpm_ss.add(files('tpm_backend.c'))
+tpm_ss.add(files('tpm_util.c'))
+tpm_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
+tpm_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_TPM', if_true: tpm_ss)
diff --git a/configure b/configure
index e99af16..96ba99f 100755
--- a/configure
+++ b/configure
@@ -4675,6 +4675,7 @@ EOF
if compile_prog "" "-lnuma" ; then
numa=yes
libs_softmmu="-lnuma $libs_softmmu"
+ numa_libs="-lnuma"
else
if test "$numa" = "yes" ; then
feature_not_found "numa" "install numactl devel"
@@ -8309,6 +8310,7 @@ fi
if test "$numa" = "yes"; then
echo "CONFIG_NUMA=y" >> $config_host_mak
+ echo "NUMA_LIBS=$numa_libs" >> $config_host_mak
fi
if test "$ccache_cpp2" = "yes"; then
diff --git a/meson.build b/meson.build
index 73ad78d..77c0df6 100644
--- a/meson.build
+++ b/meson.build
@@ -304,6 +304,10 @@ rdma = not_found
if 'CONFIG_RDMA' in config_host
rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split())
endif
+numa = not_found
+if 'CONFIG_NUMA' in config_host
+ numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -641,6 +645,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
subdir('softmmu')
+subdir('backends')
subdir('migration')
subdir('monitor')
subdir('net')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 078/143] meson: convert fsdev/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (76 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 077/143] meson: convert backends " Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 079/143] meson: convert disas directory to Meson Paolo Bonzini
` (69 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 4 +---
fsdev/Makefile.objs | 12 ------------
fsdev/meson.build | 10 ++++++++++
3 files changed, 11 insertions(+), 15 deletions(-)
delete mode 100644 fsdev/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 65b0ae6..79812c4 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -38,9 +38,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-$(CONFIG_LINUX) = fsdev/
-
-common-obj-y += accel/
+common-obj-y = accel/
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
deleted file mode 100644
index 42cd70c..0000000
--- a/fsdev/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
-# only pull in the actual 9p backend if we also enabled virtio or xen.
-ifeq ($(CONFIG_FSDEV_9P),y)
-common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
-else
-common-obj-y = qemu-fsdev-dummy.o
-endif
-common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o
-
-# Toplevel always builds this; targets without virtio will put it in
-# common-obj-y
-common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o
diff --git a/fsdev/meson.build b/fsdev/meson.build
index d0daa2a..656dff6 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -1,3 +1,13 @@
+fsdev_ss = ss.source_set()
+fsdev_ss.add(files('qemu-fsdev-opts.c', 'qemu-fsdev-throttle.c'))
+fsdev_ss.add(when: 'CONFIG_ALL', if_true: files('qemu-fsdev-dummy.c'))
+fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
+ '9p-iov-marshal.c',
+ '9p-marshal.c',
+ 'qemu-fsdev.c',
+), if_false: files('qemu-fsdev-dummy.c'))
+softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
+
have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host
if have_virtfs_proxy_helper
executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 079/143] meson: convert disas directory to Meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (77 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 078/143] meson: convert fsdev/ Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 080/143] meson: convert qapi-specific to meson Paolo Bonzini
` (68 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
disas/Makefile.objs | 30 ------------------------------
disas/libvixl/Makefile.objs | 5 -----
disas/libvixl/meson.build | 7 +++++++
disas/meson.build | 27 +++++++++++++++++++++++++++
meson.build | 1 +
6 files changed, 35 insertions(+), 37 deletions(-)
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
diff --git a/Makefile.objs b/Makefile.objs
index 79812c4..4959d62 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -73,8 +73,6 @@ endif # CONFIG_SOFTMMU
# Target-independent parts used in system and user emulation
common-obj-y += hw/
-common-obj-y += qom/
-common-obj-y += disas/
######################################################################
# Resource file for Windows executables
diff --git a/disas/Makefile.objs b/disas/Makefile.objs
deleted file mode 100644
index 3c1cdce..0000000
--- a/disas/Makefile.objs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-common-obj-$(CONFIG_ALPHA_DIS) += alpha.o
-common-obj-$(CONFIG_ARM_DIS) += arm.o
-common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o
-common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/
-libvixldir = $(SRC_PATH)/disas/libvixl
-# The -Wno-sign-compare is needed only for gcc 4.6, which complains about
-# some signed-unsigned equality comparisons in libvixl which later gcc
-# versions do not.
-arm-a64.o-cflags := -I$(libvixldir) -Wno-sign-compare
-common-obj-$(CONFIG_CRIS_DIS) += cris.o
-common-obj-$(CONFIG_HPPA_DIS) += hppa.o
-common-obj-$(CONFIG_I386_DIS) += i386.o
-common-obj-$(CONFIG_M68K_DIS) += m68k.o
-common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o
-common-obj-$(CONFIG_MIPS_DIS) += mips.o
-common-obj-$(CONFIG_NANOMIPS_DIS) += nanomips.o
-common-obj-$(CONFIG_NIOS2_DIS) += nios2.o
-common-obj-$(CONFIG_MOXIE_DIS) += moxie.o
-common-obj-$(CONFIG_PPC_DIS) += ppc.o
-common-obj-$(CONFIG_RISCV_DIS) += riscv.o
-common-obj-$(CONFIG_S390_DIS) += s390.o
-common-obj-$(CONFIG_SH4_DIS) += sh4.o
-common-obj-$(CONFIG_SPARC_DIS) += sparc.o
-common-obj-$(CONFIG_LM32_DIS) += lm32.o
-common-obj-$(CONFIG_XTENSA_DIS) += xtensa.o
-
-# TODO: As long as the TCG interpreter and its generated code depend
-# on the QEMU target, we cannot compile the disassembler here.
-#common-obj-$(CONFIG_TCI_DIS) += tci.o
diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs
deleted file mode 100644
index 99a637f..0000000
--- a/disas/libvixl/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-common-obj-$(CONFIG_ARM_A64_DIS) = vixl/utils.o \
- vixl/compiler-intrinsics.o \
- vixl/a64/instructions-a64.o \
- vixl/a64/decoder-a64.o \
- vixl/a64/disasm-a64.o
diff --git a/disas/libvixl/meson.build b/disas/libvixl/meson.build
new file mode 100644
index 0000000..5e2eb33
--- /dev/null
+++ b/disas/libvixl/meson.build
@@ -0,0 +1,7 @@
+libvixl_ss.add(files(
+ 'vixl/a64/decoder-a64.cc',
+ 'vixl/a64/disasm-a64.cc',
+ 'vixl/a64/instructions-a64.cc',
+ 'vixl/compiler-intrinsics.cc',
+ 'vixl/utils.cc',
+))
diff --git a/disas/meson.build b/disas/meson.build
new file mode 100644
index 0000000..0527d69
--- /dev/null
+++ b/disas/meson.build
@@ -0,0 +1,27 @@
+libvixl_ss = ss.source_set()
+subdir('libvixl')
+
+common_ss.add(when: 'CONFIG_ALPHA_DIS', if_true: files('alpha.c'))
+common_ss.add(when: 'CONFIG_ARM_A64_DIS', if_true: files('arm-a64.cc'))
+common_ss.add_all(when: 'CONFIG_ARM_A64_DIS', if_true: libvixl_ss)
+common_ss.add(when: 'CONFIG_ARM_DIS', if_true: files('arm.c'))
+common_ss.add(when: 'CONFIG_CRIS_DIS', if_true: files('cris.c'))
+common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c'))
+common_ss.add(when: 'CONFIG_I386_DIS', if_true: files('i386.c'))
+common_ss.add(when: 'CONFIG_LM32_DIS', if_true: files('lm32.c'))
+common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c'))
+common_ss.add(when: 'CONFIG_MICROBLAZE_DIS', if_true: files('microblaze.c'))
+common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c'))
+common_ss.add(when: 'CONFIG_MOXIE_DIS', if_true: files('moxie.c'))
+common_ss.add(when: 'CONFIG_NANOMIPS_DIS', if_true: files('nanomips.cpp'))
+common_ss.add(when: 'CONFIG_NIOS2_DIS', if_true: files('nios2.c'))
+common_ss.add(when: 'CONFIG_PPC_DIS', if_true: files('ppc.c'))
+common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c'))
+common_ss.add(when: 'CONFIG_S390_DIS', if_true: files('s390.c'))
+common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c'))
+common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c'))
+common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c'))
+
+# TODO: As long as the TCG interpreter and its generated code depend
+# on the QEMU target, we cannot compile the disassembler here.
+#common_ss.add(when: 'CONFIG_TCI_DIS', if_true: files('tci.c'))
diff --git a/meson.build b/meson.build
index 77c0df6..fb444ad 100644
--- a/meson.build
+++ b/meson.build
@@ -646,6 +646,7 @@ common_ss.add(files('cpus-common.c'))
subdir('softmmu')
subdir('backends')
+subdir('disas')
subdir('migration')
subdir('monitor')
subdir('net')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 080/143] meson: convert qapi-specific to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (78 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 079/143] meson: convert disas directory to Meson Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 081/143] meson: convert hw/xen Paolo Bonzini
` (67 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
Makefile.target | 1 -
qapi/Makefile.objs | 15 ---------------
qapi/meson.build | 10 +++++++---
4 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 qapi/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 4959d62..965f64c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -63,8 +63,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF
common-obj-y += hw/
common-obj-m += hw/
-common-obj-y += qapi/
-
common-obj-y += libqmp.fa
endif # CONFIG_SOFTMMU
diff --git a/Makefile.target b/Makefile.target
index bf3fda9..386378b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
obj-y += hw/
-obj-y += qapi/
LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
deleted file mode 100644
index c0a31be..0000000
--- a/qapi/Makefile.objs
+++ /dev/null
@@ -1,15 +0,0 @@
-QAPI_TARGET_MODULES = machine-target misc-target
-
-obj-y = qapi-introspect.o
-obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o)
-obj-y += qapi-types.o
-obj-y += $(QAPI_TARGET_MODULES:%=qapi-visit-%.o)
-obj-y += qapi-visit.o
-obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o)
-obj-y += qapi-events.o
-obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o)
-obj-y += qapi-commands.o
-obj-y += qapi-init-commands.o
-
-QAPI_MODULES_STORAGE_DAEMON = block-core char common control crypto
-QAPI_MODULES_STORAGE_DAEMON += introspect job qom sockets pragma transaction
diff --git a/qapi/meson.build b/qapi/meson.build
index 51d11ce..de5b16f 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -113,8 +113,12 @@ foreach output : qapi_util_outputs
i = i + 1
endforeach
-# These are still handled by the Makefile
-i += qapi_nonmodule_outputs.length()
-i += qapi_specific_outputs.length()
+foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
+ if output.endswith('.h')
+ genh += qapi_files[i]
+ endif
+ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i])
+ i = i + 1
+endforeach
qapi_doc_texi = qapi_files[i]
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 081/143] meson: convert hw/xen
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (79 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 080/143] meson: convert qapi-specific to meson Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 082/143] meson: convert hw/core Paolo Bonzini
` (66 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 ++++
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/xen/Makefile.objs | 7 -------
hw/xen/meson.build | 20 ++++++++++++++++++++
meson.build | 6 ++++++
6 files changed, 31 insertions(+), 8 deletions(-)
create mode 100644 hw/meson.build
delete mode 100644 hw/xen/Makefile.objs
create mode 100644 hw/xen/meson.build
diff --git a/configure b/configure
index 96ba99f..3483d6c 100755
--- a/configure
+++ b/configure
@@ -2673,6 +2673,8 @@ if test "$xen" != "no" ; then
fi
QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)"
libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu"
+ xen_cflags="$($pkg_config --cflags $xen_pc)"
+ xen_libs="$($pkg_config --libs $xen_pc)"
else
xen_libs="-lxenstore -lxenctrl -lxenguest"
@@ -7239,6 +7241,8 @@ fi
if test "$xen" = "yes" ; then
echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
+ echo "XEN_CFLAGS=$xen_cflags" >> $config_host_mak
+ echo "XEN_LIBS=$xen_libs" >> $config_host_mak
fi
if test "$linux_aio" = "yes" ; then
echo "CONFIG_LINUX_AIO=y" >> $config_host_mak
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 14b7ea4..d204a90 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -35,7 +35,6 @@ devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
-devices-dirs-$(CONFIG_XEN) += xen/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
devices-dirs-$(CONFIG_NUBUS) += nubus/
devices-dirs-y += semihosting/
diff --git a/hw/meson.build b/hw/meson.build
new file mode 100644
index 0000000..08112a5
--- /dev/null
+++ b/hw/meson.build
@@ -0,0 +1 @@
+subdir('xen')
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
deleted file mode 100644
index 502b32d..0000000
--- a/hw/xen/Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-# xen backend driver support
-common-obj-y += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus.o xen-bus-helper.o xen-backend.o
-
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt_load_rom.o
-obj-$(call lnot,$(CONFIG_XEN_PCI_PASSTHROUGH)) += xen_pt_stub.o
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
new file mode 100644
index 0000000..076954b
--- /dev/null
+++ b/hw/xen/meson.build
@@ -0,0 +1,20 @@
+softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+ 'xen-backend.c',
+ 'xen-bus-helper.c',
+ 'xen-bus.c',
+ 'xen-legacy-backend.c',
+ 'xen_devconfig.c',
+ 'xen_pvdev.c',
+))
+
+xen_specific_ss = ss.source_set()
+xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files(
+ 'xen-host-pci-device.c',
+ 'xen_pt.c',
+ 'xen_pt_config_init.c',
+ 'xen_pt_graphics.c',
+ 'xen_pt_load_rom.c',
+ 'xen_pt_msi.c',
+), if_false: files('xen_pt_stub.c'))
+
+specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
diff --git a/meson.build b/meson.build
index fb444ad..550e454 100644
--- a/meson.build
+++ b/meson.build
@@ -308,6 +308,11 @@ numa = not_found
if 'CONFIG_NUMA' in config_host
numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split())
endif
+xen = not_found
+if 'CONFIG_XEN_BACKEND' in config_host
+ xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(),
+ link_args: config_host['XEN_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -651,6 +656,7 @@ subdir('migration')
subdir('monitor')
subdir('net')
subdir('replay')
+subdir('hw')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 082/143] meson: convert hw/core
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (80 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 081/143] meson: convert hw/xen Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 083/143] meson: convert hw/semihosting Paolo Bonzini
` (65 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/core/Makefile.objs | 34 ----------------------------------
hw/core/meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 44 insertions(+), 35 deletions(-)
delete mode 100644 hw/core/Makefile.objs
create mode 100644 hw/core/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index d204a90..bdf8bdf 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,4 +1,3 @@
-devices-dirs-y = core/
ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
devices-dirs-y += acpi/
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
deleted file mode 100644
index d8fee8e..0000000
--- a/hw/core/Makefile.objs
+++ /dev/null
@@ -1,34 +0,0 @@
-# core qdev-related obj files, also used by *-user:
-common-obj-y += qdev.o qdev-properties.o
-common-obj-y += bus.o
-common-obj-y += cpu.o
-common-obj-y += resettable.o
-common-obj-y += hotplug.o
-common-obj-y += vmstate-if.o
-# irq.o needed for qdev GPIO handling:
-common-obj-y += irq.o
-common-obj-y += clock.o qdev-clock.o
-
-common-obj-$(CONFIG_SOFTMMU) += reset.o
-common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o
-common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o
-common-obj-$(CONFIG_SOFTMMU) += nmi.o
-common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o
-common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
-common-obj-$(CONFIG_SOFTMMU) += sysbus.o
-common-obj-$(CONFIG_SOFTMMU) += machine.o
-common-obj-$(CONFIG_SOFTMMU) += null-machine.o
-common-obj-$(CONFIG_SOFTMMU) += loader.o
-common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
-common-obj-$(CONFIG_SOFTMMU) += numa.o
-common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o
-obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
-
-common-obj-$(CONFIG_XILINX_AXI) += stream.o
-common-obj-$(CONFIG_PTIMER) += ptimer.o
-common-obj-$(CONFIG_FITLOADER) += loader-fit.o
-common-obj-$(CONFIG_REGISTER) += register.o
-common-obj-$(CONFIG_OR_IRQ) += or-irq.o
-common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o
-common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
-common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o
diff --git a/hw/core/meson.build b/hw/core/meson.build
new file mode 100644
index 0000000..c12caa3
--- /dev/null
+++ b/hw/core/meson.build
@@ -0,0 +1,43 @@
+common_ss.add(files(
+ # core qdev-related obj files, also used by *-user:
+ 'bus.c',
+ 'cpu.c',
+ 'fw-path-provider.c',
+ 'hotplug.c',
+ 'qdev-properties.c',
+ 'qdev.c',
+ 'reset.c',
+ 'resettable.c',
+ # irq.c needed for qdev GPIO handling:
+ 'irq.c',
+ 'clock.c',
+ 'qdev-clock.c',
+))
+
+common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
+common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
+common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
+common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
+common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
+common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
+common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
+common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
+
+softmmu_ss.add(files(
+ 'loader.c',
+ 'machine-hmp-cmds.c',
+ 'machine.c',
+ 'nmi.c',
+ 'null-machine.c',
+ 'qdev-fw.c',
+ 'qdev-properties-system.c',
+ 'sysbus.c',
+ 'vm-change-state-handler.c',
+ 'vmstate-if.c',
+ 'clock-vmstate.c',
+))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
+ 'machine-qmp-cmds.c',
+ 'numa.c',
+))
diff --git a/hw/meson.build b/hw/meson.build
index 08112a5..fe7c466 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1 +1,2 @@
+subdir('core')
subdir('xen')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 083/143] meson: convert hw/semihosting
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (81 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 082/143] meson: convert hw/core Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 084/143] meson: convert hw/nubus Paolo Bonzini
` (64 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/semihosting/Makefile.objs | 2 --
hw/semihosting/meson.build | 4 ++++
4 files changed, 5 insertions(+), 3 deletions(-)
delete mode 100644 hw/semihosting/Makefile.objs
create mode 100644 hw/semihosting/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index bdf8bdf..6a7ca0f 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -36,7 +36,6 @@ devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
devices-dirs-$(CONFIG_NUBUS) += nubus/
-devices-dirs-y += semihosting/
devices-dirs-y += smbios/
endif
diff --git a/hw/meson.build b/hw/meson.build
index fe7c466..66a2f6c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,2 +1,3 @@
subdir('core')
+subdir('semihosting')
subdir('xen')
diff --git a/hw/semihosting/Makefile.objs b/hw/semihosting/Makefile.objs
deleted file mode 100644
index 4ad47c0..0000000
--- a/hw/semihosting/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SEMIHOSTING) += config.o
-obj-$(CONFIG_SEMIHOSTING) += console.o
diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build
new file mode 100644
index 0000000..f40ac57
--- /dev/null
+++ b/hw/semihosting/meson.build
@@ -0,0 +1,4 @@
+specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
+ 'config.c',
+ 'console.c',
+))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 084/143] meson: convert hw/nubus
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (82 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 083/143] meson: convert hw/semihosting Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 085/143] meson: convert hw/smbios Paolo Bonzini
` (63 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/nubus/Makefile.objs | 4 ----
hw/nubus/meson.build | 7 +++++++
4 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 hw/nubus/Makefile.objs
create mode 100644 hw/nubus/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6a7ca0f..86bc201 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
-devices-dirs-$(CONFIG_NUBUS) += nubus/
devices-dirs-y += smbios/
endif
diff --git a/hw/meson.build b/hw/meson.build
index 66a2f6c..03ef302 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
subdir('core')
+subdir('nubus')
subdir('semihosting')
subdir('xen')
diff --git a/hw/nubus/Makefile.objs b/hw/nubus/Makefile.objs
deleted file mode 100644
index 135ba78..0000000
--- a/hw/nubus/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-common-obj-y += nubus-device.o
-common-obj-y += nubus-bus.o
-common-obj-y += nubus-bridge.o
-common-obj-$(CONFIG_Q800) += mac-nubus-bridge.o
diff --git a/hw/nubus/meson.build b/hw/nubus/meson.build
new file mode 100644
index 0000000..9287c63
--- /dev/null
+++ b/hw/nubus/meson.build
@@ -0,0 +1,7 @@
+nubus_ss = ss.source_set()
+nubus_ss.add(files('nubus-device.c'))
+nubus_ss.add(files('nubus-bus.c'))
+nubus_ss.add(files('nubus-bridge.c'))
+nubus_ss.add(when: 'CONFIG_Q800', if_true: files('mac-nubus-bridge.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 085/143] meson: convert hw/smbios
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (83 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 084/143] meson: convert hw/nubus Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 086/143] meson: convert hw/mem Paolo Bonzini
` (62 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/smbios/Makefile.objs | 10 ----------
hw/smbios/meson.build | 13 +++++++++++++
4 files changed, 14 insertions(+), 11 deletions(-)
delete mode 100644 hw/smbios/Makefile.objs
create mode 100644 hw/smbios/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 86bc201..73c49dd 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
-devices-dirs-y += smbios/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 03ef302..dccc2d1 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
subdir('nubus')
subdir('semihosting')
+subdir('smbios')
subdir('xen')
diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs
deleted file mode 100644
index 23bb2ba..0000000
--- a/hw/smbios/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(CONFIG_SMBIOS),y)
-common-obj-y += smbios.o
-common-obj-$(CONFIG_IPMI) += smbios_type_38.o
-common-obj-$(call lnot,$(CONFIG_IPMI)) += smbios_type_38-stub.o
-else
-common-obj-y += smbios-stub.o
-endif
-
-common-obj-$(CONFIG_ALL) += smbios-stub.o
-common-obj-$(CONFIG_ALL) += smbios_type_38-stub.o
diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build
new file mode 100644
index 0000000..9e762c7
--- /dev/null
+++ b/hw/smbios/meson.build
@@ -0,0 +1,13 @@
+smbios_ss = ss.source_set()
+smbios_ss.add(files('smbios.c'))
+smbios_ss.add(when: 'CONFIG_IPMI',
+ if_true: files('smbios_type_38.c'),
+ if_false: files('smbios_type_38-stub.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
+softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
+
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files(
+ 'smbios-stub.c',
+ 'smbios_type_38-stub.c',
+))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 086/143] meson: convert hw/mem
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (84 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 085/143] meson: convert hw/smbios Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 087/143] meson: convert hw/watchdog Paolo Bonzini
` (61 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/mem/Kconfig | 1 +
hw/mem/Makefile.objs | 3 ---
hw/mem/meson.build | 6 ++++++
hw/meson.build | 1 +
5 files changed, 8 insertions(+), 4 deletions(-)
delete mode 100644 hw/mem/Makefile.objs
create mode 100644 hw/mem/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 73c49dd..df72b25 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -34,7 +34,6 @@ devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
-devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
index c278449..a0ef2cf 100644
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -9,3 +9,4 @@ config NVDIMM
bool
default y
depends on (PC || PSERIES || ARM_VIRT)
+ select MEM_DEVICE
diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
deleted file mode 100644
index 56345be..0000000
--- a/hw/mem/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-common-obj-$(CONFIG_DIMM) += pc-dimm.o
-common-obj-y += memory-device.o
-common-obj-$(CONFIG_NVDIMM) += nvdimm.o
diff --git a/hw/mem/meson.build b/hw/mem/meson.build
new file mode 100644
index 0000000..ba42462
--- /dev/null
+++ b/hw/mem/meson.build
@@ -0,0 +1,6 @@
+mem_ss = ss.source_set()
+mem_ss.add(files('memory-device.c'))
+mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c'))
+mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
diff --git a/hw/meson.build b/hw/meson.build
index dccc2d1..542d675 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 087/143] meson: convert hw/watchdog
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (85 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 086/143] meson: convert hw/mem Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 088/143] meson: convert hw/virtio Paolo Bonzini
` (60 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/watchdog/Makefile.objs | 7 -------
hw/watchdog/meson.build | 7 +++++++
4 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 hw/watchdog/Makefile.objs
create mode 100644 hw/watchdog/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index df72b25..9ebd13d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -33,7 +33,6 @@ devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
-devices-dirs-y += watchdog/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 542d675..f2209d9 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,4 +3,5 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('watchdog')
subdir('xen')
diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs
deleted file mode 100644
index 631b711..0000000
--- a/hw/watchdog/Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-common-obj-y += watchdog.o
-common-obj-$(CONFIG_CMSDK_APB_WATCHDOG) += cmsdk-apb-watchdog.o
-common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o
-common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o
-common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o
-common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o
-common-obj-$(CONFIG_WDT_IMX2) += wdt_imx2.o
diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build
new file mode 100644
index 0000000..9b8725e
--- /dev/null
+++ b/hw/watchdog/meson.build
@@ -0,0 +1,7 @@
+softmmu_ss.add(files('watchdog.c'))
+softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-watchdog.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 088/143] meson: convert hw/virtio
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (86 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 087/143] meson: convert hw/watchdog Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 089/143] meson: convert hw/vfio Paolo Bonzini
` (59 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/virtio/Makefile.objs | 48 ----------------------------------------------
hw/virtio/meson.build | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 52 insertions(+), 49 deletions(-)
delete mode 100644 hw/virtio/Makefile.objs
create mode 100644 hw/virtio/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 9ebd13d..a1cfb99 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -32,7 +32,6 @@ devices-dirs-y += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
-devices-dirs-y += virtio/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index f2209d9..8338fc4 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,5 +3,6 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('virtio')
subdir('watchdog')
subdir('xen')
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
deleted file mode 100644
index fc91719..0000000
--- a/hw/virtio/Makefile.objs
+++ /dev/null
@@ -1,48 +0,0 @@
-ifeq ($(CONFIG_VIRTIO),y)
-common-obj-y += virtio-bus.o
-obj-y += virtio.o
-
-obj-$(CONFIG_VHOST) += vhost.o vhost-backend.o
-common-obj-$(call lnot,$(CONFIG_VHOST)) += vhost-stub.o
-obj-$(CONFIG_VHOST_USER) += vhost-user.o
-obj-$(CONFIG_VHOST_VDPA) += vhost-vdpa.o
-
-common-obj-$(CONFIG_VIRTIO_RNG) += virtio-rng.o
-common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
-common-obj-$(CONFIG_VIRTIO_MMIO) += virtio-mmio.o
-obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o
-obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o
-obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o
-obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o
-obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o
-common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o
-obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-pci.o
-obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
-obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-common.o vhost-vsock.o
-obj-$(CONFIG_VHOST_USER_VSOCK) += vhost-vsock-common.o vhost-user-vsock.o
-obj-$(CONFIG_VIRTIO_MEM) += virtio-mem.o
-common-obj-$(call land,$(CONFIG_VIRTIO_MEM),$(CONFIG_VIRTIO_PCI)) += virtio-mem-pci.o
-
-ifeq ($(CONFIG_VIRTIO_PCI),y)
-obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o
-obj-$(CONFIG_VHOST_USER_VSOCK) += vhost-user-vsock-pci.o
-obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o
-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input-pci.o
-obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o
-obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-pci.o
-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o
-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-pci.o
-obj-$(CONFIG_VIRTIO_RNG) += virtio-rng-pci.o
-obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon-pci.o
-obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu-pci.o
-obj-$(CONFIG_VIRTIO_9P) += virtio-9p-pci.o
-obj-$(CONFIG_VIRTIO_SCSI) += virtio-scsi-pci.o
-obj-$(CONFIG_VIRTIO_BLK) += virtio-blk-pci.o
-obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o
-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-serial-pci.o
-endif
-else
-common-obj-y += vhost-stub.o
-endif
-
-common-obj-$(CONFIG_ALL) += vhost-stub.o
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
new file mode 100644
index 0000000..fbff9bc
--- /dev/null
+++ b/hw/virtio/meson.build
@@ -0,0 +1,51 @@
+softmmu_virtio_ss = ss.source_set()
+softmmu_virtio_ss.add(files('virtio-bus.c'))
+softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c'))
+softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c'))
+softmmu_virtio_ss.add(when: 'CONFIG_VHOST', if_false: files('vhost-stub.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
+softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
+
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
+
+virtio_ss = ss.source_set()
+virtio_ss.add(files('virtio.c'))
+virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c'))
+virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs.c'))
+virtio_ss.add(when: ['CONFIG_VHOST_USER_FS', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-fs-pci.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', 'vhost-vsock-common.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c', 'vhost-vsock-common.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c'))
+
+virtio_pci_ss = ss.source_set()
+virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-scsi-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c'))
+
+virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
+
+specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 089/143] meson: convert hw/vfio
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (87 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 088/143] meson: convert hw/virtio Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 090/143] meson: convert hw/usb Paolo Bonzini
` (58 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/vfio/Makefile.objs | 8 --------
hw/vfio/meson.build | 18 ++++++++++++++++++
4 files changed, 19 insertions(+), 9 deletions(-)
delete mode 100644 hw/vfio/Makefile.objs
create mode 100644 hw/vfio/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index a1cfb99..f6e08f6 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -31,7 +31,6 @@ devices-dirs-y += ssi/
devices-dirs-y += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-y += usb/
-devices-dirs-$(CONFIG_VFIO) += vfio/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 8338fc4..4dafc8a 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,6 +3,7 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('vfio')
subdir('virtio')
subdir('watchdog')
subdir('xen')
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
deleted file mode 100644
index 9bb1c09..0000000
--- a/hw/vfio/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-obj-y += common.o spapr.o
-obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o
-obj-$(CONFIG_VFIO_CCW) += ccw.o
-obj-$(CONFIG_VFIO_PLATFORM) += platform.o
-obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
-obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
-obj-$(CONFIG_VFIO_AP) += ap.o
-obj-$(CONFIG_VFIO_IGD) += igd.o
diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build
new file mode 100644
index 0000000..37efa74
--- /dev/null
+++ b/hw/vfio/meson.build
@@ -0,0 +1,18 @@
+vfio_ss = ss.source_set()
+vfio_ss.add(files(
+ 'common.c',
+ 'spapr.c',
+))
+vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
+ 'display.c',
+ 'pci-quirks.c',
+ 'pci.c',
+))
+vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c'))
+vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c'))
+vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c'))
+vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c'))
+vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c'))
+vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c'))
+
+specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 090/143] meson: convert hw/usb
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (88 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 089/143] meson: convert hw/vfio Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 091/143] meson: convert hw/tpm Paolo Bonzini
` (57 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 1 +
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/usb/Makefile.objs | 71 ----------------------------------------------------
hw/usb/meson.build | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
meson.build | 15 +++++++++++
6 files changed, 86 insertions(+), 72 deletions(-)
delete mode 100644 hw/usb/Makefile.objs
create mode 100644 hw/usb/meson.build
diff --git a/Makefile.target b/Makefile.target
index 386378b..3d5a2af 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -168,6 +168,7 @@ endif
LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS)
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
+LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f6e08f6..c2619bb 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -30,7 +30,6 @@ devices-dirs-y += sd/
devices-dirs-y += ssi/
devices-dirs-y += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
-devices-dirs-y += usb/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 4dafc8a..89bd6ad 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,6 +3,7 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('usb')
subdir('vfio')
subdir('virtio')
subdir('watchdog')
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
deleted file mode 100644
index e342ff5..0000000
--- a/hw/usb/Makefile.objs
+++ /dev/null
@@ -1,71 +0,0 @@
-# usb subsystem core
-common-obj-y += core.o combined-packet.o bus.o libhw.o
-common-obj-$(CONFIG_USB) += desc.o desc-msos.o
-
-# usb host adapters
-common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
-common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
-common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o
-common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
-common-obj-$(CONFIG_USB_EHCI_PCI) += hcd-ehci-pci.o
-common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o
-common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
-common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o
-common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
-common-obj-$(CONFIG_USB_DWC2) += hcd-dwc2.o
-
-common-obj-$(CONFIG_TUSB6010) += tusb6010.o
-common-obj-$(CONFIG_IMX) += chipidea.o
-
-# emulated usb devices
-common-obj-$(CONFIG_USB) += dev-hub.o
-common-obj-$(CONFIG_USB) += dev-hid.o
-common-obj-$(CONFIG_USB_TABLET_WACOM) += dev-wacom.o
-common-obj-$(CONFIG_USB_STORAGE_BOT) += dev-storage.o
-common-obj-$(CONFIG_USB_STORAGE_UAS) += dev-uas.o
-common-obj-$(CONFIG_USB_AUDIO) += dev-audio.o
-common-obj-$(CONFIG_USB_SERIAL) += dev-serial.o
-common-obj-$(CONFIG_USB_NETWORK) += dev-network.o
-
-ifeq ($(CONFIG_USB_SMARTCARD),y)
-common-obj-y += dev-smartcard-reader.o
-ifeq ($(CONFIG_SMARTCARD),y)
-common-obj-m += smartcard.mo
-smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o
-smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
-smartcard.mo-libs := $(SMARTCARD_LIBS)
-endif
-endif
-
-ifeq ($(CONFIG_POSIX),y)
-common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o
-endif
-
-# usb redirection
-ifeq ($(CONFIG_USB),y)
-ifeq ($(CONFIG_USB_REDIR),y)
-common-obj-m += redirect.mo
-redirect.mo-objs = redirect.o quirks.o
-redirect.mo-cflags = $(USB_REDIR_CFLAGS)
-redirect.mo-libs = $(USB_REDIR_LIBS)
-endif
-endif
-
-# usb pass-through
-ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
-common-obj-y += host-libusb.o
-else
-common-obj-y += host-stub.o
-endif
-common-obj-$(CONFIG_ALL) += host-stub.o
-
-host-libusb.o-cflags := $(LIBUSB_CFLAGS)
-host-libusb.o-libs := $(LIBUSB_LIBS)
-
-ifeq ($(CONFIG_USB_LIBUSB),y)
-common-obj-$(CONFIG_XEN) += xen-usb.o
-xen-usb.o-cflags := $(LIBUSB_CFLAGS)
-xen-usb.o-libs := $(LIBUSB_LIBS)
-endif
-
-common-obj-$(CONFIG_IMX_USBPHY) += imx-usb-phy.o
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
new file mode 100644
index 0000000..f40d158
--- /dev/null
+++ b/hw/usb/meson.build
@@ -0,0 +1,69 @@
+hw_usb_modules = []
+
+# usb subsystem core
+softmmu_ss.add(files(
+ 'bus.c',
+ 'combined-packet.c',
+ 'core.c',
+ 'libhw.c'
+))
+
+softmmu_ss.add(when: 'CONFIG_USB', if_true: files(
+ 'desc.c',
+ 'desc-msos.c',
+))
+
+# usb host adapters
+softmmu_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
+softmmu_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
+softmmu_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c'))
+softmmu_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c'))
+softmmu_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c'))
+
+softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c'))
+softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c'))
+
+# emulated usb devices
+softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c'))
+softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c'))
+softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.c'))
+softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage.c'))
+softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c'))
+softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c'))
+softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c'))
+softmmu_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c'))
+softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c'))
+
+# smartcard
+softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c'))
+
+if config_host.has_key('CONFIG_SMARTCARD')
+ hw_usb_modules += [['smartcard', files(
+ 'ccid-card-emulated.c',
+ 'ccid-card-passthru.c',
+ ), [cacard], ['CONFIG_USB_SMARTCARD']]]
+endif
+
+# usb redirect
+if config_host.has_key('CONFIG_USB_REDIR')
+ hw_usb_modules += [['redirect', files(
+ 'redirect.c',
+ 'quirks.c',
+ ), [usbredir], ['CONFIG_USB']]]
+endif
+
+# usb pass-through
+softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_USB_LIBUSB', libusb],
+ if_true: files('host-libusb.c'),
+ if_false: files('host-stub.c'))
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('host-stub.c'))
+
+softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true: files('xen-usb.c'))
+
+modules += { 'hw-usb': hw_usb_modules }
diff --git a/meson.build b/meson.build
index 550e454..e2a80b8 100644
--- a/meson.build
+++ b/meson.build
@@ -313,6 +313,21 @@ if 'CONFIG_XEN_BACKEND' in config_host
xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(),
link_args: config_host['XEN_LIBS'].split())
endif
+cacard = not_found
+if 'CONFIG_SMARTCARD' in config_host
+ cacard = declare_dependency(compile_args: config_host['SMARTCARD_CFLAGS'].split(),
+ link_args: config_host['SMARTCARD_LIBS'].split())
+endif
+usbredir = not_found
+if 'CONFIG_USB_REDIR' in config_host
+ usbredir = declare_dependency(compile_args: config_host['USB_REDIR_CFLAGS'].split(),
+ link_args: config_host['USB_REDIR_LIBS'].split())
+endif
+libusb = not_found
+if 'CONFIG_USB_LIBUSB' in config_host
+ libusb = declare_dependency(compile_args: config_host['LIBUSB_CFLAGS'].split(),
+ link_args: config_host['LIBUSB_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 091/143] meson: convert hw/tpm
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (89 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 090/143] meson: convert hw/usb Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 092/143] meson: convert hw/timer Paolo Bonzini
` (56 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/tpm/Makefile.objs | 6 ------
hw/tpm/meson.build | 8 ++++++++
4 files changed, 9 insertions(+), 7 deletions(-)
delete mode 100644 hw/tpm/Makefile.objs
create mode 100644 hw/tpm/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index c2619bb..f0e5728 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -29,7 +29,6 @@ devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
devices-dirs-y += ssi/
devices-dirs-y += timer/
-devices-dirs-$(CONFIG_TPM) += tpm/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 89bd6ad..2ddf6ba 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,6 +3,7 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('tpm')
subdir('usb')
subdir('vfio')
subdir('virtio')
diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
deleted file mode 100644
index 6fc05be..0000000
--- a/hw/tpm/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
-common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
-common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
-obj-$(CONFIG_TPM_SPAPR) += tpm_spapr.o
diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build
new file mode 100644
index 0000000..1c68d81
--- /dev/null
+++ b/hw/tpm/meson.build
@@ -0,0 +1,8 @@
+softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
+
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true: files('tpm_ppi.c'))
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true: files('tpm_ppi.c'))
+specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 092/143] meson: convert hw/timer
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (90 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 091/143] meson: convert hw/tpm Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 093/143] meson: convert hw/rtc Paolo Bonzini
` (55 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/timer/Makefile.objs | 41 -----------------------------------------
hw/timer/meson.build | 37 +++++++++++++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 42 deletions(-)
delete mode 100644 hw/timer/Makefile.objs
create mode 100644 hw/timer/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f0e5728..70ecaa8 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -28,7 +28,6 @@ devices-dirs-y += rtc/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
devices-dirs-y += ssi/
-devices-dirs-y += timer/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 2ddf6ba..50b26db 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -3,6 +3,7 @@ subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')
+subdir('timer')
subdir('tpm')
subdir('usb')
subdir('vfio')
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
deleted file mode 100644
index 1303b13..0000000
--- a/hw/timer/Makefile.objs
+++ /dev/null
@@ -1,41 +0,0 @@
-common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
-common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o
-common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o
-common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o
-common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
-common-obj-$(CONFIG_HPET) += hpet.o
-common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
-common-obj-$(CONFIG_PUV3) += puv3_ost.o
-common-obj-$(CONFIG_XILINX) += xilinx_timer.o
-common-obj-$(CONFIG_SLAVIO) += slavio_timer.o
-common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o
-common-obj-$(CONFIG_GRLIB) += grlib_gptimer.o
-common-obj-$(CONFIG_IMX) += imx_epit.o
-common-obj-$(CONFIG_IMX) += imx_gpt.o
-common-obj-$(CONFIG_LM32) += lm32_timer.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o
-common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o
-
-common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
-common-obj-$(CONFIG_OMAP) += omap_gptimer.o
-common-obj-$(CONFIG_OMAP) += omap_synctimer.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
-common-obj-$(CONFIG_SH4) += sh_timer.o
-common-obj-$(CONFIG_RENESAS_TMR) += renesas_tmr.o
-common-obj-$(CONFIG_RENESAS_CMT) += renesas_cmt.o
-common-obj-$(CONFIG_DIGIC) += digic-timer.o
-common-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
-
-common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
-
-common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o
-
-common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
-common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
-common-obj-$(CONFIG_MSF2) += mss-timer.o
-common-obj-$(CONFIG_RASPI) += bcm2835_systmr.o
-
-obj-$(CONFIG_AVR_TIMER16) += avr_timer16.o
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
new file mode 100644
index 0000000..9f0a267
--- /dev/null
+++ b/hw/timer/meson.build
@@ -0,0 +1,37 @@
+softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
+softmmu_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
+softmmu_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
+softmmu_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
+softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c'))
+softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c'))
+softmmu_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-apb-dualtimer.c'))
+softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c'))
+softmmu_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c'))
+softmmu_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c'))
+softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
+softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
+softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
+softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
+softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
+softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c'))
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.c'))
+softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
+softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
+softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c'))
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
+softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c'))
+softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
+
+specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 093/143] meson: convert hw/rtc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (91 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 092/143] meson: convert hw/timer Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 094/143] meson: convert hw/ssi Paolo Bonzini
` (54 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/rtc/Makefile.objs | 15 ---------------
hw/rtc/meson.build | 16 ++++++++++++++++
4 files changed, 17 insertions(+), 16 deletions(-)
delete mode 100644 hw/rtc/Makefile.objs
create mode 100644 hw/rtc/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 70ecaa8..f60fd01 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -24,7 +24,6 @@ devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
-devices-dirs-y += rtc/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
devices-dirs-y += ssi/
diff --git a/hw/meson.build b/hw/meson.build
index 50b26db..1fb1687 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('rtc')
subdir('semihosting')
subdir('smbios')
subdir('timer')
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
deleted file mode 100644
index e4c1b86..0000000
--- a/hw/rtc/Makefile.objs
+++ /dev/null
@@ -1,15 +0,0 @@
-common-obj-$(CONFIG_DS1338) += ds1338.o
-common-obj-$(CONFIG_M41T80) += m41t80.o
-common-obj-$(CONFIG_M48T59) += m48t59.o
-ifeq ($(CONFIG_ISA_BUS),y)
-common-obj-$(CONFIG_M48T59) += m48t59-isa.o
-endif
-common-obj-$(CONFIG_PL031) += pl031.o
-common-obj-$(CONFIG_TWL92230) += twl92230.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
-obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
-common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_rtc.o
-common-obj-$(CONFIG_GOLDFISH_RTC) += goldfish_rtc.o
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-rtc.o
diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
new file mode 100644
index 0000000..7cecdee
--- /dev/null
+++ b/hw/rtc/meson.build
@@ -0,0 +1,16 @@
+
+softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
+softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
+softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
+softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
+softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
+softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
+
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
+softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
+softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
+
+specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 094/143] meson: convert hw/ssi
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (92 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 093/143] meson: convert hw/rtc Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 095/143] meson: convert hw/sd Paolo Bonzini
` (53 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/ssi/Makefile.objs | 10 ----------
hw/ssi/meson.build | 9 +++++++++
4 files changed, 10 insertions(+), 11 deletions(-)
delete mode 100644 hw/ssi/Makefile.objs
create mode 100644 hw/ssi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f60fd01..e50eb04 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -26,7 +26,6 @@ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
-devices-dirs-y += ssi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 1fb1687..7564426 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -4,6 +4,7 @@ subdir('nubus')
subdir('rtc')
subdir('semihosting')
subdir('smbios')
+subdir('ssi')
subdir('timer')
subdir('tpm')
subdir('usb')
diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs
deleted file mode 100644
index 07a85f1..0000000
--- a/hw/ssi/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-common-obj-$(CONFIG_PL022) += pl022.o
-common-obj-$(CONFIG_SSI) += ssi.o
-common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o
-common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o
-common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o
-common-obj-$(CONFIG_MSF2) += mss-spi.o
-
-common-obj-$(CONFIG_OMAP) += omap_spi.o
-common-obj-$(CONFIG_IMX) += imx_spi.o
diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build
new file mode 100644
index 0000000..f1f5c28
--- /dev/null
+++ b/hw/ssi/meson.build
@@ -0,0 +1,9 @@
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
+softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
+softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
+softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 095/143] meson: convert hw/sd
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (93 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 094/143] meson: convert hw/ssi Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 21:43 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 096/143] meson: convert hw/scsi Paolo Bonzini
` (52 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/sd/Makefile.objs | 12 ------------
hw/sd/meson.build | 12 ++++++++++++
4 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 hw/sd/Makefile.objs
create mode 100644 hw/sd/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index e50eb04..6f9c0b7 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -25,7 +25,6 @@ devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
devices-dirs-$(CONFIG_SCSI) += scsi/
-devices-dirs-y += sd/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 7564426..a73f4ae 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -2,6 +2,7 @@ subdir('core')
subdir('mem')
subdir('nubus')
subdir('rtc')
+subdir('sd')
subdir('semihosting')
subdir('smbios')
subdir('ssi')
diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs
deleted file mode 100644
index 0d1df17..0000000
--- a/hw/sd/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-common-obj-$(CONFIG_PL181) += pl181.o
-common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
-common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o
-common-obj-$(CONFIG_SDHCI) += sdhci.o
-common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o
-
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sdhost.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
-common-obj-$(CONFIG_OMAP) += omap_mmc.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
-common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
diff --git a/hw/sd/meson.build b/hw/sd/meson.build
new file mode 100644
index 0000000..b43e59b
--- /dev/null
+++ b/hw/sd/meson.build
@@ -0,0 +1,12 @@
+softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
+softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
+softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
+softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
+softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
+
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 096/143] meson: convert hw/scsi
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (94 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 095/143] meson: convert hw/sd Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 097/143] meson: convert hw/pcmcia Paolo Bonzini
` (51 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/scsi/Makefile.objs | 15 ---------------
hw/scsi/meson.build | 26 ++++++++++++++++++++++++++
4 files changed, 27 insertions(+), 16 deletions(-)
delete mode 100644 hw/scsi/Makefile.objs
create mode 100644 hw/scsi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6f9c0b7..b6461c2 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -24,7 +24,6 @@ devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
-devices-dirs-$(CONFIG_SCSI) += scsi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index a73f4ae..d4abb67 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -2,6 +2,7 @@ subdir('core')
subdir('mem')
subdir('nubus')
subdir('rtc')
+subdir('scsi')
subdir('sd')
subdir('semihosting')
subdir('smbios')
diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs
deleted file mode 100644
index 54b36ed..0000000
--- a/hw/scsi/Makefile.objs
+++ /dev/null
@@ -1,15 +0,0 @@
-common-obj-y += scsi-disk.o emulation.o
-common-obj-y += scsi-generic.o scsi-bus.o
-common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
-common-obj-$(CONFIG_MPTSAS_SCSI_PCI) += mptsas.o mptconfig.o mptendian.o
-common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
-common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) += vmw_pvscsi.o
-common-obj-$(CONFIG_ESP) += esp.o
-common-obj-$(CONFIG_ESP_PCI) += esp-pci.o
-obj-$(CONFIG_SPAPR_VSCSI) += spapr_vscsi.o
-
-ifeq ($(CONFIG_VIRTIO_SCSI),y)
-obj-y += virtio-scsi.o virtio-scsi-dataplane.o
-obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o
-obj-$(CONFIG_VHOST_USER_SCSI) += vhost-scsi-common.o vhost-user-scsi.o
-endif
diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build
new file mode 100644
index 0000000..923a34f
--- /dev/null
+++ b/hw/scsi/meson.build
@@ -0,0 +1,26 @@
+scsi_ss = ss.source_set()
+scsi_ss.add(files(
+ 'emulation.c',
+ 'scsi-bus.c',
+ 'scsi-disk.c',
+ 'scsi-generic.c',
+))
+scsi_ss.add(when: 'CONFIG_ESP', if_true: files('esp.c'))
+scsi_ss.add(when: 'CONFIG_ESP_PCI', if_true: files('esp-pci.c'))
+scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c'))
+scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c'))
+scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c'))
+scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c'))
+softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss)
+
+specific_scsi_ss = ss.source_set()
+
+virtio_scsi_ss = ss.source_set()
+virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c'))
+virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c'))
+virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-user-scsi.c'))
+specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss)
+
+specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c'))
+
+specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 097/143] meson: convert hw/pcmcia
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (95 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 096/143] meson: convert hw/scsi Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 098/143] meson: convert hw/pci-host Paolo Bonzini
` (50 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/pcmcia/Makefile.objs | 2 --
hw/pcmcia/meson.build | 2 ++
4 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 hw/pcmcia/Makefile.objs
create mode 100644 hw/pcmcia/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index b6461c2..f28da58 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -23,7 +23,6 @@ devices-dirs-y += rdma/
devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
-devices-dirs-y += pcmcia/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index d4abb67..ed25644 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pcmcia')
subdir('rtc')
subdir('scsi')
subdir('sd')
diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs
deleted file mode 100644
index 02cd986..0000000
--- a/hw/pcmcia/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-y += pcmcia.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx.o
diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
new file mode 100644
index 0000000..ab50bd3
--- /dev/null
+++ b/hw/pcmcia/meson.build
@@ -0,0 +1,2 @@
+softmmu_ss.add(files('pcmcia.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 098/143] meson: convert hw/pci-host
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (96 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 097/143] meson: convert hw/pcmcia Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 099/143] meson: convert hw/pci-bridge Paolo Bonzini
` (49 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 2 +-
hw/meson.build | 1 +
hw/pci-host/Makefile.objs | 24 ------------------------
hw/pci-host/meson.build | 30 ++++++++++++++++++++++++++++++
4 files changed, 32 insertions(+), 25 deletions(-)
delete mode 100644 hw/pci-host/Makefile.objs
create mode 100644 hw/pci-host/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f28da58..0038cf8 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -22,7 +22,7 @@ devices-dirs-y += net/
devices-dirs-y += rdma/
devices-dirs-y += nvram/
devices-dirs-y += pci/
-devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
+devices-dirs-$(CONFIG_PCI) += pci-bridge/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index ed25644..ca36e48 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pci-host')
subdir('pcmcia')
subdir('rtc')
subdir('scsi')
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
deleted file mode 100644
index e422e0a..0000000
--- a/hw/pci-host/Makefile.objs
+++ /dev/null
@@ -1,24 +0,0 @@
-common-obj-$(CONFIG_PAM) += pam.o
-
-# PPC devices
-common-obj-$(CONFIG_PREP_PCI) += prep.o
-common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o
-# NewWorld PowerMac
-common-obj-$(CONFIG_UNIN_PCI) += uninorth.o
-# PowerPC E500 boards
-common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
-
-# ARM devices
-common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
-
-common-obj-$(CONFIG_PCI_SABRE) += sabre.o
-common-obj-$(CONFIG_PCI_BONITO) += bonito.o
-common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
-common-obj-$(CONFIG_XEN_IGD_PASSTHROUGH) += xen_igd_pt.o
-common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
-common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
-common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o
-
-common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) += designware.o
-obj-$(CONFIG_POWERNV) += pnv_phb4.o pnv_phb4_pec.o
-obj-$(CONFIG_POWERNV) += pnv_phb3.o pnv_phb3_msi.o pnv_phb3_pbcq.o
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
new file mode 100644
index 0000000..a84380d
--- /dev/null
+++ b/hw/pci-host/meson.build
@@ -0,0 +1,30 @@
+pci_ss = ss.source_set()
+pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c'))
+pci_ss.add(when: 'CONFIG_PCI_BONITO', if_true: files('bonito.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true: files('designware.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c'))
+pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
+pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c'))
+pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c'))
+
+# PPC devices
+pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))
+pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c'))
+# NewWorld PowerMac
+pci_ss.add(when: 'CONFIG_UNIN_PCI', if_true: files('uninorth.c'))
+# PowerPC E500 boards
+pci_ss.add(when: 'CONFIG_PPCE500_PCI', if_true: files('ppce500.c'))
+
+# ARM devices
+pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
+
+specific_ss.add(when: 'CONFIG_POWERNV', if_true: files(
+ 'pnv_phb3.c',
+ 'pnv_phb3_msi.c',
+ 'pnv_phb3_pbcq.c',
+ 'pnv_phb4.c',
+))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 099/143] meson: convert hw/pci-bridge
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (97 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 098/143] meson: convert hw/pci-host Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 100/143] meson: convert hw/pci Paolo Bonzini
` (48 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/pci-bridge/Makefile.objs | 10 ----------
hw/pci-bridge/meson.build | 14 ++++++++++++++
4 files changed, 15 insertions(+), 11 deletions(-)
delete mode 100644 hw/pci-bridge/Makefile.objs
create mode 100644 hw/pci-bridge/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 0038cf8..3513040 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -22,7 +22,6 @@ devices-dirs-y += net/
devices-dirs-y += rdma/
devices-dirs-y += nvram/
devices-dirs-y += pci/
-devices-dirs-$(CONFIG_PCI) += pci-bridge/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index ca36e48..a7301f2 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pci-bridge')
subdir('pci-host')
subdir('pcmcia')
subdir('rtc')
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
deleted file mode 100644
index 47065f8..0000000
--- a/hw/pci-bridge/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-common-obj-y += pci_bridge_dev.o
-common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o pcie_pci_bridge.o
-common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
-common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
-common-obj-$(CONFIG_IOH3420) += ioh3420.o
-common-obj-$(CONFIG_I82801B11) += i82801b11.o
-# NewWorld PowerMac
-common-obj-$(CONFIG_DEC_PCI) += dec.o
-# Sun4u
-common-obj-$(CONFIG_SIMBA) += simba.o
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
new file mode 100644
index 0000000..daab8ac
--- /dev/null
+++ b/hw/pci-bridge/meson.build
@@ -0,0 +1,14 @@
+pci_ss = ss.source_set()
+pci_ss.add(files('pci_bridge_dev.c'))
+pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c'))
+pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c'))
+pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c', 'pcie_pci_bridge.c'))
+pci_ss.add(when: 'CONFIG_PXB', if_true: files('pci_expander_bridge.c'))
+pci_ss.add(when: 'CONFIG_XIO3130', if_true: files('xio3130_upstream.c', 'xio3130_downstream.c'))
+
+# NewWorld PowerMac
+pci_ss.add(when: 'CONFIG_DEC_PCI', if_true: files('dec.c'))
+# Sun4u
+pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 100/143] meson: convert hw/pci
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (98 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 099/143] meson: convert hw/pci-bridge Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 101/143] meson: convert hw/nvram Paolo Bonzini
` (47 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/pci/Makefile.objs | 14 --------------
hw/pci/meson.build | 19 +++++++++++++++++++
4 files changed, 20 insertions(+), 15 deletions(-)
delete mode 100644 hw/pci/Makefile.objs
create mode 100644 hw/pci/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 3513040..2083284 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -21,7 +21,6 @@ devices-dirs-y += misc/
devices-dirs-y += net/
devices-dirs-y += rdma/
devices-dirs-y += nvram/
-devices-dirs-y += pci/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index a7301f2..53c347c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pci')
subdir('pci-bridge')
subdir('pci-host')
subdir('pcmcia')
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
deleted file mode 100644
index c78f2fb..0000000
--- a/hw/pci/Makefile.objs
+++ /dev/null
@@ -1,14 +0,0 @@
-common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
-common-obj-$(CONFIG_PCI) += msix.o msi.o
-common-obj-$(CONFIG_PCI) += shpc.o
-common-obj-$(CONFIG_PCI) += slotid_cap.o
-common-obj-$(CONFIG_PCI) += pci_host.o
-
-# The functions in these modules can be used by devices too. Since we
-# allow plugging PCIe devices into PCI buses, include them even if
-# CONFIG_PCI_EXPRESS=n.
-common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o
-common-obj-$(CONFIG_PCI_EXPRESS) += pcie_port.o pcie_host.o
-
-common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o
-common-obj-$(CONFIG_ALL) += pci-stub.o
diff --git a/hw/pci/meson.build b/hw/pci/meson.build
new file mode 100644
index 0000000..5c4bbac
--- /dev/null
+++ b/hw/pci/meson.build
@@ -0,0 +1,19 @@
+pci_ss = ss.source_set()
+pci_ss.add(files(
+ 'msi.c',
+ 'msix.c',
+ 'pci.c',
+ 'pci_bridge.c',
+ 'pci_host.c',
+ 'shpc.c',
+ 'slotid_cap.c'
+))
+# The functions in these modules can be used by devices too. Since we
+# allow plugging PCIe devices into PCI buses, include them even if
+# CONFIG_PCI_EXPRESS=n.
+pci_ss.add(files('pcie.c', 'pcie_aer.c'))
+softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
+softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
+
+softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c'))
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 101/143] meson: convert hw/nvram
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (99 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 100/143] meson: convert hw/pci Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 102/143] meson: convert hw/rdma Paolo Bonzini
` (46 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/nvram/Makefile.objs | 8 --------
hw/nvram/meson.build | 9 +++++++++
4 files changed, 10 insertions(+), 9 deletions(-)
delete mode 100644 hw/nvram/Makefile.objs
create mode 100644 hw/nvram/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 2083284..78860ae 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -20,7 +20,6 @@ devices-dirs-y += isa/
devices-dirs-y += misc/
devices-dirs-y += net/
devices-dirs-y += rdma/
-devices-dirs-y += nvram/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 53c347c..0bdd6a2 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('nvram')
subdir('pci')
subdir('pci-bridge')
subdir('pci-host')
diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs
deleted file mode 100644
index f3ad921..0000000
--- a/hw/nvram/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-common-obj-$(CONFIG_DS1225Y) += ds1225y.o
-common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o
-common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
-common-obj-y += fw_cfg.o
-common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
-common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
-common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
-obj-$(CONFIG_PSERIES) += spapr_nvram.o
diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
new file mode 100644
index 0000000..ba21455
--- /dev/null
+++ b/hw/nvram/meson.build
@@ -0,0 +1,9 @@
+softmmu_ss.add(files('fw_cfg.c'))
+softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
+softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
+softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
+softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
+softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
+softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
+
+specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 102/143] meson: convert hw/rdma
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (100 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 101/143] meson: convert hw/nvram Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 103/143] meson: convert hw/net Paolo Bonzini
` (45 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/rdma/Makefile.objs | 3 ---
hw/rdma/meson.build | 10 ++++++++++
4 files changed, 11 insertions(+), 4 deletions(-)
delete mode 100644 hw/rdma/Makefile.objs
create mode 100644 hw/rdma/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 78860ae..748a718 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -19,7 +19,6 @@ devices-dirs-$(CONFIG_IPMI) += ipmi/
devices-dirs-y += isa/
devices-dirs-y += misc/
devices-dirs-y += net/
-devices-dirs-y += rdma/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 0bdd6a2..f704e51 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -6,6 +6,7 @@ subdir('pci')
subdir('pci-bridge')
subdir('pci-host')
subdir('pcmcia')
+subdir('rdma')
subdir('rtc')
subdir('scsi')
subdir('sd')
diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs
deleted file mode 100644
index 819bb12..0000000
--- a/hw/rdma/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_VMW_PVRDMA) += rdma_utils.o rdma_backend.o rdma_rm.o rdma.o
-obj-$(CONFIG_VMW_PVRDMA) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
- vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build
new file mode 100644
index 0000000..7325f40
--- /dev/null
+++ b/hw/rdma/meson.build
@@ -0,0 +1,10 @@
+specific_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
+ 'rdma.c',
+ 'rdma_backend.c',
+ 'rdma_rm.c',
+ 'rdma_utils.c',
+ 'vmw/pvrdma_cmd.c',
+ 'vmw/pvrdma_dev_ring.c',
+ 'vmw/pvrdma_main.c',
+ 'vmw/pvrdma_qp_ops.c',
+))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 103/143] meson: convert hw/net
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (101 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 102/143] meson: convert hw/rdma Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 104/143] meson: convert hw/misc Paolo Bonzini
` (44 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/net/Makefile.objs | 59 ------------------------------------------
hw/net/can/Makefile.objs | 4 ---
hw/net/can/meson.build | 4 +++
hw/net/meson.build | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 72 insertions(+), 64 deletions(-)
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
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 748a718..d0d7816 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -18,7 +18,6 @@ devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_IPMI) += ipmi/
devices-dirs-y += isa/
devices-dirs-y += misc/
-devices-dirs-y += net/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index f704e51..1f7b2c4 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,5 +1,6 @@
subdir('core')
subdir('mem')
+subdir('net')
subdir('nubus')
subdir('nvram')
subdir('pci')
diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
deleted file mode 100644
index 7ccbf72..0000000
--- a/hw/net/Makefile.objs
+++ /dev/null
@@ -1,59 +0,0 @@
-common-obj-$(CONFIG_DP8393X) += dp8393x.o
-common-obj-$(CONFIG_XEN) += xen_nic.o
-common-obj-$(CONFIG_NE2000_COMMON) += ne2000.o
-
-# PCI network cards
-common-obj-$(CONFIG_NE2000_PCI) += ne2000-pci.o
-common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
-common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
-common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
-common-obj-$(CONFIG_E1000_PCI) += e1000.o e1000x_common.o
-common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += net_tx_pkt.o net_rx_pkt.o
-common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += e1000e.o e1000e_core.o e1000x_common.o
-common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
-common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o
-common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o
-common-obj-$(CONFIG_TULIP) += tulip.o
-
-common-obj-$(CONFIG_SMC91C111) += smc91c111.o
-common-obj-$(CONFIG_LAN9118) += lan9118.o
-common-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
-common-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
-common-obj-$(CONFIG_XGMAC) += xgmac.o
-common-obj-$(CONFIG_MIPSNET) += mipsnet.o
-common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
-common-obj-$(CONFIG_ALLWINNER_EMAC) += allwinner_emac.o
-common-obj-$(CONFIG_ALLWINNER_SUN8I_EMAC) += allwinner-sun8i-emac.o
-common-obj-$(CONFIG_IMX_FEC) += imx_fec.o
-
-common-obj-$(CONFIG_CADENCE) += cadence_gem.o
-common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o
-common-obj-$(CONFIG_LANCE) += lance.o
-common-obj-$(CONFIG_LASI_82596) += lasi_i82596.o
-common-obj-$(CONFIG_I82596_COMMON) += i82596.o
-common-obj-$(CONFIG_SUNHME) += sunhme.o
-common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
-common-obj-$(CONFIG_SUNGEM) += sungem.o
-
-common-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
-common-obj-$(CONFIG_COLDFIRE) += mcf_fec.o
-obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o
-obj-$(CONFIG_PSERIES) += spapr_llan.o
-obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
-
-common-obj-$(CONFIG_VIRTIO_NET) += net_rx_pkt.o
-obj-$(CONFIG_VIRTIO_NET) += virtio-net.o
-common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o
-common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o
-common-obj-$(CONFIG_ALL) += vhost_net-stub.o
-
-common-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
- fsl_etsec/rings.o fsl_etsec/miim.o
-
-common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \
- rocker/rocker_desc.o rocker/rocker_world.o \
- rocker/rocker_of_dpa.o
-obj-$(call lnot,$(CONFIG_ROCKER)) += rocker/qmp-norocker.o
-
-common-obj-$(CONFIG_CAN_BUS) += can/
-common-obj-$(CONFIG_MSF2) += msf2-emac.o
diff --git a/hw/net/can/Makefile.objs b/hw/net/can/Makefile.objs
deleted file mode 100644
index 9f0c4ee..0000000
--- a/hw/net/can/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-common-obj-$(CONFIG_CAN_SJA1000) += can_sja1000.o
-common-obj-$(CONFIG_CAN_PCI) += can_kvaser_pci.o
-common-obj-$(CONFIG_CAN_PCI) += can_pcm3680_pci.o
-common-obj-$(CONFIG_CAN_PCI) += can_mioe3680_pci.o
diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build
new file mode 100644
index 0000000..c9cfeb7
--- /dev/null
+++ b/hw/net/can/meson.build
@@ -0,0 +1,4 @@
+softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
diff --git a/hw/net/meson.build b/hw/net/meson.build
new file mode 100644
index 0000000..4a7051b
--- /dev/null
+++ b/hw/net/meson.build
@@ -0,0 +1,67 @@
+softmmu_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c'))
+softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c'))
+softmmu_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c'))
+
+# PCI network cards
+softmmu_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c'))
+softmmu_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c'))
+softmmu_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c'))
+softmmu_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c'))
+softmmu_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x_common.c'))
+softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
+softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c', 'e1000e_core.c', 'e1000x_common.c'))
+softmmu_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c'))
+softmmu_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c'))
+softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
+softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c'))
+
+softmmu_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c'))
+softmmu_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c'))
+softmmu_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c'))
+softmmu_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.c'))
+softmmu_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c'))
+softmmu_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_emac.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinner-sun8i-emac.c'))
+softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c'))
+softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c'))
+
+softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
+softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
+softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
+softmmu_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
+softmmu_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
+softmmu_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
+softmmu_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
+softmmu_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
+
+softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
+softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
+specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-minimac2.c'))
+specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c'))
+specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c'))
+
+softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
+specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c'))
+
+softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c'))
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c'))
+
+softmmu_ss.add(when: 'CONFIG_ETSEC', if_true: files(
+ 'fsl_etsec/etsec.c',
+ 'fsl_etsec/miim.c',
+ 'fsl_etsec/registers.c',
+ 'fsl_etsec/rings.c',
+))
+
+softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files(
+ 'rocker/rocker.c',
+ 'rocker/rocker_desc.c',
+ 'rocker/rocker_fp.c',
+ 'rocker/rocker_of_dpa.c',
+ 'rocker/rocker_world.c',
+), if_false: files('rocker/qmp-norocker.c'))
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
+
+subdir('can')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 104/143] meson: convert hw/misc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (102 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 103/143] meson: convert hw/net Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 105/143] meson: convert hw/isa Paolo Bonzini
` (43 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/misc/Makefile.objs | 95 -------------------------------------------
hw/misc/macio/Makefile.objs | 5 ---
hw/misc/macio/meson.build | 8 ++++
hw/misc/meson.build | 99 +++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 108 insertions(+), 101 deletions(-)
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/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index d0d7816..ac8278e 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -17,7 +17,6 @@ devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_IPMI) += ipmi/
devices-dirs-y += isa/
-devices-dirs-y += misc/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 1f7b2c4..6ca82b0 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,5 +1,6 @@
subdir('core')
subdir('mem')
+subdir('misc')
subdir('net')
subdir('nubus')
subdir('nvram')
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
deleted file mode 100644
index 6be3d25..0000000
--- a/hw/misc/Makefile.objs
+++ /dev/null
@@ -1,95 +0,0 @@
-common-obj-$(CONFIG_APPLESMC) += applesmc.o
-common-obj-$(CONFIG_MAX111X) += max111x.o
-common-obj-$(CONFIG_TMP105) += tmp105.o
-common-obj-$(CONFIG_TMP421) += tmp421.o
-common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o
-common-obj-$(CONFIG_SGA) += sga.o
-common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o
-common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
-common-obj-$(CONFIG_EDU) += edu.o
-common-obj-$(CONFIG_PCA9552) += pca9552.o
-
-common-obj-$(CONFIG_UNIMP) += unimp.o
-common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
-common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
-
-# ARM devices
-common-obj-$(CONFIG_PL310) += arm_l2x0.o
-common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o
-common-obj-$(CONFIG_A9SCU) += a9scu.o
-common-obj-$(CONFIG_ARM11SCU) += arm11scu.o
-
-# Mac devices
-common-obj-$(CONFIG_MOS6522) += mos6522.o
-
-# PKUnity SoC devices
-common-obj-$(CONFIG_PUV3) += puv3_pm.o
-
-common-obj-$(CONFIG_MACIO) += macio/
-
-common-obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o
-
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-ccu.o
-obj-$(CONFIG_ALLWINNER_H3) += allwinner-cpucfg.o
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-dramc.o
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-sysctrl.o
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sid.o
-common-obj-$(CONFIG_REALVIEW) += arm_sysctl.o
-common-obj-$(CONFIG_NSERIES) += cbus.o
-common-obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o exynos4210_rng.o
-common-obj-$(CONFIG_IMX) += imx_ccm.o
-common-obj-$(CONFIG_IMX) += imx31_ccm.o
-common-obj-$(CONFIG_IMX) += imx25_ccm.o
-common-obj-$(CONFIG_IMX) += imx6_ccm.o
-common-obj-$(CONFIG_IMX) += imx6ul_ccm.o
-obj-$(CONFIG_IMX) += imx6_src.o
-common-obj-$(CONFIG_IMX) += imx7_ccm.o
-common-obj-$(CONFIG_IMX) += imx7_snvs.o
-common-obj-$(CONFIG_IMX) += imx7_gpr.o
-common-obj-$(CONFIG_IMX) += imx_rngc.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o
-common-obj-$(CONFIG_MAINSTONE) += mst_fpga.o
-common-obj-$(CONFIG_OMAP) += omap_clk.o
-common-obj-$(CONFIG_OMAP) += omap_gpmc.o
-common-obj-$(CONFIG_OMAP) += omap_l4.o
-common-obj-$(CONFIG_OMAP) += omap_sdrc.o
-common-obj-$(CONFIG_OMAP) += omap_tap.o
-common-obj-$(CONFIG_RASPI) += bcm2835_mbox.o
-common-obj-$(CONFIG_RASPI) += bcm2835_mphi.o
-common-obj-$(CONFIG_RASPI) += bcm2835_property.o
-common-obj-$(CONFIG_RASPI) += bcm2835_rng.o
-common-obj-$(CONFIG_RASPI) += bcm2835_thermal.o
-common-obj-$(CONFIG_SLAVIO) += slavio_misc.o
-common-obj-$(CONFIG_ZYNQ) += zynq_slcr.o
-common-obj-$(CONFIG_ZYNQ) += zynq-xadc.o
-common-obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o
-common-obj-$(CONFIG_STM32F4XX_SYSCFG) += stm32f4xx_syscfg.o
-common-obj-$(CONFIG_STM32F4XX_EXTI) += stm32f4xx_exti.o
-obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o
-obj-$(CONFIG_MIPS_CPS) += mips_cpc.o
-obj-$(CONFIG_MIPS_ITU) += mips_itu.o
-common-obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o
-common-obj-$(CONFIG_MPS2_SCC) += mps2-scc.o
-
-common-obj-$(CONFIG_TZ_MPC) += tz-mpc.o
-common-obj-$(CONFIG_TZ_MSC) += tz-msc.o
-common-obj-$(CONFIG_TZ_PPC) += tz-ppc.o
-common-obj-$(CONFIG_IOTKIT_SECCTL) += iotkit-secctl.o
-obj-$(CONFIG_IOTKIT_SYSCTL) += iotkit-sysctl.o
-common-obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o
-common-obj-$(CONFIG_ARMSSE_CPUID) += armsse-cpuid.o
-common-obj-$(CONFIG_ARMSSE_MHU) += armsse-mhu.o
-
-common-obj-$(CONFIG_PVPANIC) += pvpanic.o
-common-obj-$(CONFIG_AUX) += auxbus.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_xdma.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o
-common-obj-$(CONFIG_MSF2) += msf2-sysreg.o
-common-obj-$(CONFIG_NRF51_SOC) += nrf51_rng.o
-obj-$(CONFIG_MAC_VIA) += mac_via.o
-
-common-obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o
-
-obj-$(CONFIG_AVR_POWER) += avr_power.o
diff --git a/hw/misc/macio/Makefile.objs b/hw/misc/macio/Makefile.objs
deleted file mode 100644
index 07fdb32..0000000
--- a/hw/misc/macio/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-common-obj-y += macio.o
-common-obj-$(CONFIG_CUDA) += cuda.o
-common-obj-$(CONFIG_MAC_PMU) += pmu.o
-common-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o
-common-obj-$(CONFIG_MACIO_GPIO) += gpio.o
diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build
new file mode 100644
index 0000000..17282da
--- /dev/null
+++ b/hw/misc/macio/meson.build
@@ -0,0 +1,8 @@
+macio_ss = ss.source_set()
+macio_ss.add(files('macio.c'))
+macio_ss.add(when: 'CONFIG_CUDA', if_true: files('cuda.c'))
+macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c'))
+macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c'))
+macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss)
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
new file mode 100644
index 0000000..84fed04
--- /dev/null
+++ b/hw/misc/meson.build
@@ -0,0 +1,99 @@
+softmmu_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c'))
+softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
+softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
+softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
+softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
+softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
+softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c'))
+softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
+softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
+softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
+softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
+
+# ARM devices
+softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
+softmmu_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integrator_debug.c'))
+softmmu_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c'))
+softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
+
+# Mac devices
+softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
+
+# PKUnity SoC devices
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_pm.c'))
+
+subdir('macio')
+
+softmmu_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c'))
+
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
+specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucfg.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
+softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c'))
+softmmu_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c'))
+softmmu_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files(
+ 'imx25_ccm.c',
+ 'imx31_ccm.c',
+ 'imx6_ccm.c',
+ 'imx6ul_ccm.c',
+ 'imx7_ccm.c',
+ 'imx7_gpr.c',
+ 'imx7_snvs.c',
+ 'imx_ccm.c',
+ 'imx_rngc.c',
+))
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-hpdmc.c', 'milkymist-pfpu.c'))
+softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files(
+ 'omap_clk.c',
+ 'omap_gpmc.c',
+ 'omap_l4.c',
+ 'omap_sdrc.c',
+ 'omap_tap.c',
+))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
+ 'bcm2835_mbox.c',
+ 'bcm2835_mphi.c',
+ 'bcm2835_property.c',
+ 'bcm2835_rng.c',
+ 'bcm2835_thermal.c',
+))
+softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
+softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-xadc.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_exti.c'))
+softmmu_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'))
+softmmu_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c'))
+
+softmmu_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c'))
+softmmu_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c'))
+softmmu_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c'))
+softmmu_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c'))
+softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c'))
+softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
+softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
+
+softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c'))
+softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c'))
+softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
+softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+
+softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
+
+specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
+
+specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx6_src.c'))
+specific_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c'))
+
+specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
+
+specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c'))
+specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 105/143] meson: convert hw/isa
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (103 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 104/143] meson: convert hw/misc Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 106/143] meson: convert hw/ipmi Paolo Bonzini
` (42 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/isa/Makefile.objs | 11 -----------
hw/isa/meson.build | 11 +++++++++++
hw/meson.build | 1 +
4 files changed, 12 insertions(+), 12 deletions(-)
delete mode 100644 hw/isa/Makefile.objs
create mode 100644 hw/isa/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index ac8278e..a28e211 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -16,7 +16,6 @@ devices-dirs-y += input/
devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_IPMI) += ipmi/
-devices-dirs-y += isa/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
deleted file mode 100644
index 8e73960..0000000
--- a/hw/isa/Makefile.objs
+++ /dev/null
@@ -1,11 +0,0 @@
-common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
-common-obj-$(CONFIG_ISA_SUPERIO) += isa-superio.o
-common-obj-$(CONFIG_APM) += apm.o
-common-obj-$(CONFIG_I82378) += i82378.o
-common-obj-$(CONFIG_PC87312) += pc87312.o
-common-obj-$(CONFIG_PIIX3) += piix3.o
-common-obj-$(CONFIG_PIIX4) += piix4.o
-common-obj-$(CONFIG_VT82C686) += vt82c686.o
-common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o
-
-obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o
diff --git a/hw/isa/meson.build b/hw/isa/meson.build
new file mode 100644
index 0000000..8bf678c
--- /dev/null
+++ b/hw/isa/meson.build
@@ -0,0 +1,11 @@
+softmmu_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
+softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c'))
+softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
+softmmu_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c'))
+softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
+softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
+softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
+
+specific_ss.add(when: 'CONFIG_LPC_ICH9', if_true: files('lpc_ich9.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 6ca82b0..8659854 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('isa')
subdir('mem')
subdir('misc')
subdir('net')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 106/143] meson: convert hw/ipmi
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (104 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 105/143] meson: convert hw/isa Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-07 14:42 ` Corey Minyard
2020-08-06 19:15 ` [PATCH 107/143] meson: convert hw/ipack Paolo Bonzini
` (41 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/ipmi/Makefile.objs | 8 --------
hw/ipmi/meson.build | 11 +++++++++++
hw/meson.build | 1 +
4 files changed, 12 insertions(+), 9 deletions(-)
delete mode 100644 hw/ipmi/Makefile.objs
create mode 100644 hw/ipmi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index a28e211..f136377 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -15,7 +15,6 @@ devices-dirs-y += ide/
devices-dirs-y += input/
devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
-devices-dirs-$(CONFIG_IPMI) += ipmi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs
deleted file mode 100644
index 3cca10b..0000000
--- a/hw/ipmi/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-common-obj-$(CONFIG_IPMI) += ipmi.o ipmi_kcs.o ipmi_bt.o
-common-obj-$(CONFIG_IPMI_LOCAL) += ipmi_bmc_sim.o
-common-obj-$(CONFIG_IPMI_EXTERN) += ipmi_bmc_extern.o
-common-obj-$(CONFIG_ISA_IPMI_KCS) += isa_ipmi_kcs.o
-common-obj-$(CONFIG_PCI_IPMI_KCS) += pci_ipmi_kcs.o
-common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o
-common-obj-$(CONFIG_PCI_IPMI_BT) += pci_ipmi_bt.o
-common-obj-$(CONFIG_IPMI_SSIF) += smbus_ipmi.o
diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
new file mode 100644
index 0000000..9622ea2
--- /dev/null
+++ b/hw/ipmi/meson.build
@@ -0,0 +1,11 @@
+ipmi_ss = ss.source_set()
+ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c', 'ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_LOCAL', if_true: files('ipmi_bmc_sim.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_EXTERN', if_true: files('ipmi_bmc_extern.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_KCS', if_true: files('isa_ipmi_kcs.c'))
+ipmi_ss.add(when: 'CONFIG_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
diff --git a/hw/meson.build b/hw/meson.build
index 8659854..9796f95 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipmi')
subdir('isa')
subdir('mem')
subdir('misc')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 107/143] meson: convert hw/ipack
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (105 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 106/143] meson: convert hw/ipmi Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 108/143] meson: convert hw/intc Paolo Bonzini
` (40 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/ipack/Makefile.objs | 2 --
hw/ipack/meson.build | 1 +
hw/meson.build | 1 +
4 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 hw/ipack/Makefile.objs
create mode 100644 hw/ipack/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f136377..76d9305 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -14,7 +14,6 @@ devices-dirs-$(CONFIG_I2C) += i2c/
devices-dirs-y += ide/
devices-dirs-y += input/
devices-dirs-y += intc/
-devices-dirs-$(CONFIG_IPACK) += ipack/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ipack/Makefile.objs b/hw/ipack/Makefile.objs
deleted file mode 100644
index 8b9bdcb..0000000
--- a/hw/ipack/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-$(CONFIG_IPACK) += ipack.o
-common-obj-$(CONFIG_IPACK) += tpci200.o
diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build
new file mode 100644
index 0000000..3f8138b
--- /dev/null
+++ b/hw/ipack/meson.build
@@ -0,0 +1 @@
+softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 9796f95..ec4bb48 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipack')
subdir('ipmi')
subdir('isa')
subdir('mem')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 108/143] meson: convert hw/intc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (106 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 107/143] meson: convert hw/ipack Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 21:02 ` Peter Maydell
2020-08-06 19:15 ` [PATCH 109/143] meson: convert hw/input Paolo Bonzini
` (39 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/intc/Makefile.objs | 54 --------------------------------------------------
hw/intc/meson.build | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 56 insertions(+), 55 deletions(-)
delete mode 100644 hw/intc/Makefile.objs
create mode 100644 hw/intc/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 76d9305..80b1041 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -13,7 +13,6 @@ devices-dirs-$(CONFIG_HYPERV) += hyperv/
devices-dirs-$(CONFIG_I2C) += i2c/
devices-dirs-y += ide/
devices-dirs-y += input/
-devices-dirs-y += intc/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
deleted file mode 100644
index 3ac2b40..0000000
--- a/hw/intc/Makefile.objs
+++ /dev/null
@@ -1,54 +0,0 @@
-common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
-common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
-common-obj-$(CONFIG_PL190) += pl190.o
-common-obj-$(CONFIG_PUV3) += puv3_intc.o
-common-obj-$(CONFIG_XILINX) += xilinx_intc.o
-common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
-common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
-common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
-common-obj-$(CONFIG_LM32) += lm32_pic.o
-common-obj-$(CONFIG_REALVIEW) += realview_gic.o
-common-obj-$(CONFIG_SLAVIO) += slavio_intctl.o
-common-obj-$(CONFIG_IOAPIC) += ioapic_common.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gic.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv2m.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_common.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv3.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_dist.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_redist.o
-common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_its_common.o
-common-obj-$(CONFIG_OPENPIC) += openpic.o
-common-obj-$(CONFIG_RX_ICU) += rx_icu.o
-common-obj-y += intc.o
-
-obj-$(CONFIG_APIC) += apic.o apic_common.o
-obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
-obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_kvm.o
-obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_its_kvm.o
-obj-$(CONFIG_ARM_V7M) += armv7m_nvic.o
-obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o
-obj-$(CONFIG_GRLIB) += grlib_irqmp.o
-obj-$(CONFIG_IOAPIC) += ioapic.o
-obj-$(CONFIG_OMAP) += omap_intc.o
-obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o
-obj-$(CONFIG_RASPI) += bcm2835_ic.o bcm2836_control.o
-obj-$(CONFIG_SH4) += sh_intc.o
-obj-$(CONFIG_XICS) += xics.o
-obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o
-obj-$(CONFIG_XICS_KVM) += xics_kvm.o
-obj-$(CONFIG_XIVE) += xive.o
-obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o
-obj-$(CONFIG_XIVE_KVM) += spapr_xive_kvm.o
-obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o
-obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o
-obj-$(CONFIG_S390_FLIC) += s390_flic.o
-obj-$(CONFIG_S390_FLIC_KVM) += s390_flic_kvm.o
-obj-$(CONFIG_ASPEED_SOC) += aspeed_vic.o
-obj-$(CONFIG_ARM_GIC) += arm_gicv3_cpuif.o
-obj-$(CONFIG_MIPS_CPS) += mips_gic.o
-obj-$(CONFIG_NIOS2) += nios2_iic.o
-obj-$(CONFIG_OMPIC) += ompic.o
-obj-$(CONFIG_IBEX) += ibex_plic.o
-obj-$(CONFIG_LOONGSON_LIOINTC) += loongson_liointc.o
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
new file mode 100644
index 0000000..c16f7f0
--- /dev/null
+++ b/hw/intc/meson.build
@@ -0,0 +1,55 @@
+softmmu_ss.add(files('intc.c'))
+softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(
+ 'arm_gic.c',
+ 'arm_gic_common.c',
+ 'arm_gicv2m.c',
+ 'arm_gicv3.c',
+ 'arm_gicv3_common.c',
+ 'arm_gicv3_dist.c',
+ 'arm_gicv3_its_common.c',
+ 'arm_gicv3_redist.c',
+))
+softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
+softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
+softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
+softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
+softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c'))
+softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
+softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c'))
+softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
+softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-intc.c'))
+
+specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c'))
+specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
+specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif.c'))
+specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'))
+specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c'))
+specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))
+specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
+specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c'))
+specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
+specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_plic.c'))
+specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c'))
+specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_liointc.c'))
+specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c'))
+specific_ss.add(when: 'CONFIG_NIOS2', if_true: files('nios2_iic.c'))
+specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
+specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c'))
+specific_ss.add(when: 'CONFIG_OPENPIC_KVM', if_true: files('openpic_kvm.c'))
+specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_xive.c'))
+specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c'))
+specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c'))
+specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c'))
+specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kvm.c'))
+specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c'))
+specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c'))
+specific_ss.add(when: 'CONFIG_XICS_KVM', if_true: files('xics_kvm.c'))
+specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c'))
+specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c'))
+specific_ss.add(when: 'CONFIG_XIVE_KVM', if_true: files('spapr_xive_kvm.c'))
+specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c'))
diff --git a/hw/meson.build b/hw/meson.build
index ec4bb48..986e710 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('intc')
subdir('ipack')
subdir('ipmi')
subdir('isa')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 109/143] meson: convert hw/input
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (107 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 108/143] meson: convert hw/intc Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 110/143] meson: convert hw/ide Paolo Bonzini
` (38 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/input/Makefile.objs | 18 ------------------
hw/input/meson.build | 18 ++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 hw/input/Makefile.objs
create mode 100644 hw/input/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 80b1041..3feccd8 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -12,7 +12,6 @@ devices-dirs-y += gpio/
devices-dirs-$(CONFIG_HYPERV) += hyperv/
devices-dirs-$(CONFIG_I2C) += i2c/
devices-dirs-y += ide/
-devices-dirs-y += input/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
deleted file mode 100644
index abc1ff0..0000000
--- a/hw/input/Makefile.objs
+++ /dev/null
@@ -1,18 +0,0 @@
-common-obj-$(CONFIG_ADB) += adb.o adb-mouse.o adb-kbd.o
-common-obj-y += hid.o
-common-obj-$(CONFIG_LM832X) += lm832x.o
-common-obj-$(CONFIG_PCKBD) += pckbd.o
-common-obj-$(CONFIG_PL050) += pl050.o
-common-obj-$(CONFIG_PS2) += ps2.o
-common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
-common-obj-$(CONFIG_TSC2005) += tsc2005.o
-
-common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input.o
-common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
-common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
-common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
-
-common-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
-common-obj-$(CONFIG_TSC210X) += tsc210x.o
-common-obj-$(CONFIG_LASIPS2) += lasips2.o
diff --git a/hw/input/meson.build b/hw/input/meson.build
new file mode 100644
index 0000000..e7285b1
--- /dev/null
+++ b/hw/input/meson.build
@@ -0,0 +1,18 @@
+softmmu_ss.add(files('hid.c'))
+softmmu_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', 'adb-kbd.c'))
+softmmu_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c'))
+softmmu_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c'))
+softmmu_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c'))
+softmmu_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c'))
+softmmu_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_input.c'))
+softmmu_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c'))
+
+softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c'))
+softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c'))
+softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c'))
+softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c'))
+
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-softusb.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c'))
+softmmu_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c'))
+softmmu_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 986e710..b15c8d0 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('input')
subdir('intc')
subdir('ipack')
subdir('ipmi')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 110/143] meson: convert hw/ide
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (108 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 109/143] meson: convert hw/input Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 111/143] meson: convert hw/i2c Paolo Bonzini
` (37 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/ide/Makefile.objs | 14 --------------
hw/ide/meson.build | 14 ++++++++++++++
hw/meson.build | 1 +
4 files changed, 15 insertions(+), 15 deletions(-)
delete mode 100644 hw/ide/Makefile.objs
create mode 100644 hw/ide/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 3feccd8..02c5c0d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -11,7 +11,6 @@ devices-dirs-y += dma/
devices-dirs-y += gpio/
devices-dirs-$(CONFIG_HYPERV) += hyperv/
devices-dirs-$(CONFIG_I2C) += i2c/
-devices-dirs-y += ide/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
deleted file mode 100644
index faf04e0..0000000
--- a/hw/ide/Makefile.objs
+++ /dev/null
@@ -1,14 +0,0 @@
-common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o
-common-obj-$(CONFIG_IDE_QDEV) += qdev.o
-common-obj-$(CONFIG_IDE_PCI) += pci.o
-common-obj-$(CONFIG_IDE_ISA) += isa.o ioport.o
-common-obj-$(CONFIG_IDE_PIIX) += piix.o ioport.o
-common-obj-$(CONFIG_IDE_CMD646) += cmd646.o
-common-obj-$(CONFIG_IDE_MACIO) += macio.o
-common-obj-$(CONFIG_IDE_MMIO) += mmio.o
-common-obj-$(CONFIG_IDE_VIA) += via.o
-common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
-common-obj-$(CONFIG_AHCI) += ahci.o
-common-obj-$(CONFIG_AHCI_ICH9) += ich.o
-common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
-common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
diff --git a/hw/ide/meson.build b/hw/ide/meson.build
new file mode 100644
index 0000000..ddcb3b2
--- /dev/null
+++ b/hw/ide/meson.build
@@ -0,0 +1,14 @@
+softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
+softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c'))
+softmmu_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c'))
+softmmu_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
diff --git a/hw/meson.build b/hw/meson.build
index b15c8d0..4d7c31c6 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ide')
subdir('input')
subdir('intc')
subdir('ipack')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 111/143] meson: convert hw/i2c
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (109 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 110/143] meson: convert hw/ide Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-07 13:41 ` Philippe Mathieu-Daudé
2020-08-07 14:45 ` Corey Minyard
2020-08-06 19:15 ` [PATCH 112/143] meson: convert hw/hyperv Paolo Bonzini
` (36 subsequent siblings)
147 siblings, 2 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/i2c/Makefile.objs | 14 --------------
hw/i2c/meson.build | 16 ++++++++++++++++
hw/meson.build | 1 +
4 files changed, 17 insertions(+), 15 deletions(-)
delete mode 100644 hw/i2c/Makefile.objs
create mode 100644 hw/i2c/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 02c5c0d..22eb804 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -10,7 +10,6 @@ devices-dirs-y += display/
devices-dirs-y += dma/
devices-dirs-y += gpio/
devices-dirs-$(CONFIG_HYPERV) += hyperv/
-devices-dirs-$(CONFIG_I2C) += i2c/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
deleted file mode 100644
index f2c61ea..0000000
--- a/hw/i2c/Makefile.objs
+++ /dev/null
@@ -1,14 +0,0 @@
-common-obj-$(CONFIG_I2C) += core.o
-common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o
-common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o
-common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
-common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o
-common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o
-common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
-common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o
-common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o
-common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o
-common-obj-$(CONFIG_OMAP) += omap_i2c.o
-common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
new file mode 100644
index 0000000..3a51153
--- /dev/null
+++ b/hw/i2c/meson.build
@@ -0,0 +1,16 @@
+i2c_ss = ss.source_set()
+i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c'))
+i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c'))
+i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c'))
+i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c'))
+i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c'))
+i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c'))
+i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c'))
+i2c_ss.add(when: 'CONFIG_IMX_I2C', if_true: files('imx_i2c.c'))
+i2c_ss.add(when: 'CONFIG_MPC_I2C', if_true: files('mpc_i2c.c'))
+i2c_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('microbit_i2c.c'))
+i2c_ss.add(when: 'CONFIG_SMBUS_EEPROM', if_true: files('smbus_eeprom.c'))
+i2c_ss.add(when: 'CONFIG_VERSATILE_I2C', if_true: files('versatile_i2c.c'))
+i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c'))
+i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c'))
+softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
diff --git a/hw/meson.build b/hw/meson.build
index 4d7c31c6..983edc1 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('i2c')
subdir('ide')
subdir('input')
subdir('intc')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 112/143] meson: convert hw/hyperv
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (110 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 111/143] meson: convert hw/i2c Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 113/143] meson: convert hw/gpio Paolo Bonzini
` (35 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/hyperv/Makefile.objs | 3 ---
hw/hyperv/meson.build | 3 +++
hw/meson.build | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 hw/hyperv/Makefile.objs
create mode 100644 hw/hyperv/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 22eb804..a2c2f6d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -9,7 +9,6 @@ devices-dirs-y += cpu/
devices-dirs-y += display/
devices-dirs-y += dma/
devices-dirs-y += gpio/
-devices-dirs-$(CONFIG_HYPERV) += hyperv/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/hyperv/Makefile.objs b/hw/hyperv/Makefile.objs
deleted file mode 100644
index 5b614e0..0000000
--- a/hw/hyperv/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += hyperv.o
-obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o
-obj-$(CONFIG_VMBUS) += vmbus.o
diff --git a/hw/hyperv/meson.build b/hw/hyperv/meson.build
new file mode 100644
index 0000000..1367e29
--- /dev/null
+++ b/hw/hyperv/meson.build
@@ -0,0 +1,3 @@
+specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'))
+specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true: files('hyperv_testdev.c'))
+specific_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 983edc1..f9e5adf 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('hyperv')
subdir('i2c')
subdir('ide')
subdir('input')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 113/143] meson: convert hw/gpio
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (111 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 112/143] meson: convert hw/hyperv Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 114/143] meson: convert hw/dma Paolo Bonzini
` (34 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/gpio/Makefile.objs | 12 ------------
hw/gpio/meson.build | 12 ++++++++++++
hw/meson.build | 1 +
4 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 hw/gpio/Makefile.objs
create mode 100644 hw/gpio/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index a2c2f6d..c04dfe5 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -8,7 +8,6 @@ devices-dirs-y += char/
devices-dirs-y += cpu/
devices-dirs-y += display/
devices-dirs-y += dma/
-devices-dirs-y += gpio/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs
deleted file mode 100644
index 3cfc261..0000000
--- a/hw/gpio/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-common-obj-$(CONFIG_MAX7310) += max7310.o
-common-obj-$(CONFIG_PL061) += pl061.o
-common-obj-$(CONFIG_PUV3) += puv3_gpio.o
-common-obj-$(CONFIG_ZAURUS) += zaurus.o
-common-obj-$(CONFIG_E500) += mpc8xxx.o
-common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
-
-common-obj-$(CONFIG_OMAP) += omap_gpio.o
-common-obj-$(CONFIG_IMX) += imx_gpio.o
-common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
-common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
new file mode 100644
index 0000000..6bcdfa6
--- /dev/null
+++ b/hw/gpio/meson.build
@@ -0,0 +1,12 @@
+softmmu_ss.add(when: 'CONFIG_E500', if_true: files('mpc8xxx.c'))
+softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
+softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
+softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
+
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
diff --git a/hw/meson.build b/hw/meson.build
index f9e5adf..52577c3 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('gpio')
subdir('hyperv')
subdir('i2c')
subdir('ide')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 114/143] meson: convert hw/dma
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (112 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 113/143] meson: convert hw/gpio Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 115/143] meson: convert hw/display Paolo Bonzini
` (33 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/dma/Makefile.objs | 16 ----------------
hw/dma/meson.build | 15 +++++++++++++++
hw/meson.build | 1 +
4 files changed, 16 insertions(+), 17 deletions(-)
delete mode 100644 hw/dma/Makefile.objs
create mode 100644 hw/dma/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index c04dfe5..26917a4 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -7,7 +7,6 @@ devices-dirs-y += block/
devices-dirs-y += char/
devices-dirs-y += cpu/
devices-dirs-y += display/
-devices-dirs-y += dma/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
deleted file mode 100644
index f4b1cfe..0000000
--- a/hw/dma/Makefile.objs
+++ /dev/null
@@ -1,16 +0,0 @@
-common-obj-$(CONFIG_PUV3) += puv3_dma.o
-common-obj-$(CONFIG_RC4030) += rc4030.o
-common-obj-$(CONFIG_PL080) += pl080.o
-common-obj-$(CONFIG_PL330) += pl330.o
-common-obj-$(CONFIG_I82374) += i82374.o
-common-obj-$(CONFIG_I8257) += i8257.o
-common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
-common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
-common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
-common-obj-$(CONFIG_STP2000) += sparc32_dma.o
-common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
-common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
-
-common-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
-common-obj-$(CONFIG_RASPI) += bcm2835_dma.o
diff --git a/hw/dma/meson.build b/hw/dma/meson.build
new file mode 100644
index 0000000..ff5bb37
--- /dev/null
+++ b/hw/dma/meson.build
@@ -0,0 +1,15 @@
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_dma.c'))
+softmmu_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
+softmmu_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
+softmmu_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
+softmmu_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c'))
+softmmu_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'))
+softmmu_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcfg.c'))
+softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
+softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 52577c3..96da0bb 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('dma')
subdir('gpio')
subdir('hyperv')
subdir('i2c')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 115/143] meson: convert hw/display
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (113 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 114/143] meson: convert hw/dma Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 116/143] meson: convert hw/cpu Paolo Bonzini
` (32 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 1 +
hw/Makefile.objs | 1 -
hw/display/Makefile.objs | 65 ---------------------------------
hw/display/meson.build | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/meson.build | 1 +
5 files changed, 96 insertions(+), 66 deletions(-)
delete mode 100644 hw/display/Makefile.objs
create mode 100644 hw/display/meson.build
diff --git a/Makefile.target b/Makefile.target
index 3d5a2af..3534ece 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -169,6 +169,7 @@ LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOM
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
+LIBS := $(LIBS) $(VIRGL_LIBS)
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 26917a4..6fce6a1 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -6,7 +6,6 @@ devices-dirs-y += audio/
devices-dirs-y += block/
devices-dirs-y += char/
devices-dirs-y += cpu/
-devices-dirs-y += display/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
deleted file mode 100644
index d619594..0000000
--- a/hw/display/Makefile.objs
+++ /dev/null
@@ -1,65 +0,0 @@
-common-obj-$(CONFIG_DDC) += i2c-ddc.o
-common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o
-
-common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
-common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
-
-common-obj-$(CONFIG_ADS7846) += ads7846.o
-common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
-common-obj-$(call land,$(CONFIG_VGA_CIRRUS),$(CONFIG_VGA_ISA))+=cirrus_vga_isa.o
-common-obj-$(CONFIG_G364FB) += g364fb.o
-common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
-common-obj-$(CONFIG_PL110) += pl110.o
-common-obj-$(CONFIG_SII9022) += sii9022.o
-common-obj-$(CONFIG_SSD0303) += ssd0303.o
-common-obj-$(CONFIG_SSD0323) += ssd0323.o
-common-obj-$(CONFIG_XEN) += xenfb.o
-
-common-obj-$(CONFIG_VGA_PCI) += vga-pci.o
-common-obj-$(CONFIG_VGA_ISA) += vga-isa.o
-common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
-common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
-common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o
-
-common-obj-$(CONFIG_BLIZZARD) += blizzard.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
-common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
-common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
-common-obj-$(CONFIG_MACFB) += macfb.o
-
-obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
-milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)
-milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS)
-
-common-obj-$(CONFIG_OMAP) += omap_dss.o
-obj-$(CONFIG_OMAP) += omap_lcdc.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o
-common-obj-$(CONFIG_RASPI) += bcm2835_fb.o
-common-obj-$(CONFIG_SM501) += sm501.o
-common-obj-$(CONFIG_TCX) += tcx.o
-common-obj-$(CONFIG_CG3) += cg3.o
-common-obj-$(CONFIG_NEXTCUBE) += next-fb.o
-common-obj-$(CONFIG_ARTIST) += artist.o
-
-obj-$(CONFIG_VGA) += vga.o
-
-ifeq ($(CONFIG_QXL),y)
-common-obj-m += qxl.mo
-qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o
-endif
-
-common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o
-common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o
-common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o
-common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o
-common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o
-common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o
-virtio-gpu.o-cflags := $(VIRGL_CFLAGS)
-virtio-gpu.o-libs += $(VIRGL_LIBS)
-virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS)
-virtio-gpu-3d.o-libs += $(VIRGL_LIBS)
-common-obj-$(CONFIG_DPCD) += dpcd.o
-common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o
-
-common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o
diff --git a/hw/display/meson.build b/hw/display/meson.build
new file mode 100644
index 0000000..efe18f2
--- /dev/null
+++ b/hw/display/meson.build
@@ -0,0 +1,94 @@
+hw_display_modules = []
+
+softmmu_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
+softmmu_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
+
+softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'))
+softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
+
+softmmu_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c'))
+softmmu_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))
+softmmu_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: files('cirrus_vga_isa.c'))
+softmmu_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c'))
+softmmu_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c'))
+softmmu_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c'))
+softmmu_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c'))
+softmmu_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c'))
+softmmu_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c'))
+softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xenfb.c'))
+
+softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
+softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
+softmmu_ss.add(when: 'CONFIG_VGA_ISA_MM', if_true: files('vga-isa-mm.c'))
+softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
+softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
+
+softmmu_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c'))
+softmmu_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c'))
+softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c'))
+
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c'))
+softmmu_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c'))
+softmmu_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c'))
+softmmu_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c'))
+softmmu_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c'))
+softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
+
+specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
+
+if config_all_devices.has_key('CONFIG_QXL')
+ hw_display_modules += [[ 'qxl',
+ files('qxl.c', 'qxl-logger.c', 'qxl-render.c'), [],
+ ['CONFIG_QXL']]]
+endif
+
+softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
+
+softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
+
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-vgafb.c'))
+softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
+
+softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
+
+if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
+ virtio_gpu_ss = ss.source_set()
+ virtio_gpu_ss.add(files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), virgl)
+ virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c'))
+ virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-gpu-pci.c'))
+ virtio_gpu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c'))
+ virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c'))
+ virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c'))
+
+ # FIXME: this was attempted in the Makefile build system; it was then reverted
+ # as it would try to load all devices when the module is loaded, even if
+ # config_devices for this target only has some of them. Since virtio-gpu-pci
+ # and virtio-vga both instantiate a virtio-gpu-device, fixing it probably does
+ # not even require a dependency system, just splitting the module in three
+ # for CONFIG_VIRTIO_GPU/CONFIG_VHOST_USER_GPU, CONFIG_VIRTIO_PCI and
+ # CONFIG_VIRTIO_VGA/CONFIG_VHOST_USER_VGA.
+ # Sourcesets are a dime a dozen, so keep it and just disable module builds.
+
+ #virtio_gpu = virtio_gpu_ss.apply(config_all_devices, strict: false)
+ #hw_display_modules += [[ 'virtio-gpu', virtio_gpu.sources(), [pixman, virgl],
+ # ['CONFIG_VIRTIO_GPU']]]
+
+ softmmu_ss.add_all(when: [pixman, virgl, 'CONFIG_VIRTIO_GPU'],
+ if_true: virtio_gpu_ss)
+endif
+
+specific_ss.add(when: [pixman, 'CONFIG_VIRTIO_GPU'], if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), virgl])
+specific_ss.add(when: [pixman, 'CONFIG_VHOST_USER_GPU'], if_true: files('vhost-user-gpu.c'))
+specific_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-gpu-pci.c'))
+specific_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c'))
+specific_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c'))
+specific_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c'))
+
+specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: files('milkymist-tmu2.c'))
+specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
+
+modules += { 'hw-display': hw_display_modules }
diff --git a/hw/meson.build b/hw/meson.build
index 96da0bb..dacd26c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('display')
subdir('dma')
subdir('gpio')
subdir('hyperv')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 116/143] meson: convert hw/cpu
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (114 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 115/143] meson: convert hw/display Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 117/143] meson: convert hw/char Paolo Bonzini
` (31 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/cpu/Makefile.objs | 5 -----
hw/cpu/meson.build | 6 ++++++
hw/meson.build | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
delete mode 100644 hw/cpu/Makefile.objs
create mode 100644 hw/cpu/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6fce6a1..97ad302 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -5,7 +5,6 @@ devices-dirs-y += adc/
devices-dirs-y += audio/
devices-dirs-y += block/
devices-dirs-y += char/
-devices-dirs-y += cpu/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
deleted file mode 100644
index 8db9e8a..0000000
--- a/hw/cpu/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
-obj-$(CONFIG_REALVIEW) += realview_mpcore.o
-obj-$(CONFIG_A9MPCORE) += a9mpcore.o
-obj-$(CONFIG_A15MPCORE) += a15mpcore.o
-common-obj-y += core.o cluster.o
diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
new file mode 100644
index 0000000..9e52fee
--- /dev/null
+++ b/hw/cpu/meson.build
@@ -0,0 +1,6 @@
+softmmu_ss.add(files('core.c', 'cluster.c'))
+
+specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
+specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
+specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c'))
+specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
diff --git a/hw/meson.build b/hw/meson.build
index dacd26c..103da48 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('cpu')
subdir('display')
subdir('dma')
subdir('gpio')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 117/143] meson: convert hw/char
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (115 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 116/143] meson: convert hw/cpu Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 118/143] meson: convert hw/block Paolo Bonzini
` (30 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/char/Makefile.objs | 39 ---------------------------------------
hw/char/meson.build | 38 ++++++++++++++++++++++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 39 insertions(+), 40 deletions(-)
delete mode 100644 hw/char/Makefile.objs
create mode 100644 hw/char/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 97ad302..04cfb6c 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -4,7 +4,6 @@ devices-dirs-y += acpi/
devices-dirs-y += adc/
devices-dirs-y += audio/
devices-dirs-y += block/
-devices-dirs-y += char/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
deleted file mode 100644
index bf177ac..0000000
--- a/hw/char/Makefile.objs
+++ /dev/null
@@ -1,39 +0,0 @@
-common-obj-$(CONFIG_IPACK) += ipoctal232.o
-common-obj-$(CONFIG_ESCC) += escc.o
-common-obj-$(CONFIG_NRF51_SOC) += nrf51_uart.o
-common-obj-$(CONFIG_PARALLEL) += parallel.o
-common-obj-$(CONFIG_ISA_BUS) += parallel-isa.o
-common-obj-$(CONFIG_PL011) += pl011.o
-common-obj-$(CONFIG_SERIAL) += serial.o
-common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o
-common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o
-common-obj-$(CONFIG_SERIAL_PCI_MULTI) += serial-pci-multi.o
-common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o
-common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
-common-obj-$(CONFIG_XEN) += xen_console.o
-common-obj-$(CONFIG_CADENCE) += cadence_uart.o
-common-obj-$(CONFIG_IBEX) += ibex_uart.o
-
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
-common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
-common-obj-$(CONFIG_OMAP) += omap_uart.o
-common-obj-$(CONFIG_SH4) += sh_serial.o
-common-obj-$(CONFIG_DIGIC) += digic-uart.o
-common-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
-common-obj-$(CONFIG_RASPI) += bcm2835_aux.o
-common-obj-$(CONFIG_RENESAS_SCI) += renesas_sci.o
-common-obj-$(CONFIG_AVR_USART) += avr_usart.o
-
-common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
-common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
-common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
-common-obj-$(CONFIG_GRLIB) += grlib_apbuart.o
-common-obj-$(CONFIG_IMX) += imx_serial.o
-common-obj-$(CONFIG_LM32) += lm32_juart.o
-common-obj-$(CONFIG_LM32) += lm32_uart.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o
-common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o
-
-obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
-obj-$(CONFIG_PSERIES) += spapr_vty.o
-obj-$(CONFIG_TERMINAL3270) += terminal3270.o
diff --git a/hw/char/meson.build b/hw/char/meson.build
new file mode 100644
index 0000000..e888215
--- /dev/null
+++ b/hw/char/meson.build
@@ -0,0 +1,38 @@
+softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c'))
+softmmu_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c'))
+softmmu_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c'))
+softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c'))
+softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c'))
+softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c'))
+softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
+softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c'))
+softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c'))
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'))
+softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
+softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
+softmmu_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c'))
+softmmu_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c', 'sclpconsole-lm.c'))
+softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
+softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
+softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
+softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
+softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
+softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_console.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
+
+softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
+softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
+softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c'))
+softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c'))
+softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c'))
+
+specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c'))
+specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c'))
+specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 103da48..dd0c77e 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('char')
subdir('core')
subdir('cpu')
subdir('display')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 118/143] meson: convert hw/block
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (116 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 117/143] meson: convert hw/char Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 119/143] meson: convert hw/audio Paolo Bonzini
` (29 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/block/Makefile.objs | 18 ------------------
hw/block/dataplane/Makefile.objs | 2 --
hw/block/dataplane/meson.build | 2 ++
hw/block/meson.build | 21 +++++++++++++++++++++
hw/meson.build | 1 +
6 files changed, 24 insertions(+), 21 deletions(-)
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/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 04cfb6c..9068859 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -3,7 +3,6 @@ devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFI
devices-dirs-y += acpi/
devices-dirs-y += adc/
devices-dirs-y += audio/
-devices-dirs-y += block/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
deleted file mode 100644
index 8855c22..0000000
--- a/hw/block/Makefile.objs
+++ /dev/null
@@ -1,18 +0,0 @@
-common-obj-y += block.o cdrom.o hd-geometry.o
-common-obj-$(CONFIG_FDC) += fdc.o
-common-obj-$(CONFIG_SSI_M25P80) += m25p80.o
-common-obj-$(CONFIG_NAND) += nand.o
-common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
-common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
-common-obj-$(CONFIG_XEN) += xen-block.o
-common-obj-$(CONFIG_ECC) += ecc.o
-common-obj-$(CONFIG_ONENAND) += onenand.o
-common-obj-$(CONFIG_SWIM) += swim.o
-
-common-obj-$(CONFIG_SH4) += tc58128.o
-
-obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
-obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
-common-obj-$(CONFIG_NVME_PCI) += nvme.o
-
-obj-y += dataplane/
diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs
deleted file mode 100644
index 0c52702..0000000
--- a/hw/block/dataplane/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
-obj-$(CONFIG_XEN) += xen-block.o
diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build
new file mode 100644
index 0000000..12c6a26
--- /dev/null
+++ b/hw/block/dataplane/meson.build
@@ -0,0 +1,2 @@
+specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
+specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
diff --git a/hw/block/meson.build b/hw/block/meson.build
new file mode 100644
index 0000000..78cad8f
--- /dev/null
+++ b/hw/block/meson.build
@@ -0,0 +1,21 @@
+softmmu_ss.add(files(
+ 'block.c',
+ 'cdrom.c',
+ 'hd-geometry.c'
+))
+softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
+softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
+softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
+softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
+softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
+softmmu_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
+softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
+softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
+softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
+softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c'))
+softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c'))
+
+specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
+specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
+
+subdir('dataplane')
diff --git a/hw/meson.build b/hw/meson.build
index dd0c77e..f968aa8 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('block')
subdir('char')
subdir('core')
subdir('cpu')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 119/143] meson: convert hw/audio
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (117 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 118/143] meson: convert hw/block Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 120/143] meson: convert hw/adc Paolo Bonzini
` (28 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/audio/Makefile.objs | 18 ------------------
hw/audio/meson.build | 14 ++++++++++++++
hw/meson.build | 1 +
4 files changed, 15 insertions(+), 19 deletions(-)
delete mode 100644 hw/audio/Makefile.objs
create mode 100644 hw/audio/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 9068859..c0cbc0f 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -2,7 +2,6 @@ ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
devices-dirs-y += acpi/
devices-dirs-y += adc/
-devices-dirs-y += audio/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs
deleted file mode 100644
index 63db383..0000000
--- a/hw/audio/Makefile.objs
+++ /dev/null
@@ -1,18 +0,0 @@
-# Sound
-common-obj-$(CONFIG_SB16) += sb16.o
-common-obj-$(CONFIG_ES1370) += es1370.o
-common-obj-$(CONFIG_AC97) += ac97.o
-common-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
-common-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
-common-obj-$(CONFIG_CS4231A) += cs4231a.o
-common-obj-$(CONFIG_HDA) += intel-hda.o hda-codec.o
-
-common-obj-$(CONFIG_PCSPK) += pcspk.o
-common-obj-$(CONFIG_WM8750) += wm8750.o
-common-obj-$(CONFIG_PL041) += pl041.o lm4549.o
-
-common-obj-$(CONFIG_CS4231) += cs4231.o
-common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o
-
-common-obj-y += soundhw.o
diff --git a/hw/audio/meson.build b/hw/audio/meson.build
new file mode 100644
index 0000000..549e9a0
--- /dev/null
+++ b/hw/audio/meson.build
@@ -0,0 +1,14 @@
+softmmu_ss.add(files('soundhw.c'))
+softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c'))
+softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c'))
+softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c'))
+softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c'))
+softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c'))
+softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c'))
+softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c'))
+softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.c'))
+softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-ac97.c'))
+softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c'))
+softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c'))
+softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c'))
+softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
diff --git a/hw/meson.build b/hw/meson.build
index f968aa8..624335b 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('audio')
subdir('block')
subdir('char')
subdir('core')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 120/143] meson: convert hw/adc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (118 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 119/143] meson: convert hw/audio Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 121/143] meson: convert hw/acpi Paolo Bonzini
` (27 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/adc/Makefile.objs | 1 -
hw/adc/meson.build | 1 +
hw/meson.build | 1 +
4 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 hw/adc/Makefile.objs
create mode 100644 hw/adc/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index c0cbc0f..4bdb674 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,7 +1,6 @@
ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
devices-dirs-y += acpi/
-devices-dirs-y += adc/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs
deleted file mode 100644
index 2b9dc36..0000000
--- a/hw/adc/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
new file mode 100644
index 0000000..0d62ae9
--- /dev/null
+++ b/hw/adc/meson.build
@@ -0,0 +1 @@
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 624335b..ffa3f06 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('adc')
subdir('audio')
subdir('block')
subdir('char')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 121/143] meson: convert hw/acpi
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (119 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 120/143] meson: convert hw/adc Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 122/143] meson: convert hw/9pfs, cleanup Paolo Bonzini
` (26 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/acpi/Makefile.objs | 26 --------------------------
hw/acpi/meson.build | 25 +++++++++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 26 insertions(+), 27 deletions(-)
delete mode 100644 hw/acpi/Makefile.objs
create mode 100644 hw/acpi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 4bdb674..ebae00a 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
-devices-dirs-y += acpi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
deleted file mode 100644
index 72886c7..0000000
--- a/hw/acpi/Makefile.objs
+++ /dev/null
@@ -1,26 +0,0 @@
-ifeq ($(CONFIG_ACPI),y)
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
-common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
-common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
-common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
-common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
-common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
-common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
-common-obj-$(CONFIG_ACPI_HMAT) += hmat.o
-common-obj-$(CONFIG_ACPI_APEI) += ghes.o
-common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
-common-obj-$(call lnot,$(CONFIG_PC)) += acpi-x86-stub.o
-
-common-obj-y += acpi_interface.o
-common-obj-y += bios-linker-loader.o
-common-obj-y += aml-build.o utils.o
-common-obj-$(CONFIG_ACPI_PCI) += pci.o
-common-obj-$(CONFIG_TPM) += tpm.o
-
-common-obj-$(CONFIG_IPMI) += ipmi.o
-common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o
-else
-common-obj-y += acpi-stub.o aml-build-stub.o
-endif
-common-obj-$(CONFIG_ALL) += acpi-stub.o aml-build-stub.o acpi-x86-stub.o ipmi-stub.o
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
new file mode 100644
index 0000000..dd69577
--- /dev/null
+++ b/hw/acpi/meson.build
@@ -0,0 +1,25 @@
+acpi_ss = ss.source_set()
+acpi_ss.add(files(
+ 'acpi_interface.c',
+ 'aml-build.c',
+ 'bios-linker-loader.c',
+ 'utils.c',
+))
+acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true: files('memory_hotplug.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
+acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
+acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
+acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
+softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c'))
+softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
+ 'acpi-x86-stub.c', 'ipmi-stub.c'))
diff --git a/hw/meson.build b/hw/meson.build
index ffa3f06..55ca2b2 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('acpi')
subdir('adc')
subdir('audio')
subdir('block')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 122/143] meson: convert hw/9pfs, cleanup
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (120 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 121/143] meson: convert hw/acpi Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 123/143] meson: convert hw/arch* Paolo Bonzini
` (25 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
hw/Makefile.objs is gone so there is more code that can be removed.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 4 ----
Makefile.objs | 8 --------
Makefile.target | 15 ---------------
hw/9pfs/Kconfig | 4 ++++
hw/9pfs/Makefile.objs | 9 ---------
hw/9pfs/meson.build | 20 ++++++++++++++++++++
hw/Makefile.objs | 8 --------
hw/meson.build | 1 +
8 files changed, 25 insertions(+), 44 deletions(-)
delete mode 100644 hw/9pfs/Makefile.objs
create mode 100644 hw/9pfs/meson.build
delete mode 100644 hw/Makefile.objs
diff --git a/Makefile b/Makefile
index d9d6b59..2aaa3f8 100644
--- a/Makefile
+++ b/Makefile
@@ -163,10 +163,6 @@ ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/Makefile.objs
endif
-dummy := $(call unnest-vars,, \
- common-obj-y \
- common-obj-m)
-
include $(SRC_PATH)/tests/Makefile.include
all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules
diff --git a/Makefile.objs b/Makefile.objs
index 965f64c..7eaf047 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -60,18 +60,10 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF)
-common-obj-y += hw/
-common-obj-m += hw/
-
common-obj-y += libqmp.fa
endif # CONFIG_SOFTMMU
-#######################################################################
-# Target-independent parts used in system and user emulation
-
-common-obj-y += hw/
-
######################################################################
# Resource file for Windows executables
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
diff --git a/Makefile.target b/Makefile.target
index 3534ece..c95e0de 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -156,7 +156,6 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
-obj-y += hw/
LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
@@ -185,20 +184,6 @@ endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y)
all-obj-y := $(obj-y)
-#
-# common-obj-m has some crap here, probably as side effect from
-# unnest-vars recursing into target directories to fill obj-y and not
-# properly handling the -m case.
-#
-# Clear common-obj-m as workaround. Fixes suspious dependency errors
-# when building devices as modules. A bit hackish, but should be ok
-# as long as we do not have any target-specific modules.
-#
-# The meson-based build system currently in development doesn't need
-# unnest-vars and will obsolete this workaround.
-#
-common-obj-m :=
-
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
authz-obj-y \
diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
index 3ae5749..d3ebd73 100644
--- a/hw/9pfs/Kconfig
+++ b/hw/9pfs/Kconfig
@@ -2,8 +2,12 @@ config FSDEV_9P
bool
depends on VIRTFS
+config 9PFS
+ bool
+
config VIRTIO_9P
bool
default y
depends on VIRTFS && VIRTIO
select FSDEV_9P
+ select 9PFS
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
deleted file mode 100644
index 70ded6f..0000000
--- a/hw/9pfs/Makefile.objs
+++ /dev/null
@@ -1,9 +0,0 @@
-common-obj-y = 9p.o 9p-util.o
-common-obj-y += 9p-local.o 9p-xattr.o
-common-obj-y += 9p-xattr-user.o 9p-posix-acl.o
-common-obj-y += coth.o cofs.o codir.o cofile.o
-common-obj-y += coxattr.o 9p-synth.o
-common-obj-y += 9p-proxy.o
-
-common-obj-$(CONFIG_XEN) += xen-9p-backend.o
-obj-$(CONFIG_VIRTIO_9P) += virtio-9p-device.o
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
new file mode 100644
index 0000000..cc09426
--- /dev/null
+++ b/hw/9pfs/meson.build
@@ -0,0 +1,20 @@
+fs_ss = ss.source_set()
+fs_ss.add(files(
+ '9p-local.c',
+ '9p-posix-acl.c',
+ '9p-proxy.c',
+ '9p-synth.c',
+ '9p-util.c',
+ '9p-xattr-user.c',
+ '9p-xattr.c',
+ '9p.c',
+ 'codir.c',
+ 'cofile.c',
+ 'cofs.c',
+ 'coth.c',
+ 'coxattr.c',
+))
+fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
+softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss)
+
+specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
deleted file mode 100644
index ebae00a..0000000
--- a/hw/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-ifeq ($(CONFIG_SOFTMMU), y)
-devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
-endif
-
-common-obj-y += $(devices-dirs-y)
-common-obj-m += display/
-common-obj-m += usb/
-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 55ca2b2..ba8763c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('9pfs')
subdir('acpi')
subdir('adc')
subdir('audio')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 123/143] meson: convert hw/arch*
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (121 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 122/143] meson: convert hw/9pfs, cleanup Paolo Bonzini
@ 2020-08-06 19:15 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 124/143] meson: target Paolo Bonzini
` (24 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 7 ----
hw/alpha/Makefile.objs | 1 -
hw/alpha/meson.build | 8 +++++
hw/arm/Makefile.objs | 56 -------------------------------
hw/arm/meson.build | 59 +++++++++++++++++++++++++++++++++
hw/avr/Makefile.objs | 3 --
hw/avr/meson.build | 6 ++++
hw/cris/Makefile.objs | 2 --
hw/cris/meson.build | 5 +++
hw/hppa/Makefile.objs | 1 -
hw/hppa/meson.build | 4 +++
hw/i386/Makefile.objs | 20 ------------
hw/i386/kvm/Makefile.objs | 5 ---
hw/i386/kvm/meson.build | 8 +++++
hw/i386/meson.build | 32 ++++++++++++++++++
hw/i386/xen/Makefile.objs | 1 -
hw/i386/xen/meson.build | 7 ++++
hw/lm32/Makefile.objs | 3 --
hw/lm32/meson.build | 6 ++++
hw/m68k/Makefile.objs | 4 ---
hw/m68k/meson.build | 7 ++++
hw/meson.build | 25 ++++++++++++++
hw/microblaze/Makefile.objs | 4 ---
hw/microblaze/meson.build | 7 ++++
hw/mips/Makefile.objs | 8 -----
hw/mips/meson.build | 11 +++++++
hw/moxie/Makefile.objs | 2 --
hw/moxie/meson.build | 4 +++
hw/nios2/Makefile.objs | 3 --
hw/nios2/meson.build | 6 ++++
hw/openrisc/Makefile.objs | 2 --
hw/openrisc/meson.build | 5 +++
hw/ppc/Makefile.objs | 35 --------------------
hw/ppc/meson.build | 80 +++++++++++++++++++++++++++++++++++++++++++++
hw/riscv/Makefile.objs | 16 ---------
hw/riscv/meson.build | 19 +++++++++++
hw/rx/Makefile.objs | 2 --
hw/rx/meson.build | 5 +++
hw/s390x/Makefile.objs | 37 ---------------------
hw/s390x/meson.build | 46 ++++++++++++++++++++++++++
hw/sh4/Makefile.objs | 4 ---
hw/sh4/meson.build | 10 ++++++
hw/sparc/Makefile.objs | 3 --
hw/sparc/meson.build | 6 ++++
hw/sparc64/Makefile.objs | 4 ---
hw/sparc64/meson.build | 6 ++++
hw/tricore/Makefile.objs | 1 -
hw/tricore/meson.build | 4 +++
hw/unicore32/Makefile.objs | 4 ---
hw/unicore32/meson.build | 5 +++
hw/xenpv/Makefile.objs | 2 --
hw/xenpv/meson.build | 3 ++
hw/xtensa/Makefile.objs | 6 ----
hw/xtensa/meson.build | 11 +++++++
meson.build | 4 +++
55 files changed, 399 insertions(+), 236 deletions(-)
delete mode 100644 hw/alpha/Makefile.objs
create mode 100644 hw/alpha/meson.build
delete mode 100644 hw/arm/Makefile.objs
create mode 100644 hw/arm/meson.build
delete mode 100644 hw/avr/Makefile.objs
create mode 100644 hw/avr/meson.build
delete mode 100644 hw/cris/Makefile.objs
create mode 100644 hw/cris/meson.build
delete mode 100644 hw/hppa/Makefile.objs
create mode 100644 hw/hppa/meson.build
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
delete mode 100644 hw/i386/xen/Makefile.objs
create mode 100644 hw/i386/xen/meson.build
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/microblaze/Makefile.objs
create mode 100644 hw/microblaze/meson.build
delete mode 100644 hw/mips/Makefile.objs
create mode 100644 hw/mips/meson.build
delete mode 100644 hw/moxie/Makefile.objs
create mode 100644 hw/moxie/meson.build
delete mode 100644 hw/nios2/Makefile.objs
create mode 100644 hw/nios2/meson.build
delete mode 100644 hw/openrisc/Makefile.objs
create mode 100644 hw/openrisc/meson.build
delete mode 100644 hw/ppc/Makefile.objs
create mode 100644 hw/ppc/meson.build
delete mode 100644 hw/riscv/Makefile.objs
create mode 100644 hw/riscv/meson.build
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
delete mode 100644 hw/sh4/Makefile.objs
create mode 100644 hw/sh4/meson.build
delete mode 100644 hw/sparc/Makefile.objs
create mode 100644 hw/sparc/meson.build
delete mode 100644 hw/sparc64/Makefile.objs
create mode 100644 hw/sparc64/meson.build
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/xenpv/Makefile.objs
create mode 100644 hw/xenpv/meson.build
delete mode 100644 hw/xtensa/Makefile.objs
create mode 100644 hw/xtensa/meson.build
diff --git a/Makefile.target b/Makefile.target
index c95e0de..28cefba 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -170,13 +170,6 @@ LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
LIBS := $(LIBS) $(VIRGL_LIBS)
-# Hardware support
-ifeq ($(TARGET_NAME), sparc64)
-obj-y += hw/sparc64/
-else
-obj-y += hw/$(TARGET_BASE_ARCH)/
-endif
-
generated-files-y += hmp-commands.h hmp-commands-info.h
endif # CONFIG_SOFTMMU
diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
deleted file mode 100644
index 62fdf3e..0000000
--- a/hw/alpha/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_DP264) += dp264.o pci.o typhoon.o
diff --git a/hw/alpha/meson.build b/hw/alpha/meson.build
new file mode 100644
index 0000000..81ca215
--- /dev/null
+++ b/hw/alpha/meson.build
@@ -0,0 +1,8 @@
+alpha_ss = ss.source_set()
+alpha_ss.add(when: 'CONFIG_DP264', if_true: files(
+ 'dp264.c',
+ 'pci.c',
+ 'typhoon.c',
+))
+
+hw_arch += {'alpha': alpha_ss}
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
deleted file mode 100644
index 534a6a1..0000000
--- a/hw/arm/Makefile.objs
+++ /dev/null
@@ -1,56 +0,0 @@
-obj-y += boot.o
-obj-$(CONFIG_PLATFORM_BUS) += sysbus-fdt.o
-obj-$(CONFIG_ARM_VIRT) += virt.o
-obj-$(CONFIG_ACPI) += virt-acpi-build.o
-obj-$(CONFIG_DIGIC) += digic_boards.o
-obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
-obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o
-obj-$(CONFIG_HIGHBANK) += highbank.o
-obj-$(CONFIG_INTEGRATOR) += integratorcp.o
-obj-$(CONFIG_MAINSTONE) += mainstone.o
-obj-$(CONFIG_MICROBIT) += microbit.o
-obj-$(CONFIG_MUSICPAL) += musicpal.o
-obj-$(CONFIG_NETDUINO2) += netduino2.o
-obj-$(CONFIG_NETDUINOPLUS2) += netduinoplus2.o
-obj-$(CONFIG_NSERIES) += nseries.o
-obj-$(CONFIG_SX1) += omap_sx1.o
-obj-$(CONFIG_CHEETAH) += palm.o
-obj-$(CONFIG_GUMSTIX) += gumstix.o
-obj-$(CONFIG_SPITZ) += spitz.o
-obj-$(CONFIG_TOSA) += tosa.o
-obj-$(CONFIG_Z2) += z2.o
-obj-$(CONFIG_REALVIEW) += realview.o
-obj-$(CONFIG_SBSA_REF) += sbsa-ref.o
-obj-$(CONFIG_STELLARIS) += stellaris.o
-obj-$(CONFIG_COLLIE) += collie.o
-obj-$(CONFIG_VERSATILE) += versatilepb.o
-obj-$(CONFIG_VEXPRESS) += vexpress.o
-obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
-obj-$(CONFIG_SABRELITE) += sabrelite.o
-
-obj-$(CONFIG_ARM_V7M) += armv7m.o
-obj-$(CONFIG_EXYNOS4) += exynos4210.o
-obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
-obj-$(CONFIG_DIGIC) += digic.o
-obj-$(CONFIG_OMAP) += omap1.o omap2.o
-obj-$(CONFIG_STRONGARM) += strongarm.o
-obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3.o orangepi.o
-obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
-obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
-obj-$(CONFIG_STM32F405_SOC) += stm32f405_soc.o
-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o
-obj-$(CONFIG_XLNX_VERSAL) += xlnx-versal.o xlnx-versal-virt.o
-obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
-obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
-obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o
-obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o aspeed_ast2600.o
-obj-$(CONFIG_MPS2) += mps2.o
-obj-$(CONFIG_MPS2) += mps2-tz.o
-obj-$(CONFIG_MSF2) += msf2-soc.o
-obj-$(CONFIG_MUSCA) += musca.o
-obj-$(CONFIG_ARMSSE) += armsse.o
-obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
-obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
-obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o
-obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
new file mode 100644
index 0000000..1ae5e17
--- /dev/null
+++ b/hw/arm/meson.build
@@ -0,0 +1,59 @@
+arm_ss = ss.source_set()
+arm_ss.add(files('boot.c'))
+arm_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
+arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c'))
+arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c'))
+arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c'))
+arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
+arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c'))
+arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c'))
+arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c'))
+arm_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mainstone.c'))
+arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c'))
+arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c'))
+arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c'))
+arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c'))
+arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c'))
+arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c'))
+arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c'))
+arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c'))
+arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c'))
+arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
+arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c'))
+arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c'))
+arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c'))
+arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c'))
+arm_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c'))
+arm_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c'))
+arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))
+arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c'))
+arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c'))
+
+arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
+arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c'))
+arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c', 'pxa2xx_pic.c'))
+arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
+arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c'))
+arm_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c'))
+arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c'))
+arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c'))
+arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c', 'bcm2836.c', 'raspi.c'))
+arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c'))
+arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c'))
+arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c'))
+arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c'))
+arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c'))
+arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c'))
+arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c'))
+arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_soc.c', 'aspeed.c', 'aspeed_ast2600.c'))
+arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c'))
+arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c'))
+arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c'))
+arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c'))
+arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c'))
+arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c'))
+arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c'))
+arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c'))
+arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
+
+hw_arch += {'arm': arm_ss}
diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs
deleted file mode 100644
index 4dca064..0000000
--- a/hw/avr/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += boot.o
-obj-$(CONFIG_AVR_ATMEGA_MCU) += atmega.o
-obj-$(CONFIG_ARDUINO) += arduino.o
diff --git a/hw/avr/meson.build b/hw/avr/meson.build
new file mode 100644
index 0000000..46d53fb
--- /dev/null
+++ b/hw/avr/meson.build
@@ -0,0 +1,6 @@
+avr_ss = ss.source_set()
+avr_ss.add(files('boot.c'))
+avr_ss.add(when: 'CONFIG_AVR_ATMEGA_MCU', if_true: files('atmega.c'))
+avr_ss.add(when: 'CONFIG_ARDUINO', if_true: files('arduino.c'))
+
+hw_arch += {'avr': avr_ss}
diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs
deleted file mode 100644
index a4a27b3..0000000
--- a/hw/cris/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += boot.o
-obj-$(CONFIG_AXIS) += axis_dev88.o
diff --git a/hw/cris/meson.build b/hw/cris/meson.build
new file mode 100644
index 0000000..dc808a4
--- /dev/null
+++ b/hw/cris/meson.build
@@ -0,0 +1,5 @@
+cris_ss = ss.source_set()
+cris_ss.add(files('boot.c'))
+cris_ss.add(when: 'CONFIG_AXIS', if_true: files('axis_dev88.c'))
+
+hw_arch += {'cris': cris_ss}
diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs
deleted file mode 100644
index eac3467..0000000
--- a/hw/hppa/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_DINO) += pci.o machine.o dino.o lasi.o
diff --git a/hw/hppa/meson.build b/hw/hppa/meson.build
new file mode 100644
index 0000000..1deae83
--- /dev/null
+++ b/hw/hppa/meson.build
@@ -0,0 +1,4 @@
+hppa_ss = ss.source_set()
+hppa_ss.add(when: 'CONFIG_DINO', if_true: files('pci.c', 'machine.c', 'dino.c', 'lasi.c'))
+
+hw_arch += {'hppa': hppa_ss}
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
deleted file mode 100644
index 6abc745..0000000
--- a/hw/i386/Makefile.objs
+++ /dev/null
@@ -1,20 +0,0 @@
-obj-$(CONFIG_KVM) += kvm/
-obj-y += e820_memory_layout.o multiboot.o
-obj-y += x86.o
-obj-$(CONFIG_PC) += pc.o pc_sysfw.o
-obj-$(CONFIG_I440FX) += pc_piix.o
-obj-$(CONFIG_Q35) += pc_q35.o
-obj-$(CONFIG_MICROVM) += microvm.o
-obj-y += fw_cfg.o
-obj-$(CONFIG_X86_IOMMU) += x86-iommu.o
-obj-$(call lnot,$(CONFIG_X86_IOMMU)) += x86-iommu-stub.o
-obj-$(CONFIG_VTD) += intel_iommu.o
-obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o
-obj-$(CONFIG_XEN) += ../xenpv/ xen/
-obj-$(CONFIG_VMPORT) += vmport.o
-obj-$(CONFIG_VMMOUSE) += vmmouse.o
-obj-$(CONFIG_PC) += port92.o
-
-obj-y += kvmvapic.o
-obj-$(CONFIG_ACPI) += acpi-common.o
-obj-$(CONFIG_PC) += acpi-build.o
diff --git a/hw/i386/kvm/Makefile.objs b/hw/i386/kvm/Makefile.objs
deleted file mode 100644
index 0c8d5f2..0000000
--- a/hw/i386/kvm/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y += clock.o
-obj-$(CONFIG_APIC) += apic.o
-obj-$(CONFIG_IOAPIC) += ioapic.o
-obj-$(CONFIG_I8254) += i8254.o
-obj-$(CONFIG_I8259) += i8259.o
diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
new file mode 100644
index 0000000..95467f1
--- /dev/null
+++ b/hw/i386/kvm/meson.build
@@ -0,0 +1,8 @@
+i386_kvm_ss = ss.source_set()
+i386_kvm_ss.add(files('clock.c'))
+i386_kvm_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c'))
+i386_kvm_ss.add(when: 'CONFIG_I8254', if_true: files('i8254.c'))
+i386_kvm_ss.add(when: 'CONFIG_I8259', if_true: files('i8259.c'))
+i386_kvm_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c'))
+
+i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss)
diff --git a/hw/i386/meson.build b/hw/i386/meson.build
new file mode 100644
index 0000000..63918fb
--- /dev/null
+++ b/hw/i386/meson.build
@@ -0,0 +1,32 @@
+i386_ss = ss.source_set()
+i386_ss.add(files(
+ 'fw_cfg.c',
+ 'kvmvapic.c',
+ 'e820_memory_layout.c',
+ 'multiboot.c',
+ 'x86.c',
+))
+
+i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'),
+ if_false: files('x86-iommu-stub.c'))
+i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'))
+i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c'))
+i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('microvm.c'))
+i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c'))
+i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c'))
+i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c'))
+i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c'))
+
+i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c'))
+i386_ss.add(when: 'CONFIG_PC', if_true: files(
+ 'pc.c',
+ 'pc_sysfw.c',
+ 'acpi-build.c',
+ 'port92.c'))
+
+subdir('kvm')
+subdir('xen')
+
+i386_ss.add_all(xenpv_ss)
+
+hw_arch += {'i386': i386_ss}
diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs
deleted file mode 100644
index be9d10c..0000000
--- a/hw/i386/xen/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o xen-mapcache.o
diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build
new file mode 100644
index 0000000..be84130
--- /dev/null
+++ b/hw/i386/xen/meson.build
@@ -0,0 +1,7 @@
+i386_ss.add(when: 'CONFIG_XEN', if_true: files(
+ 'xen-hvm.c',
+ 'xen-mapcache.c',
+ 'xen_apic.c',
+ 'xen_platform.c',
+ 'xen_pvdevice.c',
+))
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
deleted file mode 100644
index c394186..0000000
--- a/hw/lm32/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-# LM32 boards
-obj-$(CONFIG_LM32) += lm32_boards.o
-obj-$(CONFIG_MILKYMIST) += milkymist.o
diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build
new file mode 100644
index 0000000..8caf0a7
--- /dev/null
+++ b/hw/lm32/meson.build
@@ -0,0 +1,6 @@
+lm32_ss = ss.source_set()
+# LM32 boards
+lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c'))
+lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c'))
+
+hw_arch += {'lm32': lm32_ss}
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
deleted file mode 100644
index b2c9e5a..0000000
--- a/hw/m68k/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_AN5206) += an5206.o mcf5206.o
-obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o
-obj-$(CONFIG_NEXTCUBE) += next-kbd.o next-cube.o
-obj-$(CONFIG_Q800) += q800.o
diff --git a/hw/m68k/meson.build b/hw/m68k/meson.build
new file mode 100644
index 0000000..ca0044c6
--- /dev/null
+++ b/hw/m68k/meson.build
@@ -0,0 +1,7 @@
+m68k_ss = ss.source_set()
+m68k_ss.add(when: 'CONFIG_AN5206', if_true: files('an5206.c', 'mcf5206.c'))
+m68k_ss.add(when: 'CONFIG_MCF5208', if_true: files('mcf5208.c', 'mcf_intc.c'))
+m68k_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-kbd.c', 'next-cube.c'))
+m68k_ss.add(when: 'CONFIG_Q800', if_true: files('q800.c'))
+
+hw_arch += {'m68k': m68k_ss}
diff --git a/hw/meson.build b/hw/meson.build
index ba8763c..010de72 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -40,3 +40,28 @@ subdir('vfio')
subdir('virtio')
subdir('watchdog')
subdir('xen')
+subdir('xenpv')
+
+subdir('alpha')
+subdir('arm')
+subdir('avr')
+subdir('cris')
+subdir('hppa')
+subdir('i386')
+subdir('lm32')
+subdir('m68k')
+subdir('microblaze')
+subdir('mips')
+subdir('moxie')
+subdir('nios2')
+subdir('openrisc')
+subdir('ppc')
+subdir('riscv')
+subdir('rx')
+subdir('s390x')
+subdir('sh4')
+subdir('sparc')
+subdir('sparc64')
+subdir('tricore')
+subdir('unicore32')
+subdir('xtensa')
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
deleted file mode 100644
index 8595a62..0000000
--- a/hw/microblaze/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o
-obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o
-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-zynqmp-pmu.o
-obj-y += boot.o
diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build
new file mode 100644
index 0000000..bb9e4eb
--- /dev/null
+++ b/hw/microblaze/meson.build
@@ -0,0 +1,7 @@
+microblaze_ss = ss.source_set()
+microblaze_ss.add(files('boot.c'))
+microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true: files('petalogix_s3adsp1800_mmu.c'))
+microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true: files('petalogix_ml605_mmu.c'))
+microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-zynqmp-pmu.c'))
+
+hw_arch += {'microblaze': microblaze_ss}
diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
deleted file mode 100644
index 739e2b7..0000000
--- a/hw/mips/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-obj-y += addr.o mips_int.o
-obj-$(CONFIG_R4K) += r4k.o
-obj-$(CONFIG_MALTA) += gt64xxx_pci.o malta.o
-obj-$(CONFIG_MIPSSIM) += mipssim.o
-obj-$(CONFIG_JAZZ) += jazz.o
-obj-$(CONFIG_FULOONG) += fuloong2e.o
-obj-$(CONFIG_MIPS_CPS) += cps.o
-obj-$(CONFIG_MIPS_BOSTON) += boston.o
diff --git a/hw/mips/meson.build b/hw/mips/meson.build
new file mode 100644
index 0000000..6ac9dc4
--- /dev/null
+++ b/hw/mips/meson.build
@@ -0,0 +1,11 @@
+mips_ss = ss.source_set()
+mips_ss.add(files('addr.c', 'mips_int.c'))
+mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
+mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
+mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c'))
+mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
+mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: files('boston.c'))
+mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
+mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c'))
+
+hw_arch += {'mips': mips_ss}
diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs
deleted file mode 100644
index ddbf300..0000000
--- a/hw/moxie/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-# moxie boards
-obj-$(CONFIG_MOXIESIM) += moxiesim.o
diff --git a/hw/moxie/meson.build b/hw/moxie/meson.build
new file mode 100644
index 0000000..05a7c2e
--- /dev/null
+++ b/hw/moxie/meson.build
@@ -0,0 +1,4 @@
+moxie_ss = ss.source_set()
+moxie_ss.add(when: 'CONFIG_MOXIESIM', if_true: files('moxiesim.c'))
+
+hw_arch += {'moxie': moxie_ss}
diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
deleted file mode 100644
index 3e01798..0000000
--- a/hw/nios2/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y = boot.o cpu_pic.o
-obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o
-obj-$(CONFIG_NIOS2_GENERIC_NOMMU) += generic_nommu.o
diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build
new file mode 100644
index 0000000..dd66ebb
--- /dev/null
+++ b/hw/nios2/meson.build
@@ -0,0 +1,6 @@
+nios2_ss = ss.source_set()
+nios2_ss.add(files('boot.c', 'cpu_pic.c'))
+nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c'))
+nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true: files('generic_nommu.c'))
+
+hw_arch += {'nios2': nios2_ss}
diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs
deleted file mode 100644
index aa04de7..0000000
--- a/hw/openrisc/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y = pic_cpu.o cputimer.o
-obj-$(CONFIG_OR1K_SIM) += openrisc_sim.o
diff --git a/hw/openrisc/meson.build b/hw/openrisc/meson.build
new file mode 100644
index 0000000..57c4255
--- /dev/null
+++ b/hw/openrisc/meson.build
@@ -0,0 +1,5 @@
+openrisc_ss = ss.source_set()
+openrisc_ss.add(files('pic_cpu.c', 'cputimer.c'))
+openrisc_ss.add(when: 'CONFIG_OR1K_SIM', if_true: files('openrisc_sim.c'))
+
+hw_arch += {'openrisc': openrisc_ss}
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
deleted file mode 100644
index c3d3cc5..0000000
--- a/hw/ppc/Makefile.objs
+++ /dev/null
@@ -1,35 +0,0 @@
-# shared objects
-obj-y += ppc.o ppc_booke.o
-obj-$(CONFIG_FDT_PPC) += fdt.o
-obj-$(CONFIG_FW_CFG_PPC) += fw_cfg.o
-# IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o
-obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
-obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o
-obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o
-obj-$(CONFIG_PSERIES) += spapr_tpm_proxy.o spapr_nvdimm.o
-obj-$(CONFIG_SPAPR_RNG) += spapr_rng.o
-obj-$(call land,$(CONFIG_PSERIES),$(CONFIG_LINUX)) += spapr_pci_vfio.o spapr_pci_nvlink2.o
-# IBM PowerNV
-obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o
-obj-$(CONFIG_POWERNV) += pnv_homer.o pnv_pnor.o
-
-obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
-# PowerPC 4xx boards
-obj-$(CONFIG_PPC405) += ppc405_boards.o ppc405_uc.o
-obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
-obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc4xx_devs.o
-obj-$(CONFIG_SAM460EX) += sam460ex.o
-# PReP
-obj-$(CONFIG_PREP) += prep.o
-obj-$(CONFIG_PREP) += prep_systemio.o
-obj-${CONFIG_RS6000_MC} += rs6000_mc.o
-# OldWorld PowerMac
-obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o
-# NewWorld PowerMac
-obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o
-# e500
-obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
-obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
-# PowerPC 440 Xilinx ML507 reference board.
-obj-$(CONFIG_VIRTEX) += virtex_ml507.o
diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build
new file mode 100644
index 0000000..918969b
--- /dev/null
+++ b/hw/ppc/meson.build
@@ -0,0 +1,80 @@
+ppc_ss = ss.source_set()
+ppc_ss.add(files(
+ 'ppc.c',
+ 'ppc_booke.c',
+))
+ppc_ss.add(when: 'CONFIG_FDT_PPC', if_true: [files(
+ 'fdt.c',
+), fdt])
+ppc_ss.add(when: 'CONFIG_FW_CFG_PPC', if_true: files('fw_cfg.c'))
+
+# IBM pSeries (sPAPR)
+ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files(
+ 'spapr.c',
+ 'spapr_caps.c',
+ 'spapr_vio.c',
+ 'spapr_events.c',
+ 'spapr_hcall.c',
+ 'spapr_iommu.c',
+ 'spapr_rtas.c',
+ 'spapr_pci.c',
+ 'spapr_rtc.c',
+ 'spapr_drc.c',
+ 'spapr_cpu_core.c',
+ 'spapr_ovec.c',
+ 'spapr_irq.c',
+ 'spapr_tpm_proxy.c',
+ 'spapr_nvdimm.c',
+ 'spapr_rtas_ddw.c'
+))
+ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c'))
+ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files(
+ 'spapr_pci_vfio.c',
+ 'spapr_pci_nvlink2.c'
+))
+
+# IBM PowerNV
+ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files(
+ 'pnv.c',
+ 'pnv_xscom.c',
+ 'pnv_core.c',
+ 'pnv_lpc.c',
+ 'pnv_psi.c',
+ 'pnv_occ.c',
+ 'pnv_bmc.c',
+ 'pnv_homer.c',
+ 'pnv_pnor.c',
+))
+# PowerPC 4xx boards
+ppc_ss.add(when: 'CONFIG_PPC405', if_true: files(
+ 'ppc405_boards.c',
+ 'ppc405_uc.c'))
+ppc_ss.add(when: 'CONFIG_PPC440', if_true: files(
+ 'ppc440_bamboo.c',
+ 'ppc440_pcix.c', 'ppc440_uc.c'))
+ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files(
+ 'ppc4xx_pci.c',
+ 'ppc4xx_devs.c'))
+ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c'))
+# PReP
+ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c'))
+ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep_systemio.c'))
+ppc_ss.add(when: 'CONFIG_RS6000_MC', if_true: files('rs6000_mc.c'))
+# OldWorld PowerMac
+ppc_ss.add(when: 'CONFIG_MAC_OLDWORLD', if_true: files('mac_oldworld.c'))
+# NewWorld PowerMac
+ppc_ss.add(when: 'CONFIG_MAC_NEWWORLD', if_true: files('mac_newworld.c'))
+# e500
+ppc_ss.add(when: 'CONFIG_E500', if_true: files(
+ 'e500.c',
+ 'mpc8544ds.c',
+ 'e500plat.c'
+))
+ppc_ss.add(when: 'CONFIG_E500', if_true: files(
+ 'mpc8544_guts.c',
+ 'ppce500_spin.c'
+))
+# PowerPC 440 Xilinx ML507 reference board.
+ppc_ss.add(when: 'CONFIG_VIRTEX', if_true: files('virtex_ml507.c'))
+
+hw_arch += {'ppc': ppc_ss}
diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs
deleted file mode 100644
index 57cc708..0000000
--- a/hw/riscv/Makefile.objs
+++ /dev/null
@@ -1,16 +0,0 @@
-obj-y += boot.o
-obj-$(CONFIG_SPIKE) += riscv_htif.o
-obj-$(CONFIG_HART) += riscv_hart.o
-obj-$(CONFIG_OPENTITAN) += opentitan.o
-obj-$(CONFIG_SIFIVE_E) += sifive_e.o
-obj-$(CONFIG_SIFIVE_E) += sifive_e_prci.o
-obj-$(CONFIG_SIFIVE) += sifive_clint.o
-obj-$(CONFIG_SIFIVE) += sifive_gpio.o
-obj-$(CONFIG_SIFIVE) += sifive_plic.o
-obj-$(CONFIG_SIFIVE) += sifive_test.o
-obj-$(CONFIG_SIFIVE_U) += sifive_u.o
-obj-$(CONFIG_SIFIVE_U) += sifive_u_otp.o
-obj-$(CONFIG_SIFIVE_U) += sifive_u_prci.o
-obj-$(CONFIG_SIFIVE) += sifive_uart.o
-obj-$(CONFIG_SPIKE) += spike.o
-obj-$(CONFIG_RISCV_VIRT) += virt.o
diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
new file mode 100644
index 0000000..2de8e5a
--- /dev/null
+++ b/hw/riscv/meson.build
@@ -0,0 +1,19 @@
+riscv_ss = ss.source_set()
+riscv_ss.add(files('boot.c'))
+riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c'))
+riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
+riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_clint.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_gpio.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_plic.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_test.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_uart.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e_prci.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_otp.c'))
+riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_prci.c'))
+riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('riscv_htif.c'))
+riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c'))
+
+hw_arch += {'riscv': riscv_ss}
diff --git a/hw/rx/Makefile.objs b/hw/rx/Makefile.objs
deleted file mode 100644
index 4ef6b9e..0000000
--- a/hw/rx/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_RX62N_MCU) += rx62n.o
-obj-$(CONFIG_RX_GDBSIM) += rx-gdbsim.o
diff --git a/hw/rx/meson.build b/hw/rx/meson.build
new file mode 100644
index 0000000..d223512
--- /dev/null
+++ b/hw/rx/meson.build
@@ -0,0 +1,5 @@
+rx_ss = ss.source_set()
+rx_ss.add(when: 'CONFIG_RX_GDBSIM', if_true: files('rx-gdbsim.c'))
+rx_ss.add(when: 'CONFIG_RX62N_MCU', if_true: files('rx62n.c'))
+
+hw_arch += {'rx': rx_ss}
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
deleted file mode 100644
index a46a1c7..0000000
--- a/hw/s390x/Makefile.objs
+++ /dev/null
@@ -1,37 +0,0 @@
-obj-y += s390-virtio-hcall.o
-obj-y += sclp.o
-obj-y += event-facility.o
-obj-y += sclpquiesce.o
-obj-y += sclpcpu.o
-obj-y += ipl.o
-obj-y += css.o
-obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o
-obj-$(CONFIG_TERMINAL3270) += 3270-ccw.o
-ifeq ($(CONFIG_VIRTIO_CCW),y)
-obj-y += virtio-ccw.o
-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o
-obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o
-obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o
-obj-$(CONFIG_VIRTIO_RNG) += virtio-ccw-rng.o
-obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-ccw-crypto.o
-obj-$(CONFIG_VIRTIO_GPU) += virtio-ccw-gpu.o
-obj-$(CONFIG_VIRTIO_INPUT) += virtio-ccw-input.o
-obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o
-obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o
-obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o
-obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o
-endif
-obj-y += css-bridge.o
-obj-y += ccw-device.o
-obj-y += s390-pci-bus.o s390-pci-inst.o
-obj-y += s390-skeys.o
-obj-y += s390-stattrib.o
-obj-y += tod.o
-obj-y += tod-qemu.o
-obj-$(CONFIG_KVM) += tod-kvm.o
-obj-$(CONFIG_KVM) += s390-skeys-kvm.o
-obj-$(CONFIG_KVM) += s390-stattrib-kvm.o
-obj-$(CONFIG_KVM) += pv.o
-obj-y += s390-ccw.o
-obj-y += ap-device.o
-obj-y += ap-bridge.o
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
new file mode 100644
index 0000000..b63782d
--- /dev/null
+++ b/hw/s390x/meson.build
@@ -0,0 +1,46 @@
+s390x_ss = ss.source_set()
+s390x_ss.add(files(
+ 'ap-bridge.c',
+ 'ap-device.c',
+ 'ccw-device.c',
+ 'css-bridge.c',
+ 'css.c',
+ 'event-facility.c',
+ 'ipl.c',
+ 's390-ccw.c',
+ 's390-pci-bus.c',
+ 's390-pci-inst.c',
+ 's390-skeys.c',
+ 's390-stattrib.c',
+ 's390-virtio-hcall.c',
+ 'sclp.c',
+ 'sclpcpu.c',
+ 'sclpquiesce.c',
+ 'tod-qemu.c',
+ 'tod.c',
+))
+s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
+ 'tod-kvm.c',
+ 's390-skeys-kvm.c',
+ 's390-stattrib-kvm.c',
+ 'pv.c',
+))
+s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
+s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
+
+virtio_ss = ss.source_set()
+virtio_ss.add(files('virtio-ccw.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-ccw-balloon.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-ccw-blk.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-ccw-crypto.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: files('virtio-ccw-gpu.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-ccw-input.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.c'))
+virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-serial.c'))
+virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files('virtio-ccw-blk.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
+s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
+
+hw_arch += {'s390x': s390x_ss}
diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
deleted file mode 100644
index 2a707f9..0000000
--- a/hw/sh4/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-y += sh7750.o sh7750_regnames.o
-obj-y += sh_pci.o
-obj-$(CONFIG_R2D) += r2d.o
-obj-$(CONFIG_SHIX) += shix.o
diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build
new file mode 100644
index 0000000..303c0f4
--- /dev/null
+++ b/hw/sh4/meson.build
@@ -0,0 +1,10 @@
+sh4_ss = ss.source_set()
+sh4_ss.add(files(
+ 'sh7750.c',
+ 'sh7750_regnames.c',
+ 'sh_pci.c'
+))
+sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c'))
+sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c'))
+
+hw_arch += {'sh4': sh4_ss}
diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
deleted file mode 100644
index d57e33f..0000000
--- a/hw/sparc/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_SUN4M) += sun4m_iommu.o
-obj-$(CONFIG_SUN4M) += sun4m.o
-obj-$(CONFIG_LEON3) += leon3.o
diff --git a/hw/sparc/meson.build b/hw/sparc/meson.build
new file mode 100644
index 0000000..19c442c
--- /dev/null
+++ b/hw/sparc/meson.build
@@ -0,0 +1,6 @@
+sparc_ss = ss.source_set()
+sparc_ss.add(when: 'CONFIG_LEON3', if_true: files('leon3.c'))
+sparc_ss.add(when: 'CONFIG_SUN4M', if_true: files('sun4m.c'))
+sparc_ss.add(when: 'CONFIG_SUN4M', if_true: files('sun4m_iommu.c'))
+
+hw_arch += {'sparc': sparc_ss}
diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs
deleted file mode 100644
index af0525c..0000000
--- a/hw/sparc64/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-y += sparc64.o
-obj-$(CONFIG_SUN4U) += sun4u_iommu.o
-obj-$(CONFIG_SUN4U) += sun4u.o
-obj-$(CONFIG_NIAGARA) += niagara.o
diff --git a/hw/sparc64/meson.build b/hw/sparc64/meson.build
new file mode 100644
index 0000000..58b5504
--- /dev/null
+++ b/hw/sparc64/meson.build
@@ -0,0 +1,6 @@
+sparc64_ss = ss.source_set()
+sparc64_ss.add(files('sparc64.c'))
+sparc64_ss.add(when: 'CONFIG_NIAGARA', if_true: files('niagara.c'))
+sparc64_ss.add(when: 'CONFIG_SUN4U', if_true: files('sun4u.c', 'sun4u_iommu.c'))
+
+hw_arch += {'sparc64': sparc64_ss}
diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs
deleted file mode 100644
index 5501f6c..0000000
--- a/hw/tricore/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_TRICORE) += tricore_testboard.o
diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build
new file mode 100644
index 0000000..579aa13
--- /dev/null
+++ b/hw/tricore/meson.build
@@ -0,0 +1,4 @@
+tricore_ss = ss.source_set()
+tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c'))
+
+hw_arch += {'tricore': tricore_ss}
diff --git a/hw/unicore32/Makefile.objs b/hw/unicore32/Makefile.objs
deleted file mode 100644
index e0fd628..0000000
--- a/hw/unicore32/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-# For UniCore32 machines and boards
-
-# PKUnity-v3 SoC and board information
-obj-${CONFIG_PUV3} += puv3.o
diff --git a/hw/unicore32/meson.build b/hw/unicore32/meson.build
new file mode 100644
index 0000000..fc26d6b
--- /dev/null
+++ b/hw/unicore32/meson.build
@@ -0,0 +1,5 @@
+unicore32_ss = ss.source_set()
+# PKUnity-v3 SoC and board information
+unicore32_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3.c'))
+
+hw_arch += {'unicore32': unicore32_ss}
diff --git a/hw/xenpv/Makefile.objs b/hw/xenpv/Makefile.objs
deleted file mode 100644
index 8bfa458..0000000
--- a/hw/xenpv/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-# Xen PV machine support
-obj-$(CONFIG_XEN) += xen_machine_pv.o
diff --git a/hw/xenpv/meson.build b/hw/xenpv/meson.build
new file mode 100644
index 0000000..40f911a
--- /dev/null
+++ b/hw/xenpv/meson.build
@@ -0,0 +1,3 @@
+xenpv_ss = ss.source_set()
+
+xenpv_ss.add(when: 'CONFIG_XEN', if_true: files('xen_machine_pv.c'))
diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
deleted file mode 100644
index 2b40e1b..0000000
--- a/hw/xtensa/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-y += mx_pic.o
-obj-y += pic_cpu.o
-obj-y += xtensa_memory.o
-obj-$(CONFIG_XTENSA_SIM) += sim.o
-obj-$(CONFIG_XTENSA_VIRT) += virt.o
-obj-$(CONFIG_XTENSA_XTFPGA) += xtfpga.o
diff --git a/hw/xtensa/meson.build b/hw/xtensa/meson.build
new file mode 100644
index 0000000..1d5835d
--- /dev/null
+++ b/hw/xtensa/meson.build
@@ -0,0 +1,11 @@
+xtensa_ss = ss.source_set()
+xtensa_ss.add(files(
+ 'mx_pic.c',
+ 'pic_cpu.c',
+ 'xtensa_memory.c',
+))
+xtensa_ss.add(when: 'CONFIG_XTENSA_SIM', if_true: files('sim.c'))
+xtensa_ss.add(when: 'CONFIG_XTENSA_VIRT', if_true: files('virt.c'))
+xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: files('xtfpga.c'))
+
+hw_arch += {'xtensa': xtensa_ss}
diff --git a/meson.build b/meson.build
index e2a80b8..03d9876 100644
--- a/meson.build
+++ b/meson.build
@@ -760,6 +760,10 @@ foreach target : target_dirs
if target.endswith('-softmmu')
qemu_target_name = 'qemu-system-' + target_name
target_type='system'
+ hw_dir = target_name == 'sparc64' ? 'sparc64' : arch
+ hw = hw_arch[hw_dir].apply(config_target, strict: false)
+ arch_srcs += hw.sources()
+
arch_srcs += config_devices_h[target]
else
target_type='user'
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 124/143] meson: target
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (122 preceding siblings ...)
2020-08-06 19:15 ` [PATCH 123/143] meson: convert hw/arch* Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-07 9:04 ` Peter Maydell
2020-08-06 19:16 ` [PATCH 125/143] meson: accel Paolo Bonzini
` (23 subsequent siblings)
147 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 3 +-
libdecnumber/Makefile.objs | 5 ---
libdecnumber/meson.build | 7 ++++
meson.build | 11 +++++
scripts/decodetree.py | 2 +-
target/alpha/Makefile.objs | 4 --
target/alpha/meson.build | 18 +++++++++
target/arm/Makefile.objs | 89 -----------------------------------------
target/arm/meson.build | 62 ++++++++++++++++++++++++++++
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/hppa/Makefile.objs | 11 -----
target/hppa/meson.build | 19 +++++++++
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/lm32/Makefile.objs | 4 --
target/lm32/meson.build | 15 +++++++
target/m68k/Makefile.objs | 5 ---
target/m68k/meson.build | 17 ++++++++
target/meson.build | 22 ++++++++++
target/microblaze/Makefile.objs | 3 --
target/microblaze/meson.build | 14 +++++++
target/mips/Makefile.objs | 6 ---
target/mips/meson.build | 24 +++++++++++
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/meson.build | 37 +++++++++++++++++
target/riscv/Makefile.objs | 28 -------------
target/riscv/meson.build | 34 ++++++++++++++++
target/riscv/translate.c | 4 +-
target/rx/Makefile.objs | 11 -----
target/rx/disas.c | 2 +-
target/rx/meson.build | 16 ++++++++
target/rx/translate.c | 2 +-
target/s390x/Makefile.objs | 10 -----
target/s390x/meson.build | 42 ++++++++++++++++++-
target/sh4/Makefile.objs | 3 --
target/sh4/meson.build | 14 +++++++
target/sparc/Makefile.objs | 7 ----
target/sparc/meson.build | 23 +++++++++++
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/meson.build | 30 ++++++++++++++
62 files changed, 595 insertions(+), 328 deletions(-)
delete mode 100644 libdecnumber/Makefile.objs
create mode 100644 libdecnumber/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
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
delete mode 100644 target/hppa/Makefile.objs
create mode 100644 target/hppa/meson.build
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
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
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
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
delete mode 100644 target/riscv/Makefile.objs
create mode 100644 target/riscv/meson.build
delete mode 100644 target/rx/Makefile.objs
create mode 100644 target/rx/meson.build
delete mode 100644 target/s390x/Makefile.objs
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
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
create mode 100644 target/xtensa/meson.build
diff --git a/Makefile.target b/Makefile.target
index 28cefba..1ab8773 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -116,7 +116,6 @@ obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o
obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o
obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-$(CONFIG_TCG) += fpu/softfloat.o
-obj-y += target/$(TARGET_BASE_ARCH)/
obj-y += disas.o
obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
LIBS := $(libs_cpu) $(LIBS)
@@ -168,7 +167,7 @@ LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOM
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
-LIBS := $(LIBS) $(VIRGL_LIBS)
+LIBS := $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS)
generated-files-y += hmp-commands.h hmp-commands-info.h
diff --git a/libdecnumber/Makefile.objs b/libdecnumber/Makefile.objs
deleted file mode 100644
index d81db04..0000000
--- a/libdecnumber/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y += decContext.o
-obj-y += decNumber.o
-obj-y += dpd/decimal32.o
-obj-y += dpd/decimal64.o
-obj-y += dpd/decimal128.o
diff --git a/libdecnumber/meson.build b/libdecnumber/meson.build
new file mode 100644
index 0000000..4d04139
--- /dev/null
+++ b/libdecnumber/meson.build
@@ -0,0 +1,7 @@
+libdecnumber = files(
+ 'decContext.c',
+ 'decNumber.c',
+ 'dpd/decimal128.c',
+ 'dpd/decimal32.c',
+ 'dpd/decimal64.c',
+)
diff --git a/meson.build b/meson.build
index 03d9876..3e51340 100644
--- a/meson.build
+++ b/meson.build
@@ -623,10 +623,15 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
+decodetree = generator(find_program('scripts/decodetree.py'),
+ output: 'decode-@BASENAME@.inc',
+ arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@'])
+
subdir('audio')
subdir('io')
subdir('chardev')
subdir('fsdev')
+subdir('libdecnumber')
subdir('target')
subdir('dump')
@@ -760,6 +765,9 @@ foreach target : target_dirs
if target.endswith('-softmmu')
qemu_target_name = 'qemu-system-' + target_name
target_type='system'
+ t = target_softmmu_arch[arch].apply(config_target, strict: false)
+ arch_srcs += t.sources()
+
hw_dir = target_name == 'sparc64' ? 'sparc64' : arch
hw = hw_arch[hw_dir].apply(config_target, strict: false)
arch_srcs += hw.sources()
@@ -780,6 +788,9 @@ foreach target : target_dirs
)
endif
+ t = target_arch[arch].apply(config_target, strict: false)
+ arch_srcs += t.sources()
+
target_common = common_ss.apply(config_target, strict: false)
objects = common_all.extract_objects(target_common.sources())
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 694757b..4cd1e10 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -1257,7 +1257,7 @@ def main():
long_opts = ['decode=', 'translate=', 'output=', 'insnwidth=',
'static-decode=', 'varinsnwidth=']
try:
- (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts)
+ (opts, args) = getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opts)
except getopt.GetoptError as err:
error(0, err)
for o, a in opts:
diff --git a/target/alpha/Makefile.objs b/target/alpha/Makefile.objs
deleted file mode 100644
index 6366462..0000000
--- a/target/alpha/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_SOFTMMU) += machine.o
-obj-y += translate.o helper.o cpu.o
-obj-y += int_helper.o fpu_helper.o vax_helper.o sys_helper.o mem_helper.o
-obj-y += gdbstub.o
diff --git a/target/alpha/meson.build b/target/alpha/meson.build
new file mode 100644
index 0000000..1aec55a
--- /dev/null
+++ b/target/alpha/meson.build
@@ -0,0 +1,18 @@
+alpha_ss = ss.source_set()
+alpha_ss.add(files(
+ 'cpu.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'int_helper.c',
+ 'mem_helper.c',
+ 'sys_helper.c',
+ 'translate.c',
+ 'vax_helper.c',
+))
+
+alpha_softmmu_ss = ss.source_set()
+alpha_softmmu_ss.add(files('machine.c'))
+
+target_arch += {'alpha': alpha_ss}
+target_softmmu_arch += {'alpha': alpha_softmmu_ss}
diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs
deleted file mode 100644
index 4a177ad..0000000
--- a/target/arm/Makefile.objs
+++ /dev/null
@@ -1,89 +0,0 @@
-obj-$(CONFIG_TCG) += arm-semi.o
-obj-y += helper.o vfp_helper.o
-obj-y += cpu.o gdbstub.o
-obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o
-
-obj-$(CONFIG_SOFTMMU) += machine.o arch_dump.o monitor.o
-obj-$(CONFIG_SOFTMMU) += arm-powerctl.o
-
-obj-$(CONFIG_KVM) += kvm.o
-obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o
-obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-
-target/arm/decode-sve.inc: $(SRC_PATH)/target/arm/sve.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --decode disas_sve -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-neon-shared.inc: $(SRC_PATH)/target/arm/neon-shared.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_neon_shared -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-neon-dp.inc: $(SRC_PATH)/target/arm/neon-dp.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_neon_dp -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-neon-ls.inc: $(SRC_PATH)/target/arm/neon-ls.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_neon_ls -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-vfp.inc: $(SRC_PATH)/target/arm/vfp.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_vfp -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-vfp-uncond.inc: $(SRC_PATH)/target/arm/vfp-uncond.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-a32.inc: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_a32 -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-a32-uncond.inc: $(SRC_PATH)/target/arm/a32-uncond.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_a32_uncond -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-t32.inc: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --static-decode disas_t32 -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/decode-t16.inc: $(SRC_PATH)/target/arm/t16.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) -w 16 --static-decode disas_t16 -o $@ $<,\
- "GEN", $(TARGET_DIR)$@)
-
-target/arm/translate-sve.o: target/arm/decode-sve.inc
-target/arm/translate.o: target/arm/decode-neon-shared.inc
-target/arm/translate.o: target/arm/decode-neon-dp.inc
-target/arm/translate.o: target/arm/decode-neon-ls.inc
-target/arm/translate.o: target/arm/decode-vfp.inc
-target/arm/translate.o: target/arm/decode-vfp-uncond.inc
-target/arm/translate.o: target/arm/decode-a32.inc
-target/arm/translate.o: target/arm/decode-a32-uncond.inc
-target/arm/translate.o: target/arm/decode-t32.inc
-target/arm/translate.o: target/arm/decode-t16.inc
-
-obj-y += tlb_helper.o debug_helper.o
-obj-y += translate.o op_helper.o
-obj-y += crypto_helper.o
-obj-y += iwmmxt_helper.o vec_helper.o neon_helper.o
-obj-y += m_helper.o
-obj-y += cpu_tcg.o
-
-obj-$(CONFIG_SOFTMMU) += psci.o
-
-obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o
-obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o
-obj-$(TARGET_AARCH64) += pauth_helper.o
-obj-$(TARGET_AARCH64) += mte_helper.o
diff --git a/target/arm/meson.build b/target/arm/meson.build
new file mode 100644
index 0000000..056223a
--- /dev/null
+++ b/target/arm/meson.build
@@ -0,0 +1,62 @@
+gen = [
+ decodetree.process('sve.decode', extra_args: '--decode=disas_sve'),
+ decodetree.process('neon-shared.decode', extra_args: '--static-decode=disas_neon_shared'),
+ decodetree.process('neon-dp.decode', extra_args: '--static-decode=disas_neon_dp'),
+ decodetree.process('neon-ls.decode', extra_args: '--static-decode=disas_neon_ls'),
+ decodetree.process('vfp.decode', extra_args: '--static-decode=disas_vfp'),
+ decodetree.process('vfp-uncond.decode', extra_args: '--static-decode=disas_vfp_uncond'),
+ decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'),
+ decodetree.process('a32-uncond.decode', extra_args: '--static-decode=disas_a32_uncond'),
+ decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'),
+ decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-decode=disas_t16']),
+]
+
+arm_ss = ss.source_set()
+arm_ss.add(gen)
+arm_ss.add(files(
+ 'cpu.c',
+ 'crypto_helper.c',
+ 'debug_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'iwmmxt_helper.c',
+ 'm_helper.c',
+ 'neon_helper.c',
+ 'op_helper.c',
+ 'tlb_helper.c',
+ 'translate.c',
+ 'vec_helper.c',
+ 'vfp_helper.c',
+ 'cpu_tcg.c',
+))
+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')
+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'))
+
+arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
+ 'cpu64.c',
+ 'gdbstub64.c',
+ 'helper-a64.c',
+ 'mte_helper.c',
+ 'pauth_helper.c',
+ 'sve_helper.c',
+ 'translate-a64.c',
+ 'translate-sve.c',
+))
+
+arm_softmmu_ss = ss.source_set()
+arm_softmmu_ss.add(files(
+ 'arch_dump.c',
+ 'arm-powerctl.c',
+ 'machine.c',
+ 'monitor.c',
+ 'psci.c',
+))
+
+target_arch += {'arm': arm_ss}
+target_softmmu_arch += {'arm': arm_softmmu_ss}
diff --git a/target/avr/Makefile.objs b/target/avr/Makefile.objs
deleted file mode 100644
index 81d9bcd..0000000
--- a/target/avr/Makefile.objs
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# QEMU AVR
-#
-# Copyright (c) 2016-2020 Michael Rolnik
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see
-# <http://www.gnu.org/licenses/lgpl-2.1.html>
-#
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-decode-y = $(SRC_PATH)/target/avr/insn.decode
-
-target/avr/decode_insn.inc: $(decode-y) $(DECODETREE)
- $(call quiet-command, \
- $(PYTHON) $(DECODETREE) -o $@ --decode decode_insn --insnwidth 16 $<, \
- "GEN", $(TARGET_DIR)$@)
-
-target/avr/translate.o: target/avr/decode_insn.inc
-
-obj-y += translate.o cpu.o helper.o
-obj-y += gdbstub.o
-obj-y += disas.o
-obj-$(CONFIG_SOFTMMU) += machine.o
diff --git a/target/avr/disas.c b/target/avr/disas.c
index c45ab2c..5e20cbb 100644
--- a/target/avr/disas.c
+++ b/target/avr/disas.c
@@ -60,7 +60,7 @@ static int append_16(DisasContext *ctx, int x)
/* Include the auto-generated decoder. */
static bool decode_insn(DisasContext *ctx, uint16_t insn);
-#include "decode_insn.inc"
+#include "decode-insn.inc"
#define output(mnemonic, format, ...) \
(pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \
diff --git a/target/avr/meson.build b/target/avr/meson.build
new file mode 100644
index 0000000..7e8e29c
--- /dev/null
+++ b/target/avr/meson.build
@@ -0,0 +1,20 @@
+gen = [
+ decodetree.process('insn.decode', extra_args: [ '--decode', 'decode_insn',
+ '--insnwidth', '16' ])
+]
+
+avr_ss = ss.source_set()
+avr_softmmu_ss = ss.source_set()
+
+avr_ss.add(gen)
+avr_ss.add(files(
+ 'translate.c',
+ 'helper.c',
+ 'cpu.c',
+ 'gdbstub.c',
+ 'disas.c'))
+
+avr_softmmu_ss.add(files('machine.c'))
+
+target_arch += {'avr': avr_ss}
+target_softmmu_arch += {'avr': avr_softmmu_ss}
diff --git a/target/avr/translate.c b/target/avr/translate.c
index 8deb126..ad5706a 100644
--- a/target/avr/translate.c
+++ b/target/avr/translate.c
@@ -198,7 +198,7 @@ static bool avr_have_feature(DisasContext *ctx, int feature)
}
static bool decode_insn(DisasContext *ctx, uint16_t insn);
-#include "decode_insn.inc"
+#include "decode-insn.inc"
/*
* Arithmetic Instructions
diff --git a/target/cris/Makefile.objs b/target/cris/Makefile.objs
deleted file mode 100644
index 7779227..0000000
--- a/target/cris/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-y += gdbstub.o
-obj-$(CONFIG_SOFTMMU) += mmu.o machine.o
diff --git a/target/cris/meson.build b/target/cris/meson.build
new file mode 100644
index 0000000..67c3793
--- /dev/null
+++ b/target/cris/meson.build
@@ -0,0 +1,14 @@
+cris_ss = ss.source_set()
+cris_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+cris_softmmu_ss = ss.source_set()
+cris_softmmu_ss.add(files('mmu.c', 'machine.c'))
+
+target_arch += {'cris': cris_ss}
+target_softmmu_arch += {'cris': cris_softmmu_ss}
diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs
deleted file mode 100644
index 40dcb86..0000000
--- a/target/hppa/Makefile.objs
+++ /dev/null
@@ -1,11 +0,0 @@
-obj-y += translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o
-obj-y += int_helper.o
-obj-$(CONFIG_SOFTMMU) += machine.o
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-
-target/hppa/decode.inc: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)
-
-target/hppa/translate.o: target/hppa/decode.inc
diff --git a/target/hppa/meson.build b/target/hppa/meson.build
new file mode 100644
index 0000000..8a7ff82
--- /dev/null
+++ b/target/hppa/meson.build
@@ -0,0 +1,19 @@
+gen = decodetree.process('insns.decode')
+
+hppa_ss = ss.source_set()
+hppa_ss.add(gen)
+hppa_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'int_helper.c',
+ 'mem_helper.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+hppa_softmmu_ss = ss.source_set()
+hppa_softmmu_ss.add(files('machine.c'))
+
+target_arch += {'hppa': hppa_ss}
+target_softmmu_arch += {'hppa': hppa_softmmu_ss}
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 31e2926..4869999 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -334,7 +334,7 @@ static int expand_shl11(DisasContext *ctx, int val)
/* Include the auto-generated decoder. */
-#include "decode.inc"
+#include "decode-insns.inc"
/* We are not using a goto_tb (for whatever reason), but have updated
the iaq (for whatever reason), so don't do it again on exit. */
diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs
deleted file mode 100644
index 0b93143..0000000
--- a/target/i386/Makefile.objs
+++ /dev/null
@@ -1,23 +0,0 @@
-obj-y += helper.o cpu.o gdbstub.o xsave_helper.o
-obj-$(CONFIG_TCG) += translate.o
-obj-$(CONFIG_TCG) += bpt_helper.o cc_helper.o excp_helper.o fpu_helper.o
-obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o mpx_helper.o
-obj-$(CONFIG_TCG) += seg_helper.o smm_helper.o svm_helper.o
-obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-ifeq ($(CONFIG_SOFTMMU),y)
-obj-y += machine.o arch_memory_mapping.o arch_dump.o monitor.o
-obj-$(CONFIG_KVM) += kvm.o
-obj-$(CONFIG_HYPERV) += hyperv.o
-obj-$(call lnot,$(CONFIG_HYPERV)) += hyperv-stub.o
-ifeq ($(CONFIG_WIN32),y)
-obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o
-endif
-ifeq ($(CONFIG_POSIX),y)
-obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-posix.o
-endif
-obj-$(CONFIG_HVF) += hvf/
-obj-$(CONFIG_WHPX) += whpx-all.o
-endif
-obj-$(CONFIG_SEV) += sev.o
-obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o
diff --git a/target/i386/hvf/Makefile.objs b/target/i386/hvf/Makefile.objs
deleted file mode 100644
index 927b86b..0000000
--- a/target/i386/hvf/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += hvf.o
-obj-y += x86.o x86_cpuid.o x86_decode.o x86_descr.o x86_emu.o x86_flags.o x86_mmu.o x86hvf.o x86_task.o
diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build
new file mode 100644
index 0000000..c8a4371
--- /dev/null
+++ b/target/i386/hvf/meson.build
@@ -0,0 +1,12 @@
+i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
+ 'hvf.c',
+ 'x86.c',
+ 'x86_cpuid.c',
+ 'x86_decode.c',
+ 'x86_descr.c',
+ 'x86_emu.c',
+ 'x86_flags.c',
+ 'x86_mmu.c',
+ 'x86_task.c',
+ 'x86hvf.c',
+))
diff --git a/target/i386/meson.build b/target/i386/meson.build
new file mode 100644
index 0000000..e0b71ad
--- /dev/null
+++ b/target/i386/meson.build
@@ -0,0 +1,40 @@
+i386_ss = ss.source_set()
+i386_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'xsave_helper.c',
+))
+i386_ss.add(when: 'CONFIG_TCG', if_true: files(
+ 'bpt_helper.c',
+ 'cc_helper.c',
+ 'excp_helper.c',
+ 'fpu_helper.c',
+ 'int_helper.c',
+ 'mem_helper.c',
+ 'misc_helper.c',
+ 'mpx_helper.c',
+ 'seg_helper.c',
+ 'smm_helper.c',
+ 'svm_helper.c',
+ 'translate.c'), if_false: files('tcg-stub.c'))
+i386_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
+i386_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-stub.c'))
+
+i386_softmmu_ss = ss.source_set()
+i386_softmmu_ss.add(files(
+ 'arch_dump.c',
+ 'arch_memory_mapping.c',
+ 'machine.c',
+ 'monitor.c',
+))
+i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
+i386_softmmu_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
+i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files('whpx-all.c'))
+i386_softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_HAX'], if_true: files('hax-all.c', 'hax-mem.c', 'hax-posix.c'))
+i386_softmmu_ss.add(when: ['CONFIG_WIN32', 'CONFIG_HAX'], if_true: files('hax-all.c', 'hax-mem.c', 'hax-windows.c'))
+
+subdir('hvf')
+
+target_arch += {'i386': i386_ss}
+target_softmmu_arch += {'i386': i386_softmmu_ss}
diff --git a/target/lm32/Makefile.objs b/target/lm32/Makefile.objs
deleted file mode 100644
index c3e1bd6..0000000
--- a/target/lm32/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-y += gdbstub.o
-obj-y += lm32-semi.o
-obj-$(CONFIG_SOFTMMU) += machine.o
diff --git a/target/lm32/meson.build b/target/lm32/meson.build
new file mode 100644
index 0000000..ef0eef0
--- /dev/null
+++ b/target/lm32/meson.build
@@ -0,0 +1,15 @@
+lm32_ss = ss.source_set()
+lm32_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'lm32-semi.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+lm32_softmmu_ss = ss.source_set()
+lm32_softmmu_ss.add(files('machine.c'))
+
+target_arch += {'lm32': lm32_ss}
+target_softmmu_arch += {'lm32': lm32_softmmu_ss}
diff --git a/target/m68k/Makefile.objs b/target/m68k/Makefile.objs
deleted file mode 100644
index ac61948..0000000
--- a/target/m68k/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y += m68k-semi.o
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-y += fpu_helper.o softfloat.o
-obj-y += gdbstub.o
-obj-$(CONFIG_SOFTMMU) += monitor.o
diff --git a/target/m68k/meson.build b/target/m68k/meson.build
new file mode 100644
index 0000000..05cd9fb
--- /dev/null
+++ b/target/m68k/meson.build
@@ -0,0 +1,17 @@
+m68k_ss = ss.source_set()
+m68k_ss.add(files(
+ 'cpu.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'm68k-semi.c',
+ 'op_helper.c',
+ 'softfloat.c',
+ 'translate.c',
+))
+
+m68k_softmmu_ss = ss.source_set()
+m68k_softmmu_ss.add(files('monitor.c'))
+
+target_arch += {'m68k': m68k_ss}
+target_softmmu_arch += {'m68k': m68k_softmmu_ss}
diff --git a/target/meson.build b/target/meson.build
index e29dd3e..9f0ae93 100644
--- a/target/meson.build
+++ b/target/meson.build
@@ -1 +1,23 @@
+subdir('alpha')
+subdir('arm')
+subdir('avr')
+subdir('cris')
+subdir('hppa')
+subdir('i386')
+subdir('lm32')
+subdir('m68k')
+subdir('microblaze')
+subdir('mips')
+subdir('moxie')
+subdir('nios2')
+subdir('openrisc')
+subdir('ppc')
+subdir('riscv')
+subdir('rx')
subdir('s390x')
+subdir('sh4')
+subdir('sparc')
+subdir('tilegx')
+subdir('tricore')
+subdir('unicore32')
+subdir('xtensa')
diff --git a/target/microblaze/Makefile.objs b/target/microblaze/Makefile.objs
deleted file mode 100644
index f3d7b44..0000000
--- a/target/microblaze/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-y += gdbstub.o
-obj-$(CONFIG_SOFTMMU) += mmu.o
diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
new file mode 100644
index 0000000..b8fe4af
--- /dev/null
+++ b/target/microblaze/meson.build
@@ -0,0 +1,14 @@
+microblaze_ss = ss.source_set()
+microblaze_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+microblaze_softmmu_ss = ss.source_set()
+microblaze_softmmu_ss.add(files('mmu.c'))
+
+target_arch += {'microblaze': microblaze_ss}
+target_softmmu_arch += {'microblaze': microblaze_softmmu_ss}
diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs
deleted file mode 100644
index b820b3b..0000000
--- a/target/mips/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-y += translate.o cpu.o gdbstub.o helper.o
-obj-y += op_helper.o cp0_helper.o fpu_helper.o
-obj-y += dsp_helper.o lmmi_helper.o msa_helper.o
-obj-$(CONFIG_SOFTMMU) += mips-semi.o
-obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o
-obj-$(CONFIG_KVM) += kvm.o
diff --git a/target/mips/meson.build b/target/mips/meson.build
new file mode 100644
index 0000000..fa1f024
--- /dev/null
+++ b/target/mips/meson.build
@@ -0,0 +1,24 @@
+mips_ss = ss.source_set()
+mips_ss.add(files(
+ 'cp0_helper.c',
+ 'cpu.c',
+ 'dsp_helper.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'lmmi_helper.c',
+ 'msa_helper.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
+
+mips_softmmu_ss = ss.source_set()
+mips_softmmu_ss.add(files(
+ 'cp0_timer.c',
+ 'machine.c',
+ 'mips-semi.c',
+))
+
+target_arch += {'mips': mips_ss}
+target_softmmu_arch += {'mips': mips_softmmu_ss}
diff --git a/target/moxie/Makefile.objs b/target/moxie/Makefile.objs
deleted file mode 100644
index 6381d4d..0000000
--- a/target/moxie/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += translate.o helper.o machine.o cpu.o machine.o
-obj-$(CONFIG_SOFTMMU) += mmu.o
diff --git a/target/moxie/meson.build b/target/moxie/meson.build
new file mode 100644
index 0000000..b4beb52
--- /dev/null
+++ b/target/moxie/meson.build
@@ -0,0 +1,14 @@
+moxie_ss = ss.source_set()
+moxie_ss.add(files(
+ 'cpu.c',
+ 'helper.c',
+ 'machine.c',
+ 'machine.c',
+ 'translate.c',
+))
+
+moxie_softmmu_ss = ss.source_set()
+moxie_softmmu_ss.add(files('mmu.c'))
+
+target_arch += {'moxie': moxie_ss}
+target_softmmu_arch += {'moxie': moxie_softmmu_ss}
diff --git a/target/nios2/Makefile.objs b/target/nios2/Makefile.objs
deleted file mode 100644
index 010de0e..0000000
--- a/target/nios2/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o mmu.o nios2-semi.o
-obj-$(CONFIG_SOFTMMU) += monitor.o
-
-$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
new file mode 100644
index 0000000..e643917
--- /dev/null
+++ b/target/nios2/meson.build
@@ -0,0 +1,15 @@
+nios2_ss = ss.source_set()
+nios2_ss.add(files(
+ 'cpu.c',
+ 'helper.c',
+ 'mmu.c',
+ 'nios2-semi.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+nios2_softmmu_ss = ss.source_set()
+nios2_softmmu_ss.add(files('monitor.c'))
+
+target_arch += {'nios2': nios2_ss}
+target_softmmu_arch += {'nios2': nios2_softmmu_ss}
diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs
deleted file mode 100644
index 0f2fcff..0000000
--- a/target/openrisc/Makefile.objs
+++ /dev/null
@@ -1,15 +0,0 @@
-obj-$(CONFIG_SOFTMMU) += machine.o
-obj-y += cpu.o exception.o interrupt.o mmu.o translate.o disas.o
-obj-y += exception_helper.o fpu_helper.o \
- interrupt_helper.o sys_helper.o
-obj-y += gdbstub.o
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-
-target/openrisc/decode.inc: \
- $(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)
-
-target/openrisc/translate.o: target/openrisc/decode.inc
-target/openrisc/disas.o: target/openrisc/decode.inc
diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c
index 3f75316..d5e0a43 100644
--- a/target/openrisc/disas.c
+++ b/target/openrisc/disas.c
@@ -25,7 +25,7 @@
typedef disassemble_info DisasContext;
/* Include the auto-generated decoder. */
-#include "decode.inc"
+#include "decode-insns.inc"
#define output(mnemonic, format, ...) \
(info->fprintf_func(info->stream, "%-9s " format, \
diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build
new file mode 100644
index 0000000..9774a58
--- /dev/null
+++ b/target/openrisc/meson.build
@@ -0,0 +1,23 @@
+gen = decodetree.process('insns.decode')
+
+openrisc_ss = ss.source_set()
+openrisc_ss.add(gen)
+openrisc_ss.add(files(
+ 'cpu.c',
+ 'disas.c',
+ 'exception.c',
+ 'exception_helper.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'interrupt.c',
+ 'interrupt_helper.c',
+ 'mmu.c',
+ 'sys_helper.c',
+ 'translate.c',
+))
+
+openrisc_softmmu_ss = ss.source_set()
+openrisc_softmmu_ss.add(files('machine.c'))
+
+target_arch += {'openrisc': openrisc_ss}
+target_softmmu_arch += {'openrisc': openrisc_softmmu_ss}
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index a119be2..ffd268d 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -65,7 +65,7 @@ static inline bool is_user(DisasContext *dc)
}
/* Include the auto-generated decoder. */
-#include "decode.inc"
+#include "decode-insns.inc"
static TCGv cpu_sr;
static TCGv cpu_regs[32];
diff --git a/target/ppc/Makefile.objs b/target/ppc/Makefile.objs
deleted file mode 100644
index e8fa18c..0000000
--- a/target/ppc/Makefile.objs
+++ /dev/null
@@ -1,20 +0,0 @@
-obj-y += cpu-models.o
-obj-y += cpu.o
-obj-y += translate.o
-ifeq ($(CONFIG_SOFTMMU),y)
-obj-y += machine.o mmu_helper.o mmu-hash32.o monitor.o arch_dump.o
-obj-$(TARGET_PPC64) += mmu-hash64.o mmu-book3s-v3.o compat.o
-obj-$(TARGET_PPC64) += mmu-radix64.o
-endif
-obj-$(CONFIG_KVM) += kvm.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-obj-y += dfp_helper.o
-obj-y += excp_helper.o
-obj-y += fpu_helper.o
-obj-y += int_helper.o
-obj-y += timebase_helper.o
-obj-y += misc_helper.o
-obj-y += mem_helper.o
-obj-y += ../../libdecnumber/
-obj-$(CONFIG_USER_ONLY) += user_only_helper.o
-obj-y += gdbstub.o
diff --git a/target/ppc/meson.build b/target/ppc/meson.build
new file mode 100644
index 0000000..bbfef90
--- /dev/null
+++ b/target/ppc/meson.build
@@ -0,0 +1,37 @@
+ppc_ss = ss.source_set()
+ppc_ss.add(files(
+ 'cpu-models.c',
+ 'cpu.c',
+ 'dfp_helper.c',
+ 'excp_helper.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'int_helper.c',
+ 'mem_helper.c',
+ 'misc_helper.c',
+ 'timebase_helper.c',
+ 'translate.c',
+))
+
+ppc_ss.add(libdecnumber)
+
+ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
+ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c'))
+
+ppc_softmmu_ss = ss.source_set()
+ppc_softmmu_ss.add(files(
+ 'arch_dump.c',
+ 'machine.c',
+ 'mmu-hash32.c',
+ 'mmu_helper.c',
+ 'monitor.c',
+))
+ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files(
+ 'compat.c',
+ 'mmu-book3s-v3.c',
+ 'mmu-hash64.c',
+ 'mmu-radix64.c',
+))
+
+target_arch += {'ppc': ppc_ss}
+target_softmmu_arch += {'ppc': ppc_softmmu_ss}
diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs
deleted file mode 100644
index 1a66d8a..0000000
--- a/target/riscv/Makefile.objs
+++ /dev/null
@@ -1,28 +0,0 @@
-obj-y += translate.o op_helper.o cpu_helper.o cpu.o csr.o fpu_helper.o vector_helper.o gdbstub.o
-obj-$(CONFIG_SOFTMMU) += pmp.o
-
-ifeq ($(CONFIG_SOFTMMU),y)
-obj-y += monitor.o
-endif
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-
-decode32-y = $(SRC_PATH)/target/riscv/insn32.decode
-decode32-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn32-64.decode
-
-decode16-y = $(SRC_PATH)/target/riscv/insn16.decode
-decode16-$(TARGET_RISCV32) += $(SRC_PATH)/target/riscv/insn16-32.decode
-decode16-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn16-64.decode
-
-target/riscv/decode_insn32.inc: $(decode32-y) $(DECODETREE)
- $(call quiet-command, \
- $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \
- $(decode32-y), "GEN", $(TARGET_DIR)$@)
-
-target/riscv/decode_insn16.inc: $(decode16-y) $(DECODETREE)
- $(call quiet-command, \
- $(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn16 \
- --insnwidth 16 $(decode16-y), "GEN", $(TARGET_DIR)$@)
-
-target/riscv/translate.o: target/riscv/decode_insn32.inc \
- target/riscv/decode_insn16.inc
diff --git a/target/riscv/meson.build b/target/riscv/meson.build
new file mode 100644
index 0000000..abd647f
--- /dev/null
+++ b/target/riscv/meson.build
@@ -0,0 +1,34 @@
+# FIXME extra_args should accept files()
+dir = meson.current_source_dir()
+gen32 = [
+ decodetree.process('insn16.decode', extra_args: [dir / 'insn16-32.decode', '--static-decode=decode_insn16', '--insnwidth=16']),
+ decodetree.process('insn32.decode', extra_args: '--static-decode=decode_insn32'),
+]
+
+gen64 = [
+ decodetree.process('insn16.decode', extra_args: [dir / 'insn16-64.decode', '--static-decode=decode_insn16', '--insnwidth=16']),
+ decodetree.process('insn32.decode', extra_args: [dir / 'insn32-64.decode', '--static-decode=decode_insn32']),
+]
+
+riscv_ss = ss.source_set()
+riscv_ss.add(when: 'TARGET_RISCV32', if_true: gen32)
+riscv_ss.add(when: 'TARGET_RISCV64', if_true: gen64)
+riscv_ss.add(files(
+ 'cpu.c',
+ 'cpu_helper.c',
+ 'csr.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'op_helper.c',
+ 'vector_helper.c',
+ 'translate.c',
+))
+
+riscv_softmmu_ss = ss.source_set()
+riscv_softmmu_ss.add(files(
+ 'pmp.c',
+ 'monitor.c'
+))
+
+target_arch += {'riscv': riscv_ss}
+target_softmmu_arch += {'riscv': riscv_softmmu_ss}
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index aa7f56d..9be49c4 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -583,7 +583,7 @@ static int ex_rvc_shifti(DisasContext *ctx, int imm)
}
/* Include the auto-generated decoder for 32 bit insn */
-#include "decode_insn32.inc"
+#include "decode-insn32.inc"
static bool gen_arith_imm_fn(DisasContext *ctx, arg_i *a,
void (*func)(TCGv, TCGv, target_long))
@@ -728,7 +728,7 @@ static bool gen_shift(DisasContext *ctx, arg_r *a,
#include "insn_trans/trans_privileged.inc"
/* Include the auto-generated decoder for 16 bit insn */
-#include "decode_insn16.inc"
+#include "decode-insn16.inc"
static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode)
{
diff --git a/target/rx/Makefile.objs b/target/rx/Makefile.objs
deleted file mode 100644
index eddc62a..0000000
--- a/target/rx/Makefile.objs
+++ /dev/null
@@ -1,11 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o gdbstub.o disas.o
-
-DECODETREE = $(SRC_PATH)/scripts/decodetree.py
-
-target/rx/decode.inc: \
- $(SRC_PATH)/target/rx/insns.decode $(DECODETREE)
- $(call quiet-command,\
- $(PYTHON) $(DECODETREE) --varinsnwidth 32 -o $@ $<, "GEN", $(TARGET_DIR)$@)
-
-target/rx/translate.o: target/rx/decode.inc
-target/rx/disas.o: target/rx/decode.inc
diff --git a/target/rx/disas.c b/target/rx/disas.c
index 6450892..6584509 100644
--- a/target/rx/disas.c
+++ b/target/rx/disas.c
@@ -100,7 +100,7 @@ static int bdsp_s(DisasContext *ctx, int d)
}
/* Include the auto-generated decoder. */
-#include "decode.inc"
+#include "decode-insns.inc"
static void dump_bytes(DisasContext *ctx)
{
diff --git a/target/rx/meson.build b/target/rx/meson.build
new file mode 100644
index 0000000..8de0ad4
--- /dev/null
+++ b/target/rx/meson.build
@@ -0,0 +1,16 @@
+gen = [
+ decodetree.process('insns.decode', extra_args: [ '--varinsnwidth', '32' ])
+]
+
+rx_ss = ss.source_set()
+rx_ss.add(gen)
+rx_ss.add(files(
+ 'translate.c',
+ 'op_helper.c',
+ 'helper.c',
+ 'cpu.c',
+ 'gdbstub.c',
+ 'disas.c'))
+
+target_arch += {'rx': rx_ss}
+target_softmmu_arch += {'rx': ss.source_set()}
diff --git a/target/rx/translate.c b/target/rx/translate.c
index 272619c..d688c9d 100644
--- a/target/rx/translate.c
+++ b/target/rx/translate.c
@@ -124,7 +124,7 @@ static int bdsp_s(DisasContext *ctx, int d)
}
/* Include the auto-generated decoder. */
-#include "decode.inc"
+#include "decode-insns.inc"
void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags)
{
diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
deleted file mode 100644
index 9b9accc..0000000
--- a/target/s390x/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o
-obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o
-obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o
-obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o vec_string_helper.o
-obj-$(CONFIG_TCG) += vec_fpu_helper.o
-obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o
-obj-$(CONFIG_SOFTMMU) += sigp.o
-obj-$(CONFIG_KVM) += kvm.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index 980f67c..4757e58 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -1,3 +1,30 @@
+s390x_ss = ss.source_set()
+s390x_ss.add(files(
+ 'cpu.c',
+ 'cpu_features.c',
+ 'cpu_models.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'interrupt.c',
+))
+
+s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
+ 'cc_helper.c',
+ 'crypto_helper.c',
+ 'excp_helper.c',
+ 'fpu_helper.c',
+ 'int_helper.c',
+ 'mem_helper.c',
+ 'misc_helper.c',
+ 'translate.c',
+ 'vec_fpu_helper.c',
+ 'vec_helper.c',
+ 'vec_int_helper.c',
+ 'vec_string_helper.c',
+), if_false: 'tcg-stub.c')
+
+s390x_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
+
gen_features = executable('gen-features', 'gen-features.c', native: true)
gen_features_h = custom_target('gen-features.h',
@@ -5,4 +32,17 @@ gen_features_h = custom_target('gen-features.h',
capture: true,
command: gen_features)
-specific_ss.add(gen_features_h)
+s390x_ss.add(gen_features_h)
+
+s390x_softmmu_ss = ss.source_set()
+s390x_softmmu_ss.add(files(
+ 'arch_dump.c',
+ 'diag.c',
+ 'ioinst.c',
+ 'machine.c',
+ 'mmu_helper.c',
+ 'sigp.c',
+))
+
+target_arch += {'s390x': s390x_ss}
+target_softmmu_arch += {'s390x': s390x_softmmu_ss}
diff --git a/target/sh4/Makefile.objs b/target/sh4/Makefile.objs
deleted file mode 100644
index 2c25d96..0000000
--- a/target/sh4/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-$(CONFIG_SOFTMMU) += monitor.o
-obj-y += gdbstub.o
diff --git a/target/sh4/meson.build b/target/sh4/meson.build
new file mode 100644
index 0000000..56a5757
--- /dev/null
+++ b/target/sh4/meson.build
@@ -0,0 +1,14 @@
+sh4_ss = ss.source_set()
+sh4_ss.add(files(
+ 'cpu.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+))
+
+sh4_softmmu_ss = ss.source_set()
+sh4_softmmu_ss.add(files('monitor.c'))
+
+target_arch += {'sh4': sh4_ss}
+target_softmmu_arch += {'sh4': sh4_softmmu_ss}
diff --git a/target/sparc/Makefile.objs b/target/sparc/Makefile.objs
deleted file mode 100644
index ec90569..0000000
--- a/target/sparc/Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-obj-$(CONFIG_SOFTMMU) += machine.o monitor.o
-obj-y += translate.o helper.o cpu.o
-obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
-obj-$(TARGET_SPARC) += int32_helper.o
-obj-$(TARGET_SPARC64) += int64_helper.o
-obj-$(TARGET_SPARC64) += vis_helper.o
-obj-y += gdbstub.o
diff --git a/target/sparc/meson.build b/target/sparc/meson.build
new file mode 100644
index 0000000..a3638b9
--- /dev/null
+++ b/target/sparc/meson.build
@@ -0,0 +1,23 @@
+sparc_ss = ss.source_set()
+sparc_ss.add(files(
+ 'cc_helper.c',
+ 'cpu.c',
+ 'fop_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'ldst_helper.c',
+ 'mmu_helper.c',
+ 'translate.c',
+ 'win_helper.c',
+))
+sparc_ss.add(when: 'TARGET_SPARC', if_true: files('int32_helper.c'))
+sparc_ss.add(when: 'TARGET_SPARC64', if_true: files('int64_helper.c', 'vis_helper.c'))
+
+sparc_softmmu_ss = ss.source_set()
+sparc_softmmu_ss.add(files(
+ 'machine.c',
+ 'monitor.c',
+))
+
+target_arch += {'sparc': sparc_ss}
+target_softmmu_arch += {'sparc': sparc_softmmu_ss}
diff --git a/target/tilegx/Makefile.objs b/target/tilegx/Makefile.objs
deleted file mode 100644
index 0db778f..0000000
--- a/target/tilegx/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += cpu.o translate.o helper.o simd_helper.o
diff --git a/target/tilegx/meson.build b/target/tilegx/meson.build
new file mode 100644
index 0000000..6785904
--- /dev/null
+++ b/target/tilegx/meson.build
@@ -0,0 +1,13 @@
+tilegx_ss = ss.source_set()
+tilegx_ss.add(files(
+ 'cpu.c',
+ 'helper.c',
+ 'simd_helper.c',
+ 'translate.c',
+))
+tilegx_ss.add(zlib)
+
+tilegx_softmmu_ss = ss.source_set()
+
+target_arch += {'tilegx': tilegx_ss}
+target_softmmu_arch += {'tilegx': tilegx_softmmu_ss}
diff --git a/target/tricore/Makefile.objs b/target/tricore/Makefile.objs
deleted file mode 100644
index 281b55f..0000000
--- a/target/tricore/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += translate.o helper.o cpu.o op_helper.o fpu_helper.o gdbstub.o
diff --git a/target/tricore/meson.build b/target/tricore/meson.build
new file mode 100644
index 0000000..0ccc829
--- /dev/null
+++ b/target/tricore/meson.build
@@ -0,0 +1,15 @@
+tricore_ss = ss.source_set()
+tricore_ss.add(files(
+ 'cpu.c',
+ 'fpu_helper.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+ 'gdbstub.c',
+))
+tricore_ss.add(zlib)
+
+tricore_softmmu_ss = ss.source_set()
+
+target_arch += {'tricore': tricore_ss}
+target_softmmu_arch += {'tricore': tricore_softmmu_ss}
diff --git a/target/unicore32/Makefile.objs b/target/unicore32/Makefile.objs
deleted file mode 100644
index 35d8bf5..0000000
--- a/target/unicore32/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-y += ucf64_helper.o
-
-obj-$(CONFIG_SOFTMMU) += softmmu.o
-
-# Huh? Uses curses directly instead of using ui/console.h interfaces ...
-helper.o-cflags := $(CURSES_CFLAGS)
-helper.o-libs := $(CURSES_LIBS)
diff --git a/target/unicore32/meson.build b/target/unicore32/meson.build
new file mode 100644
index 0000000..0fa7877
--- /dev/null
+++ b/target/unicore32/meson.build
@@ -0,0 +1,14 @@
+unicore32_ss = ss.source_set()
+unicore32_ss.add(files(
+ 'cpu.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+ 'ucf64_helper.c',
+), curses)
+
+unicore32_softmmu_ss = ss.source_set()
+unicore32_softmmu_ss.add(files('softmmu.c'))
+
+target_arch += {'unicore32': unicore32_ss}
+target_softmmu_arch += {'unicore32': unicore32_softmmu_ss}
diff --git a/target/xtensa/Makefile.objs b/target/xtensa/Makefile.objs
deleted file mode 100644
index c7e7fe6..0000000
--- a/target/xtensa/Makefile.objs
+++ /dev/null
@@ -1,16 +0,0 @@
-obj-y += core-dc232b.o
-obj-y += core-dc233c.o
-obj-y += core-de212.o
-obj-y += core-fsf.o
-obj-y += core-sample_controller.o
-obj-y += core-test_kc705_be.o
-obj-y += core-test_mmuhifi_c3.o
-obj-$(CONFIG_SOFTMMU) += monitor.o xtensa-semi.o
-obj-y += xtensa-isa.o
-obj-y += translate.o op_helper.o helper.o cpu.o
-obj-$(CONFIG_SOFTMMU) += dbg_helper.o
-obj-y += exc_helper.o
-obj-y += fpu_helper.o
-obj-y += gdbstub.o
-obj-$(CONFIG_SOFTMMU) += mmu_helper.o
-obj-y += win_helper.o
diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build
new file mode 100644
index 0000000..27e453e
--- /dev/null
+++ b/target/xtensa/meson.build
@@ -0,0 +1,30 @@
+xtensa_ss = ss.source_set()
+xtensa_ss.add(files(
+ 'core-dc232b.c',
+ 'core-dc233c.c',
+ 'core-de212.c',
+ 'core-fsf.c',
+ 'core-sample_controller.c',
+ 'core-test_kc705_be.c',
+ 'core-test_mmuhifi_c3.c',
+ 'cpu.c',
+ 'exc_helper.c',
+ 'fpu_helper.c',
+ 'gdbstub.c',
+ 'helper.c',
+ 'op_helper.c',
+ 'translate.c',
+ 'win_helper.c',
+ 'xtensa-isa.c',
+))
+
+xtensa_softmmu_ss = ss.source_set()
+xtensa_softmmu_ss.add(files(
+ 'dbg_helper.c',
+ 'mmu_helper.c',
+ 'monitor.c',
+ 'xtensa-semi.c',
+))
+
+target_arch += {'xtensa': xtensa_ss}
+target_softmmu_arch += {'xtensa': xtensa_softmmu_ss}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 125/143] meson: accel
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (123 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 124/143] meson: target Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 126/143] meson: linux-user Paolo Bonzini
` (22 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 +-
Makefile.target | 1 -
accel/Makefile.objs | 6 ------
accel/kvm/Makefile.objs | 2 --
accel/kvm/meson.build | 5 +++++
accel/meson.build | 7 +++++++
accel/stubs/Makefile.objs | 6 ------
accel/stubs/meson.build | 6 ++++++
accel/tcg/Makefile.objs | 9 ---------
accel/tcg/meson.build | 15 +++++++++++++++
accel/xen/Makefile.objs | 1 -
accel/xen/meson.build | 1 +
meson.build | 1 +
13 files changed, 36 insertions(+), 26 deletions(-)
delete mode 100644 accel/Makefile.objs
delete mode 100644 accel/kvm/Makefile.objs
create mode 100644 accel/kvm/meson.build
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
create mode 100644 accel/tcg/meson.build
delete mode 100644 accel/xen/Makefile.objs
create mode 100644 accel/xen/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 7eaf047..40e23a2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -38,7 +38,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = accel/
+common-obj-y =
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
diff --git a/Makefile.target b/Makefile.target
index 1ab8773..8633e2b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -110,7 +110,6 @@ obj-y += trace/
#########################################################
# cpu emulator library
obj-y += exec.o exec-vary.o
-obj-y += accel/
obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-gvec.o
obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o
obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o
diff --git a/accel/Makefile.objs b/accel/Makefile.objs
deleted file mode 100644
index ff72f0d..0000000
--- a/accel/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-common-obj-$(CONFIG_SOFTMMU) += accel.o
-obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) += qtest.o
-obj-$(CONFIG_KVM) += kvm/
-obj-$(CONFIG_TCG) += tcg/
-obj-$(CONFIG_XEN) += xen/
-obj-y += stubs/
diff --git a/accel/kvm/Makefile.objs b/accel/kvm/Makefile.objs
deleted file mode 100644
index fdfa481..0000000
--- a/accel/kvm/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += kvm-all.o
-obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o
diff --git a/accel/kvm/meson.build b/accel/kvm/meson.build
new file mode 100644
index 0000000..4db2388
--- /dev/null
+++ b/accel/kvm/meson.build
@@ -0,0 +1,5 @@
+kvm_ss = ss.source_set()
+kvm_ss.add(files('kvm-all.c'))
+kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
+
+specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
diff --git a/accel/meson.build b/accel/meson.build
new file mode 100644
index 0000000..26c503e
--- /dev/null
+++ b/accel/meson.build
@@ -0,0 +1,7 @@
+softmmu_ss.add(files('accel.c'))
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: files('qtest.c'))
+
+subdir('kvm')
+subdir('tcg')
+subdir('xen')
+subdir('stubs')
diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs
deleted file mode 100644
index bbd14e7..0000000
--- a/accel/stubs/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o
-obj-$(call lnot,$(CONFIG_HVF)) += hvf-stub.o
-obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
-obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
new file mode 100644
index 0000000..314e3cf
--- /dev/null
+++ b/accel/stubs/meson.build
@@ -0,0 +1,6 @@
+specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c'))
+specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
+specific_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c'))
+specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
+specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
+specific_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))
diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs
deleted file mode 100644
index a92f2c4..0000000
--- a/accel/tcg/Makefile.objs
+++ /dev/null
@@ -1,9 +0,0 @@
-obj-$(CONFIG_SOFTMMU) += tcg-all.o
-obj-$(CONFIG_SOFTMMU) += cputlb.o
-obj-y += tcg-runtime.o tcg-runtime-gvec.o
-obj-y += cpu-exec.o cpu-exec-common.o translate-all.o
-obj-y += translator.o
-
-obj-$(CONFIG_USER_ONLY) += user-exec.o
-obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o
-obj-$(CONFIG_PLUGIN) += plugin-gen.o
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
new file mode 100644
index 0000000..2a335b5
--- /dev/null
+++ b/accel/tcg/meson.build
@@ -0,0 +1,15 @@
+tcg_ss = ss.source_set()
+tcg_ss.add(files(
+ 'cpu-exec-common.c',
+ 'cpu-exec.c',
+ 'tcg-runtime-gvec.c',
+ 'tcg-runtime.c',
+ 'translate-all.c',
+ 'translator.c',
+))
+tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
+tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c'))
+tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: files('plugin-gen.c'))
+specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
+
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tcg-all.c', 'cputlb.c'))
diff --git a/accel/xen/Makefile.objs b/accel/xen/Makefile.objs
deleted file mode 100644
index 7482cfb..0000000
--- a/accel/xen/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += xen-all.o
diff --git a/accel/xen/meson.build b/accel/xen/meson.build
new file mode 100644
index 0000000..002bdb0
--- /dev/null
+++ b/accel/xen/meson.build
@@ -0,0 +1 @@
+specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c'))
diff --git a/meson.build b/meson.build
index 3e51340..2b2f597 100644
--- a/meson.build
+++ b/meson.build
@@ -677,6 +677,7 @@ subdir('monitor')
subdir('net')
subdir('replay')
subdir('hw')
+subdir('accel')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 126/143] meson: linux-user
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (124 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 125/143] meson: accel Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 127/143] meson: bsd-user Paolo Bonzini
` (21 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 3 ---
configure | 27 ++++++++++++---------------
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/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 +++++
meson.build | 16 +++++++++++++++-
41 files changed, 165 insertions(+), 132 deletions(-)
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
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
diff --git a/Makefile.target b/Makefile.target
index 8633e2b..a68859d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -131,9 +131,6 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/linux-user \
-Ilinux-user/$(TARGET_ABI_DIR)
-obj-y += linux-user/
-obj-y += gdbstub.o thunk.o
-
endif #CONFIG_LINUX_USER
#########################################################
diff --git a/configure b/configure
index 3483d6c..525f415 100755
--- a/configure
+++ b/configure
@@ -1945,20 +1945,6 @@ fi
# Remove old dependency files to make sure that they get properly regenerated
rm -f */config-devices.mak.d
-# Remove syscall_nr.h to be sure they will be regenerated in the build
-# directory, not in the source directory
-for arch in alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc sparc64 \
- i386 x86_64 mips mips64 ; do
- # remove the file if it has been generated in the source directory
- rm -f "${source_path}/linux-user/${arch}/syscall_nr.h"
- # remove the dependency files
- for target in ${arch}*-linux-user ; do
- test -d "${target}" && find "${target}" -type f -name "*.d" \
- -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {} \; \
- -print | while read file ; do rm "${file}" "${file%.d}.o" ; done
- done
-done
-
if test -z "$python"
then
error_exit "Python not found. Use --python=/path/to/python"
@@ -7925,18 +7911,22 @@ gdb_xml_files=""
TARGET_ARCH="$target_name"
TARGET_BASE_ARCH=""
TARGET_ABI_DIR=""
+TARGET_SYSTBL_ABI=""
+TARGET_SYSTBL=""
case "$target_name" in
i386)
mttcg="yes"
gdb_xml_files="i386-32bit.xml"
TARGET_SYSTBL_ABI=i386
+ TARGET_SYSTBL=syscall_32.tbl
;;
x86_64)
TARGET_BASE_ARCH=i386
TARGET_SYSTBL_ABI=common,64
+ TARGET_SYSTBL=syscall_64.tbl
mttcg="yes"
- gdb_xml_files="i386-64bit.xml"
+ gdb_xml_files="i386-64bit.xml"
;;
alpha)
mttcg="yes"
@@ -7984,6 +7974,7 @@ case "$target_name" in
TARGET_ARCH=mips
echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
TARGET_SYSTBL_ABI=o32
+ TARGET_SYSTBL=syscall_o32.tbl
;;
mipsn32|mipsn32el)
mttcg="yes"
@@ -7992,6 +7983,7 @@ case "$target_name" in
echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
echo "TARGET_ABI32=y" >> $config_target_mak
TARGET_SYSTBL_ABI=n32
+ TARGET_SYSTBL=syscall_n32.tbl
;;
mips64|mips64el)
mttcg="no"
@@ -7999,6 +7991,7 @@ case "$target_name" in
TARGET_BASE_ARCH=mips
echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
TARGET_SYSTBL_ABI=n64
+ TARGET_SYSTBL=syscall_n64.tbl
;;
moxie)
;;
@@ -8097,6 +8090,9 @@ esac
if [ "$TARGET_BASE_ARCH" = "" ]; then
TARGET_BASE_ARCH=$TARGET_ARCH
fi
+if [ "$TARGET_SYSTBL_ABI" != "" ] && [ "$TARGET_SYSTBL" = "" ]; then
+ TARGET_SYSTBL=syscall.tbl
+fi
symlink "$source_path/Makefile.target" "$target_dir/Makefile"
@@ -8117,6 +8113,7 @@ if [ "$HOST_VARIANT_DIR" != "" ]; then
fi
if [ "$TARGET_SYSTBL_ABI" != "" ]; then
echo "TARGET_SYSTBL_ABI=$TARGET_SYSTBL_ABI" >> $config_target_mak
+ echo "TARGET_SYSTBL=$TARGET_SYSTBL" >> $config_target_mak
fi
if supported_xen_target $target; then
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
deleted file mode 100644
index 1940910..0000000
--- a/linux-user/Makefile.objs
+++ /dev/null
@@ -1,25 +0,0 @@
-obj-y = main.o syscall.o strace.o mmap.o signal.o \
- elfload.o linuxload.o uaccess.o uname.o \
- safe-syscall.o $(TARGET_ABI_DIR)/signal.o \
- $(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o
-
-obj-$(TARGET_HAS_BFLT) += flatload.o
-obj-$(TARGET_I386) += vm86.o
-obj-$(TARGET_AARCH64) += arm/semihost.o
-
-obj-$(TARGET_ALPHA) += alpha/
-obj-$(TARGET_ARM) += arm/
-obj-$(TARGET_HPPA) += hppa/
-obj-$(TARGET_I386) += i386/
-obj-$(TARGET_M68K) += m68k/
-obj-$(TARGET_MICROBLAZE) += microblaze/
-obj-$(TARGET_MIPS) += mips/
-obj-$(TARGET_MIPS64) += mips64/
-obj-$(TARGET_PPC) += ppc/
-obj-$(TARGET_PPC64) += ppc/
-obj-$(TARGET_S390X) += s390x/
-obj-$(TARGET_SH4) += sh4/
-obj-$(TARGET_SPARC) += sparc/
-obj-$(TARGET_SPARC64) += $(TARGET_ABI_DIR)/
-obj-$(TARGET_X86_64) += x86_64/
-obj-$(TARGET_XTENSA) += xtensa/
diff --git a/linux-user/alpha/Makefile.objs b/linux-user/alpha/Makefile.objs
deleted file mode 100644
index d6397a7..0000000
--- a/linux-user/alpha/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/alpha/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/alpha/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/alpha/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/alpha/meson.build b/linux-user/alpha/meson.build
new file mode 100644
index 0000000..a3cd22d
--- /dev/null
+++ b/linux-user/alpha/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'alpha': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/arm/Makefile.objs b/linux-user/arm/Makefile.objs
deleted file mode 100644
index c7eb94d..0000000
--- a/linux-user/arm/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-obj-$(TARGET_ARM) += nwfpe/
-obj-$(TARGET_ARM) += semihost.o
-
-generated-files-y += linux-user/arm/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/arm/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/arm/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/arm/meson.build b/linux-user/arm/meson.build
new file mode 100644
index 0000000..432984b
--- /dev/null
+++ b/linux-user/arm/meson.build
@@ -0,0 +1,10 @@
+linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('semihost.c'))
+linux_user_ss.add(when: 'TARGET_ARM', if_true: files('semihost.c'))
+
+subdir('nwfpe')
+
+syscall_nr_generators += {
+ 'arm': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/arm/nwfpe/Makefile.objs b/linux-user/arm/nwfpe/Makefile.objs
deleted file mode 100644
index 51b0c32..0000000
--- a/linux-user/arm/nwfpe/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
diff --git a/linux-user/arm/nwfpe/meson.build b/linux-user/arm/nwfpe/meson.build
new file mode 100644
index 0000000..1c27e55
--- /dev/null
+++ b/linux-user/arm/nwfpe/meson.build
@@ -0,0 +1,10 @@
+linux_user_ss.add(when: 'TARGET_ARM', if_true: files(
+ 'double_cpdo.c',
+ 'extended_cpdo.c',
+ 'fpa11.c',
+ 'fpa11_cpdo.c',
+ 'fpa11_cpdt.c',
+ 'fpa11_cprt.c',
+ 'fpopcode.c',
+ 'single_cpdo.c',
+))
diff --git a/linux-user/hppa/Makefile.objs b/linux-user/hppa/Makefile.objs
deleted file mode 100644
index f8368be..0000000
--- a/linux-user/hppa/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/hppa/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/hppa/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/hppa/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/hppa/meson.build b/linux-user/hppa/meson.build
new file mode 100644
index 0000000..4709508
--- /dev/null
+++ b/linux-user/hppa/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'hppa': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/i386/Makefile.objs b/linux-user/i386/Makefile.objs
deleted file mode 100644
index c25cf17..0000000
--- a/linux-user/i386/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/i386/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/i386/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/i386/syscall_32.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/i386/meson.build b/linux-user/i386/meson.build
new file mode 100644
index 0000000..ee52301
--- /dev/null
+++ b/linux-user/i386/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'i386': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
new file mode 100644
index 0000000..976caab
--- /dev/null
+++ b/linux-user/i386/syscall_nr.h
@@ -0,0 +1 @@
+#include "syscall_32_nr.h"
diff --git a/linux-user/m68k/Makefile.objs b/linux-user/m68k/Makefile.objs
deleted file mode 100644
index 961bd05..0000000
--- a/linux-user/m68k/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/m68k/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/m68k/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/m68k/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/m68k/meson.build b/linux-user/m68k/meson.build
new file mode 100644
index 0000000..c0f436f
--- /dev/null
+++ b/linux-user/m68k/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'm68k': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/meson.build b/linux-user/meson.build
new file mode 100644
index 0000000..2b94e4b
--- /dev/null
+++ b/linux-user/meson.build
@@ -0,0 +1,37 @@
+linux_user_ss.add(files(
+ 'elfload.c',
+ 'exit.c',
+ 'fd-trans.c',
+ 'linuxload.c',
+ 'main.c',
+ 'mmap.c',
+ 'safe-syscall.S',
+ 'signal.c',
+ 'strace.c',
+ 'syscall.c',
+ 'uaccess.c',
+ 'uname.c',
+))
+linux_user_ss.add(rt)
+
+linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c'))
+linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c'))
+
+
+syscall_nr_generators = {}
+
+subdir('alpha')
+subdir('arm')
+subdir('hppa')
+subdir('i386')
+subdir('m68k')
+subdir('microblaze')
+subdir('mips64')
+subdir('mips')
+subdir('ppc')
+subdir('s390x')
+subdir('sh4')
+subdir('sparc64')
+subdir('sparc')
+subdir('x86_64')
+subdir('xtensa')
diff --git a/linux-user/microblaze/Makefile.objs b/linux-user/microblaze/Makefile.objs
deleted file mode 100644
index bb8b318..0000000
--- a/linux-user/microblaze/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/microblaze/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/microblaze/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/microblaze/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/microblaze/meson.build b/linux-user/microblaze/meson.build
new file mode 100644
index 0000000..f749d89
--- /dev/null
+++ b/linux-user/microblaze/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'microblaze': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/mips/Makefile.objs b/linux-user/mips/Makefile.objs
deleted file mode 100644
index 9be4de0..0000000
--- a/linux-user/mips/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/mips/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/mips/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/mips/syscall_o32.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI) "" 4000,"GEN","$@")
diff --git a/linux-user/mips/meson.build b/linux-user/mips/meson.build
new file mode 100644
index 0000000..6066a50
--- /dev/null
+++ b/linux-user/mips/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'mips': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/mips/syscall_nr.h b/linux-user/mips/syscall_nr.h
new file mode 100644
index 0000000..45d133c
--- /dev/null
+++ b/linux-user/mips/syscall_nr.h
@@ -0,0 +1 @@
+#include "syscall_o32_nr.h"
diff --git a/linux-user/mips64/Makefile.objs b/linux-user/mips64/Makefile.objs
deleted file mode 100644
index 573448f..0000000
--- a/linux-user/mips64/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-generated-files-y += linux-user/$(TARGET_ABI_DIR)/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh
-
-ifeq ($(TARGET_SYSTBL_ABI),n32)
-%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n32.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ n32 "" 6000,"GEN","$@")
-endif
-ifeq ($(TARGET_SYSTBL_ABI),n64)
-%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n64.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ n64 "" 5000,"GEN","$@")
-endif
diff --git a/linux-user/mips64/meson.build b/linux-user/mips64/meson.build
new file mode 100644
index 0000000..0caab5f
--- /dev/null
+++ b/linux-user/mips64/meson.build
@@ -0,0 +1,6 @@
+syscall_nr_generators += {
+ 'mips64': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@',
+ '', 'TARGET_SYSCALL_OFFSET' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/mips64/syscall_nr.h b/linux-user/mips64/syscall_nr.h
new file mode 100644
index 0000000..672f2fa
--- /dev/null
+++ b/linux-user/mips64/syscall_nr.h
@@ -0,0 +1,7 @@
+#ifdef TARGET_ABI_MIPSN32
+#define TARGET_SYSCALL_OFFSET 6000
+#include "syscall_n32_nr.h"
+#else
+#define TARGET_SYSCALL_OFFSET 5000
+#include "syscall_n64_nr.h"
+#endif
diff --git a/linux-user/ppc/Makefile.objs b/linux-user/ppc/Makefile.objs
deleted file mode 100644
index be92e67..0000000
--- a/linux-user/ppc/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-generated-files-y += linux-user/$(TARGET_ABI_DIR)/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh
-
-%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/ppc/meson.build b/linux-user/ppc/meson.build
new file mode 100644
index 0000000..19fead7
--- /dev/null
+++ b/linux-user/ppc/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'ppc': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/s390x/Makefile.objs b/linux-user/s390x/Makefile.objs
deleted file mode 100644
index f30f162..0000000
--- a/linux-user/s390x/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/s390x/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/s390x/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/s390x/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/s390x/meson.build b/linux-user/s390x/meson.build
new file mode 100644
index 0000000..0781cce
--- /dev/null
+++ b/linux-user/s390x/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 's390x': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/sh4/Makefile.objs b/linux-user/sh4/Makefile.objs
deleted file mode 100644
index 83fc939..0000000
--- a/linux-user/sh4/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/sh4/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/sh4/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/sh4/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/sh4/meson.build b/linux-user/sh4/meson.build
new file mode 100644
index 0000000..3bc3a69
--- /dev/null
+++ b/linux-user/sh4/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'sh4': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/sparc/Makefile.objs b/linux-user/sparc/Makefile.objs
deleted file mode 100644
index 29d3f06..0000000
--- a/linux-user/sparc/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/sparc/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/sparc/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/sparc/meson.build b/linux-user/sparc/meson.build
new file mode 100644
index 0000000..51a9c77
--- /dev/null
+++ b/linux-user/sparc/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'sparc': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/sparc64/Makefile.objs b/linux-user/sparc64/Makefile.objs
deleted file mode 100644
index afcd535..0000000
--- a/linux-user/sparc64/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/sparc64/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/sparc64/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/sparc64/meson.build b/linux-user/sparc64/meson.build
new file mode 100644
index 0000000..9527a40
--- /dev/null
+++ b/linux-user/sparc64/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'sparc64': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/x86_64/Makefile.objs b/linux-user/x86_64/Makefile.objs
deleted file mode 100644
index 2cef1d4..0000000
--- a/linux-user/x86_64/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/x86_64/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/x86_64/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/x86_64/syscall_64.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/x86_64/meson.build b/linux-user/x86_64/meson.build
new file mode 100644
index 0000000..203af9a
--- /dev/null
+++ b/linux-user/x86_64/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'x86_64': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
new file mode 100644
index 0000000..760302c
--- /dev/null
+++ b/linux-user/x86_64/syscall_nr.h
@@ -0,0 +1 @@
+#include "syscall_64_nr.h"
diff --git a/linux-user/xtensa/Makefile.objs b/linux-user/xtensa/Makefile.objs
deleted file mode 100644
index d4be1b7..0000000
--- a/linux-user/xtensa/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-generated-files-y += linux-user/xtensa/syscall_nr.h
-
-syshdr := $(SRC_PATH)/linux-user/xtensa/syscallhdr.sh
-%/syscall_nr.h: $(SRC_PATH)/linux-user/xtensa/syscall.tbl $(syshdr)
- $(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")
diff --git a/linux-user/xtensa/meson.build b/linux-user/xtensa/meson.build
new file mode 100644
index 0000000..de77f3b
--- /dev/null
+++ b/linux-user/xtensa/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+ 'xtensa': generator(sh,
+ arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+ output: '@BASENAME@_nr.h')
+}
diff --git a/meson.build b/meson.build
index 2b2f597..483e65f 100644
--- a/meson.build
+++ b/meson.build
@@ -678,6 +678,10 @@ subdir('net')
subdir('replay')
subdir('hw')
subdir('accel')
+subdir('linux-user')
+
+linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
+specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
@@ -775,6 +779,7 @@ foreach target : target_dirs
arch_srcs += config_devices_h[target]
else
+ abi = config_target['TARGET_ABI_DIR']
target_type='user'
qemu_target_name = 'qemu-' + target_name
if 'CONFIG_LINUX_USER' in config_target
@@ -785,8 +790,17 @@ foreach target : target_dirs
endif
target_inc += include_directories(
base_dir,
- base_dir / config_target['TARGET_ABI_DIR'],
+ base_dir / abi,
)
+ if 'CONFIG_LINUX_USER' in config_target
+ dir = base_dir / abi
+ arch_srcs += files(dir / 'signal.c', dir / 'cpu_loop.c')
+ if config_target.has_key('TARGET_SYSTBL_ABI')
+ arch_srcs += \
+ syscall_nr_generators[abi].process(base_dir / abi / config_target['TARGET_SYSTBL'],
+ extra_args : config_target['TARGET_SYSTBL_ABI'])
+ endif
+ endif
endif
t = target_arch[arch].apply(config_target, strict: false)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 127/143] meson: bsd-user
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (125 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 126/143] meson: linux-user Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 128/143] meson: cpu-emu Paolo Bonzini
` (20 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 3 ---
bsd-user/Makefile.objs | 2 --
bsd-user/meson.build | 10 ++++++++++
meson.build | 4 ++++
4 files changed, 14 insertions(+), 5 deletions(-)
delete mode 100644 bsd-user/Makefile.objs
create mode 100644 bsd-user/meson.build
diff --git a/Makefile.target b/Makefile.target
index a68859d..5c099fa 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -141,9 +141,6 @@ ifdef CONFIG_BSD_USER
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR)
-obj-y += bsd-user/
-obj-y += gdbstub.o
-
endif #CONFIG_BSD_USER
#########################################################
diff --git a/bsd-user/Makefile.objs b/bsd-user/Makefile.objs
deleted file mode 100644
index 5e77f57..0000000
--- a/bsd-user/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \
- uaccess.o
diff --git a/bsd-user/meson.build b/bsd-user/meson.build
new file mode 100644
index 0000000..0369549
--- /dev/null
+++ b/bsd-user/meson.build
@@ -0,0 +1,10 @@
+bsd_user_ss.add(files(
+ 'bsdload.c',
+ 'elfload.c',
+ 'main.c',
+ 'mmap.c',
+ 'signal.c',
+ 'strace.c',
+ 'syscall.c',
+ 'uaccess.c',
+))
diff --git a/meson.build b/meson.build
index 483e65f..e1d7672 100644
--- a/meson.build
+++ b/meson.build
@@ -678,8 +678,12 @@ subdir('net')
subdir('replay')
subdir('hw')
subdir('accel')
+subdir('bsd-user')
subdir('linux-user')
+bsd_user_ss.add(files('gdbstub.c'))
+specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
+
linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 128/143] meson: cpu-emu
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (126 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 127/143] meson: bsd-user Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 129/143] meson: plugins Paolo Bonzini
` (19 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 12 ------------
configure | 8 ++++++++
meson.build | 37 +++++++++++++++++++++++++++++++++++++
scripts/feature_to_c.sh | 24 ++++++++----------------
4 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 5c099fa..c180b4c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -108,15 +108,6 @@ obj-y += $(LIBQEMU)
obj-y += trace/
#########################################################
-# cpu emulator library
-obj-y += exec.o exec-vary.o
-obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-gvec.o
-obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/optimize.o
-obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o
-obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
-obj-$(CONFIG_TCG) += fpu/softfloat.o
-obj-y += disas.o
-obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
LIBS := $(libs_cpu) $(LIBS)
obj-$(CONFIG_PLUGIN) += plugins/
@@ -200,9 +191,6 @@ ifdef CONFIG_DARWIN
$(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@")
endif
-gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
- $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
-
clean: clean-target
rm -f *.a *~ $(PROGS)
rm -f $(shell find . -name '*.[od]')
diff --git a/configure b/configure
index 525f415..a7a4538 100755
--- a/configure
+++ b/configure
@@ -5416,9 +5416,13 @@ case "$capstone" in
LIBCAPSTONE=libcapstone.a
fi
libs_cpu="-L$PWD/capstone -lcapstone $libs_cpu"
+ capstone_libs="-L$PWD/capstone -lcapstone"
+ capstone_cflags="-I${source_path}/capstone/include"
;;
system)
+ capstone_libs="$($pkg_config --libs capstone)"
+ capstone_cflags="$($pkg_config --cflags capstone)"
QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"
libs_cpu="$($pkg_config --libs capstone) $libs_cpu"
;;
@@ -7637,6 +7641,8 @@ if test "$ivshmem" = "yes" ; then
fi
if test "$capstone" != "no" ; then
echo "CONFIG_CAPSTONE=y" >> $config_host_mak
+ echo "CAPSTONE_CFLAGS=$capstone_cflags" >> $config_host_mak
+ echo "CAPSTONE_LIBS=$capstone_libs" >> $config_host_mak
fi
if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
@@ -7657,6 +7663,8 @@ fi
if test "$libpmem" = "yes" ; then
echo "CONFIG_LIBPMEM=y" >> $config_host_mak
+ echo "LIBPMEM_LIBS=$libpmem_libs" >> $config_host_mak
+ echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak
fi
if test "$libdaxctl" = "yes" ; then
diff --git a/meson.build b/meson.build
index e1d7672..7ed8276 100644
--- a/meson.build
+++ b/meson.build
@@ -328,6 +328,16 @@ if 'CONFIG_USB_LIBUSB' in config_host
libusb = declare_dependency(compile_args: config_host['LIBUSB_CFLAGS'].split(),
link_args: config_host['LIBUSB_LIBS'].split())
endif
+capstone = not_found
+if 'CONFIG_CAPSTONE' in config_host
+ capstone = declare_dependency(compile_args: config_host['CAPSTONE_CFLAGS'].split(),
+ link_args: config_host['CAPSTONE_LIBS'].split())
+endif
+libpmem = not_found
+if 'CONFIG_LIBPMEM' in config_host
+ libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(),
+ link_args: config_host['LIBPMEM_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -505,6 +515,8 @@ target_softmmu_arch = {}
# Trace files #
###############
+# TODO: add each directory to the subdirs from its own meson.build, once
+# we have those
trace_events_subdirs = [
'accel/kvm',
'accel/tcg',
@@ -670,6 +682,20 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
subdir('softmmu')
+
+specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem)
+specific_ss.add(files('exec-vary.c'))
+specific_ss.add(when: 'CONFIG_TCG', if_true: files(
+ 'fpu/softfloat.c',
+ 'tcg/optimize.c',
+ 'tcg/tcg-common.c',
+ 'tcg/tcg-op-gvec.c',
+ 'tcg/tcg-op-vec.c',
+ 'tcg/tcg-op.c',
+ 'tcg/tcg.c',
+))
+specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c', 'tcg/tci.c'))
+
subdir('backends')
subdir('disas')
subdir('migration')
@@ -761,6 +787,8 @@ common_all = static_library('common',
dependencies: common_all.dependencies(),
name_suffix: 'fa')
+feature_to_c = find_program('scripts/feature_to_c.sh')
+
foreach target : target_dirs
config_target = config_target_mak[target]
target_name = config_target['TARGET_NAME']
@@ -807,6 +835,15 @@ foreach target : target_dirs
endif
endif
+ if 'TARGET_XML_FILES' in config_target
+ gdbstub_xml = custom_target(target + '-gdbstub-xml.c',
+ output: target + '-gdbstub-xml.c',
+ input: files(config_target['TARGET_XML_FILES'].split()),
+ command: [feature_to_c, '@INPUT@'],
+ capture: true)
+ arch_srcs += gdbstub_xml
+ endif
+
t = target_arch[arch].apply(config_target, strict: false)
arch_srcs += t.sources()
diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh
index c8ce9b8..b116989 100644
--- a/scripts/feature_to_c.sh
+++ b/scripts/feature_to_c.sh
@@ -19,16 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
-output=$1
-shift
-
-if test -z "$output" || test -z "$1"; then
- echo "Usage: $0 OUTPUTFILE INPUTFILE..."
- exit 1
-fi
-
-if test -e "$output"; then
- echo "Output file \"$output\" already exists; refusing to overwrite."
+if test -z "$1"; then
+ echo "Usage: $0 INPUTFILE..."
exit 1
fi
@@ -60,17 +52,17 @@ for input; do
printf "'\''\\n'\'', \n"
} END {
print " 0 };"
- }' < $input >> $output
+ }' < $input
done
-echo >> $output
-echo "const char *const xml_builtin[][2] = {" >> $output
+echo
+echo "const char *const xml_builtin[][2] = {"
for input; do
basename=$(echo $input | sed 's,.*/,,')
arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g')
- echo " { \"$basename\", $arrayname }," >> $output
+ echo " { \"$basename\", $arrayname },"
done
-echo " { (char *)0, (char *)0 }" >> $output
-echo "};" >> $output
+echo " { (char *)0, (char *)0 }"
+echo "};"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 129/143] meson: plugins
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (127 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 128/143] meson: cpu-emu Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 130/143] meson: link emulators without Makefile.target Paolo Bonzini
` (18 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
For now link arguments end up in Makefile.target, they will move to the
right place soon.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 8 +-------
Makefile.target | 12 ++++++++++--
meson.build | 5 +++++
plugins/Makefile.objs | 21 ---------------------
plugins/meson.build | 5 +++++
5 files changed, 21 insertions(+), 30 deletions(-)
delete mode 100644 plugins/Makefile.objs
create mode 100644 plugins/meson.build
diff --git a/Makefile b/Makefile
index 2aaa3f8..5320a06 100644
--- a/Makefile
+++ b/Makefile
@@ -419,13 +419,10 @@ endif
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-install-includedir:
- $(INSTALL_DIR) "$(DESTDIR)$(includedir)"
-
# Needed by "meson install"
export DESTDIR
install: all $(if $(BUILD_DOCS),install-doc) \
- install-datadir install-localstatedir install-includedir \
+ install-datadir install-localstatedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install
ifdef CONFIG_TRACE_SYSTEMTAP
@@ -468,9 +465,6 @@ endif
ifdef CONFIG_GTK
$(MAKE) -C po $@
endif
-ifeq ($(CONFIG_PLUGIN),y)
- $(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h"
-endif
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
diff --git a/Makefile.target b/Makefile.target
index c180b4c..2b7280b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -110,8 +110,6 @@ obj-y += trace/
#########################################################
LIBS := $(libs_cpu) $(LIBS)
-obj-$(CONFIG_PLUGIN) += plugins/
-
#########################################################
# Linux user emulator target
@@ -153,6 +151,16 @@ LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
LIBS := $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS)
+ifeq ($(CONFIG_PLUGIN),y)
+ifdef CONFIG_HAS_LD_DYNAMIC_LIST
+LIBS += -Wl,--dynamic-list=$(BUILD_DIR)/qemu-plugins-ld.symbols
+else
+ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST
+LIBS += -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols
+endif
+endif
+endif
+
generated-files-y += hmp-commands.h hmp-commands-info.h
endif # CONFIG_SOFTMMU
diff --git a/meson.build b/meson.build
index 7ed8276..58f84e8 100644
--- a/meson.build
+++ b/meson.build
@@ -704,6 +704,7 @@ subdir('net')
subdir('replay')
subdir('hw')
subdir('accel')
+subdir('plugins')
subdir('bsd-user')
subdir('linux-user')
@@ -872,6 +873,10 @@ endforeach
# Other build targets
+if 'CONFIG_PLUGIN' in config_host
+ install_headers('include/qemu/qemu-plugin.h')
+endif
+
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
endif
diff --git a/plugins/Makefile.objs b/plugins/Makefile.objs
deleted file mode 100644
index 6f14d91..0000000
--- a/plugins/Makefile.objs
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Plugin Support
-#
-
-obj-y += loader.o
-obj-y += core.o
-obj-y += api.o
-
-# Abuse -libs suffix to only link with --dynamic-list/-exported_symbols_list
-# when the final binary includes the plugin object.
-#
-# Note that simply setting LDFLAGS is not enough: we build binaries that
-# never link plugin.o, and the linker might fail (at least ld64 does)
-# if the symbols in the list are not in the output binary.
-ifdef CONFIG_HAS_LD_DYNAMIC_LIST
-api.o-libs := -Wl,--dynamic-list=$(BUILD_DIR)/qemu-plugins-ld.symbols
-else
-ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST
-api.o-libs := -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols
-endif
-endif
diff --git a/plugins/meson.build b/plugins/meson.build
new file mode 100644
index 0000000..9608e52
--- /dev/null
+++ b/plugins/meson.build
@@ -0,0 +1,5 @@
+specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files(
+ 'loader.c',
+ 'core.c',
+ 'api.c',
+)])
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 130/143] meson: link emulators without Makefile.target
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (128 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 129/143] meson: plugins Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 131/143] meson: convert systemtap files Paolo Bonzini
` (17 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitlab-ci.yml | 4 +-
Makefile | 34 +------
Makefile.objs | 32 -------
Makefile.target | 153 +-----------------------------
configure | 22 ++---
docs/devel/blkverify.txt | 4 +-
docs/devel/testing.rst | 4 +-
docs/interop/live-block-operations.rst | 4 +-
meson.build | 81 +++++++++++++++-
os-posix.c | 2 +-
plugins/meson.build | 10 +-
rules.mak | 1 -
scripts/device-crash-test | 2 +-
softmmu/Makefile.objs | 3 -
softmmu/meson.build | 4 +
tests/Makefile.include | 2 +-
tests/acceptance/avocado_qemu/__init__.py | 3 +-
tests/data/acpi/rebuild-expected-aml.sh | 2 +-
tests/multiboot/run_test.sh | 2 +-
tests/qemu-iotests/check | 6 +-
tests/qtest/fuzz/Makefile.include | 39 --------
tests/qtest/fuzz/i440fx_fuzz.c | 4 +-
tests/qtest/fuzz/meson.build | 34 +++++++
tests/qtest/fuzz/virtio_net_fuzz.c | 3 +-
tests/qtest/libqos/qgraph.h | 2 +-
tests/qtest/meson.build | 2 +-
tests/qtest/rtas-test.c | 2 +-
tests/tcg/configure.sh | 4 +-
28 files changed, 161 insertions(+), 304 deletions(-)
delete mode 100644 softmmu/Makefile.objs
delete mode 100644 tests/qtest/fuzz/Makefile.include
create mode 100644 tests/qtest/fuzz/meson.build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9820066..f6556e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,5 +269,5 @@ build-tci:
./tests/qtest/boot-serial-test || exit 1 ;
./tests/qtest/cdrom-test || exit 1 ;
done
- - QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/pxe-test
- - QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x" ./tests/qtest/pxe-test -m slow
+ - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test
+ - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
diff --git a/Makefile b/Makefile
index 5320a06..1f89680 100644
--- a/Makefile
+++ b/Makefile
@@ -105,9 +105,6 @@ include $(SRC_PATH)/rules.mak
# lor is defined in rules.mak
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
-generated-files-y += target/s390x/gen-features.h
-target/s390x/gen-features.h: Makefile.ninja
-
generated-files-y += .git-submodule-status
edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))
@@ -172,29 +169,6 @@ config-host.h-timestamp: config-host.mak
TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), $(TARGET_DIRS)))
-SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
-$(SOFTMMU_ALL_RULES): $(authz-obj-y)
-$(SOFTMMU_ALL_RULES): $(block-obj-y)
-$(SOFTMMU_ALL_RULES): $(chardev-obj-y)
-$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
-$(SOFTMMU_ALL_RULES): $(io-obj-y)
-$(SOFTMMU_ALL_RULES): $(qom-obj-y)
-$(SOFTMMU_ALL_RULES): config-all-devices.mak
-
-SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
-$(SOFTMMU_FUZZ_RULES): $(authz-obj-y)
-$(SOFTMMU_FUZZ_RULES): $(block-obj-y)
-$(SOFTMMU_FUZZ_RULES): $(chardev-obj-y)
-$(SOFTMMU_FUZZ_RULES): $(crypto-obj-y)
-$(SOFTMMU_FUZZ_RULES): $(io-obj-y)
-$(SOFTMMU_FUZZ_RULES): config-all-devices.mak
-$(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)
-
-# meson: this is sub-optimal but going away after conversion
-TARGET_DEPS = $(patsubst %,%-config-target.h, $(TARGET_DIRS))
-TARGET_DEPS += $(patsubst %,%-config-devices.h, $(filter %-softmmu,$(TARGET_DIRS)))
-TARGET_DEPS += $(patsubst %,libqemu-%.fa, $(TARGET_DIRS))
-
.PHONY: $(TARGET_DIRS_RULES)
# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
@@ -237,11 +211,7 @@ slirp/all: .git-submodule-status
CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \
CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")
-$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
- $(qom-obj-y) block.syms qemu.syms
-
-$(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
- $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))
+$(filter %/all, $(TARGET_DIRS_RULES)):
ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
@@ -263,8 +233,6 @@ Makefile: $(version-obj-y)
######################################################################
-COMMON_LDADDS = libqemuutil.a
-
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/Makefile.objs b/Makefile.objs
index 40e23a2..9f73e86 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -33,37 +33,5 @@ io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
######################################################################
-# Target independent part of system emulation. The long term path is to
-# suppress *all* target specific code in case of system emulation, i.e. a
-# single QEMU executable should support all CPUs and machines.
-
-ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y =
-
-common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF)
-
-common-obj-$(if $(CONFIG_CURSES),m) += ui-curses$(DSOSUF)
-common-obj-$(if $(CONFIG_GTK),m) += ui-gtk$(DSOSUF)
-common-obj-$(if $(CONFIG_SDL),m) += ui-sdl$(DSOSUF)
-common-obj-$(if $(CONFIG_SPICE),m) += ui-spice-app$(DSOSUF)
-
-common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF)
-common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBNFS),m) += block-nfs$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBSSH),m) += block-ssh$(DSOSUF)
-common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
-
-common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
-common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF)
-
-common-obj-y += libqmp.fa
-
-endif # CONFIG_SOFTMMU
-
-######################################################################
# Resource file for Windows executables
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
diff --git a/Makefile.target b/Makefile.target
index 2b7280b..8ee4c78 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -6,43 +6,16 @@ include ../config-host.mak
include config-target.mak
include $(SRC_PATH)/rules.mak
-FULL_TARGET_NAME=$(TARGET_NAME)-$(if $(CONFIG_SOFTMMU),softmmu,linux-user)
-
-ifdef CONFIG_SOFTMMU
-include ../$(FULL_TARGET_NAME)-config-devices.mak
-endif
-
$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
-ifdef CONFIG_LINUX
-QEMU_CFLAGS += -isystem ../linux-headers
-endif
-QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H
-
-QEMU_CFLAGS+=-iquote $(SRC_PATH)/include
-
-QEMU_CFLAGS += -DCONFIG_TARGET=\"../$(FULL_TARGET_NAME)-config-target.h\"
-QEMU_CFLAGS += -DCONFIG_DEVICES=\"../$(FULL_TARGET_NAME)-config-devices.h\"
ifdef CONFIG_USER_ONLY
# user emulator name
QEMU_PROG=qemu-$(TARGET_NAME)
-QEMU_PROG_BUILD = $(QEMU_PROG)
else
# system emulator name
QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
-ifneq (,$(findstring -mwindows,$(SDL_LIBS)))
-# Terminate program name with a 'w' because the linker builds a windows executable.
-QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
-$(QEMU_PROG): $(QEMU_PROGW)
- $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG),"GEN","$(TARGET_DIR)$(QEMU_PROG)")
-QEMU_PROG_BUILD = $(QEMU_PROGW)
-else
-QEMU_PROG_BUILD = $(QEMU_PROG)
-endif
endif
-LIBQEMU = ../libqemu-$(FULL_TARGET_NAME).fa
-PROGS=$(QEMU_PROG) $(QEMU_PROGW)
STPFILES=
ifdef CONFIG_TRACE_SYSTEMTAP
@@ -98,109 +71,10 @@ stap:
endif
.PHONY: stap
-all: $(PROGS) stap
-
-# Dummy command so that make thinks it has done something
- @true
-
-obj-y += $(LIBQEMU)
-
-obj-y += trace/
-
-#########################################################
-LIBS := $(libs_cpu) $(LIBS)
-
-#########################################################
-# Linux user emulator target
-
-ifdef CONFIG_LINUX_USER
-
-QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
- -I$(SRC_PATH)/linux-user/host/$(ARCH) \
- -I$(SRC_PATH)/linux-user \
- -Ilinux-user/$(TARGET_ABI_DIR)
-
-endif #CONFIG_LINUX_USER
-
-#########################################################
-# BSD user emulator target
-
-ifdef CONFIG_BSD_USER
-
-QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \
- -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR)
-
-endif #CONFIG_BSD_USER
-
-#########################################################
-# System emulator target
-ifdef CONFIG_SOFTMMU
-obj-y += softmmu/
-obj-y += gdbstub.o
-LIBS := $(libs_softmmu) $(LIBS)
-
-# Temporary until emulators are linked by Meson
-LIBS := $(LIBS) @../block.syms @../qemu.syms
-ifneq ($(CONFIG_MODULES),y)
-LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS)
-LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS)
-endif
-LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS)
-LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
-LIBS := $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS)
-LIBS := $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS)
-LIBS := $(LIBS) $(VIRGL_LIBS) $(CURSES_LIBS)
-
-ifeq ($(CONFIG_PLUGIN),y)
-ifdef CONFIG_HAS_LD_DYNAMIC_LIST
-LIBS += -Wl,--dynamic-list=$(BUILD_DIR)/qemu-plugins-ld.symbols
-else
-ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST
-LIBS += -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols
-endif
-endif
-endif
-
-generated-files-y += hmp-commands.h hmp-commands-info.h
-
-endif # CONFIG_SOFTMMU
-
-dummy := $(call unnest-vars,,obj-y)
-all-obj-y := $(obj-y)
-
-include $(SRC_PATH)/Makefile.objs
-dummy := $(call fix-paths,../,, \
- authz-obj-y \
- block-obj-y \
- chardev-obj-y \
- crypto-obj-y \
- io-obj-y \
- qom-obj-y)
-dummy := $(call unnest-vars,..,common-obj-y)
-
-all-obj-y += $(common-obj-y)
-all-obj-y += $(qom-obj-y)
-all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y)
-all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)
-all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
-all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
-
-ifdef CONFIG_SOFTMMU
-$(QEMU_PROG_BUILD): ../$(FULL_TARGET_NAME)-config-devices.mak
-endif
-
-COMMON_LDADDS = ../libqemuutil.a
-
-# build either PROG or PROGW
-$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(softmmu-main-y)
- $(call LINK, $(filter-out %.mak, $^))
-ifdef CONFIG_DARWIN
- $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ","$(TARGET_DIR)$@")
- $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@")
-endif
+all: stap
-clean: clean-target
- rm -f *.a *~ $(PROGS)
+clean:
+ rm -f *.a *~
rm -f $(shell find . -name '*.[od]')
rm -f hmp-commands.h gdbstub-xml.c
rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp
@@ -208,26 +82,7 @@ ifdef CONFIG_TRACE_SYSTEMTAP
rm -f *.stp
endif
-ifdef CONFIG_FUZZ
-include $(SRC_PATH)/tests/qtest/fuzz/Makefile.include
-include $(SRC_PATH)/tests/qtest/Makefile.include
-
-fuzz: fuzz-vars
-fuzz-vars: QEMU_CFLAGS := $(FUZZ_CFLAGS) $(QEMU_CFLAGS)
-fuzz-vars: QEMU_LDFLAGS := $(FUZZ_LDFLAGS) $(QEMU_LDFLAGS)
-fuzz-vars: $(QEMU_PROG_FUZZ)
-dummy := $(call unnest-vars,, fuzz-obj-y)
-
-
-$(QEMU_PROG_FUZZ): config-devices.mak $(all-obj-y) $(COMMON_LDADDS) $(fuzz-obj-y)
- $(call LINK, $(filter-out %.mak, $^))
-
-endif
-
install: all
-ifneq ($(PROGS),)
- $(call install-prog,$(PROGS),$(DESTDIR)$(bindir))
-endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
$(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
@@ -235,4 +90,4 @@ ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp"
endif
-Makefile: $(generated-files-y)
+.PHONY: all clean install
diff --git a/configure b/configure
index a7a4538..61100c1 100755
--- a/configure
+++ b/configure
@@ -316,7 +316,6 @@ audio_drv_list=""
block_drv_rw_whitelist=""
block_drv_ro_whitelist=""
host_cc="cc"
-libs_cpu=""
libs_softmmu=""
libs_tools=""
audio_win_int=""
@@ -5415,7 +5414,6 @@ case "$capstone" in
else
LIBCAPSTONE=libcapstone.a
fi
- libs_cpu="-L$PWD/capstone -lcapstone $libs_cpu"
capstone_libs="-L$PWD/capstone -lcapstone"
capstone_cflags="-I${source_path}/capstone/include"
;;
@@ -5424,7 +5422,6 @@ case "$capstone" in
capstone_libs="$($pkg_config --libs capstone)"
capstone_cflags="$($pkg_config --cflags capstone)"
QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"
- libs_cpu="$($pkg_config --libs capstone) $libs_cpu"
;;
no)
@@ -6342,7 +6339,10 @@ fi
if test "$fuzzing" = "yes" ; then
write_c_fuzzer_skeleton
if compile_prog "$CPU_CFLAGS -Werror -fsanitize=fuzzer" ""; then
- have_fuzzer=yes
+ have_fuzzer=yes
+ else
+ error_exit "Your compiler doesn't support -fsanitize=fuzzer"
+ exit 1
fi
fi
@@ -6842,7 +6842,6 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak
-echo "libs_cpu=$libs_cpu" >> $config_host_mak
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
echo "GIT=$git" >> $config_host_mak
echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
@@ -7705,14 +7704,7 @@ if test "$have_mlockall" = "yes" ; then
echo "HAVE_MLOCKALL=y" >> $config_host_mak
fi
if test "$fuzzing" = "yes" ; then
- if test "$have_fuzzer" = "yes"; then
- FUZZ_LDFLAGS=" -fsanitize=fuzzer"
- FUZZ_CFLAGS=" -fsanitize=fuzzer"
- CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
- else
- error_exit "Your compiler doesn't support -fsanitize=fuzzer"
- exit 1
- fi
+ CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
fi
if test "$plugins" = "yes" ; then
@@ -8299,8 +8291,8 @@ if test "$TARGET_ARCH" = "s390x" && test "$target_softmmu" = "yes" && \
fi
fi
-echo "QEMU_LDFLAGS+=$ldflags" >> $config_target_mak
-echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
+echo "QEMU_LDFLAGS=$ldflags" >> $config_target_mak
+echo "QEMU_CFLAGS=$cflags" >> $config_target_mak
done # for target in $targets
diff --git a/docs/devel/blkverify.txt b/docs/devel/blkverify.txt
index d556dc4..aca826c 100644
--- a/docs/devel/blkverify.txt
+++ b/docs/devel/blkverify.txt
@@ -62,8 +62,8 @@ A more realistic scenario is verifying the installation of a guest OS:
$ ./qemu-img create raw.img 16G
$ ./qemu-img create -f qcow2 test.qcow2 16G
- $ x86_64-softmmu/qemu-system-x86_64 -cdrom debian.iso \
- -drive file=blkverify:raw.img:test.qcow2
+ $ ./qemu-system-x86_64 -cdrom debian.iso \
+ -drive file=blkverify:raw.img:test.qcow2
If the installation is aborted when blkverify detects corruption, use qemu-io
to explore the contents of the disk image at the sector in question.
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index a426469..196e3bc 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -819,7 +819,7 @@ the following approaches:
1) Set ``qemu_bin``, and use the given binary
2) Do not set ``qemu_bin``, and use a QEMU binary named like
- "${arch}-softmmu/qemu-system-${arch}", either in the current
+ "qemu-system-${arch}", either in the current
working directory, or in the current source tree.
The resulting ``qemu_bin`` value will be preserved in the
@@ -886,7 +886,7 @@ like the following:
.. code::
- PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
+ PARAMS (key=qemu_bin, path=*, default=./qemu-system-x86_64) => './qemu-system-x86_64
arch
~~~~
diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst
index 48afdc7..e13f5a2 100644
--- a/docs/interop/live-block-operations.rst
+++ b/docs/interop/live-block-operations.rst
@@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the
following invocation of QEMU, with a QMP server running over UNIX
socket::
- $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \
+ $ ./qemu-system-x86_64 -display none -no-user-config \
-M q35 -nodefaults -m 512 \
-blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \
-device virtio-blk,drive=node-A,id=virtio0 \
@@ -694,7 +694,7 @@ instance, with the following invocation. (As noted earlier, for
simplicity's sake, the destination QEMU is started on the same host, but
it could be located elsewhere)::
- $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \
+ $ ./qemu-system-x86_64 -display none -no-user-config \
-M q35 -nodefaults -m 512 \
-blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \
-device virtio-blk,drive=node-TargetDisk,id=virtio0 \
diff --git a/meson.build b/meson.build
index 58f84e8..5052165 100644
--- a/meson.build
+++ b/meson.build
@@ -198,10 +198,12 @@ brlapi = not_found
if 'CONFIG_BRLAPI' in config_host
brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
endif
+sdlwindows = false
sdl = not_found
if 'CONFIG_SDL' in config_host
sdl = declare_dependency(compile_args: config_host['SDL_CFLAGS'].split(),
link_args: config_host['SDL_LIBS'].split())
+ sdlwindows = config_host['SDL_LIBS'].contains('-mwindows')
endif
rbd = not_found
if 'CONFIG_RBD' in config_host
@@ -501,10 +503,12 @@ blockdev_ss = ss.source_set()
qmp_ss = ss.source_set()
common_ss = ss.source_set()
softmmu_ss = ss.source_set()
+softmmu_emulator_ss = ss.source_set()
user_ss = ss.source_set()
bsd_user_ss = ss.source_set()
linux_user_ss = ss.source_set()
specific_ss = ss.source_set()
+specific_fuzz_ss = ss.source_set()
modules = {}
hw_arch = {}
@@ -716,6 +720,7 @@ specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
+subdir('tests/qtest/fuzz')
mods = []
block_mods = []
@@ -770,6 +775,9 @@ libqmp = static_library('qmp', qmp_ss.sources(),
qmp = declare_dependency(link_whole: [libqmp])
+softmmu_ss.add(authz, block, chardev, crypto, io, qmp)
+common_ss.add(qom, qemuutil)
+
foreach m : mods
shared_module(m['dir'] + '-' + m['name'],
name_prefix: '',
@@ -778,7 +786,7 @@ foreach m : mods
install_dir: config_host['qemu_moddir'])
endforeach
-common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss)
+common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss, softmmu_emulator_ss])
common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
common_all = common_ss.apply(config_all, strict: false)
@@ -790,11 +798,17 @@ common_all = static_library('common',
feature_to_c = find_program('scripts/feature_to_c.sh')
+emulators = []
foreach target : target_dirs
config_target = config_target_mak[target]
target_name = config_target['TARGET_NAME']
arch = config_target['TARGET_BASE_ARCH']
arch_srcs = []
+ arch_deps = []
+ c_args = config_target['QEMU_CFLAGS'].split() + ['-DNEED_CPU_H',
+ '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
+ '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
+ link_args = config_target['QEMU_LDFLAGS'].split()
target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
if host_machine.system() == 'linux'
@@ -805,12 +819,15 @@ foreach target : target_dirs
target_type='system'
t = target_softmmu_arch[arch].apply(config_target, strict: false)
arch_srcs += t.sources()
+ arch_deps += t.dependencies()
hw_dir = target_name == 'sparc64' ? 'sparc64' : arch
hw = hw_arch[hw_dir].apply(config_target, strict: false)
arch_srcs += hw.sources()
+ arch_deps += hw.dependencies()
arch_srcs += config_devices_h[target]
+ link_args += ['@block.syms', '@qemu.syms']
else
abi = config_target['TARGET_ABI_DIR']
target_type='user'
@@ -847,9 +864,11 @@ foreach target : target_dirs
t = target_arch[arch].apply(config_target, strict: false)
arch_srcs += t.sources()
+ arch_deps += t.dependencies()
target_common = common_ss.apply(config_target, strict: false)
objects = common_all.extract_objects(target_common.sources())
+ deps = target_common.dependencies()
# TODO: Change to generator once obj-y goes away
config_target_h = custom_target(target + '-config-target.h',
@@ -860,15 +879,67 @@ foreach target : target_dirs
target_specific = specific_ss.apply(config_target, strict: false)
arch_srcs += target_specific.sources()
+ arch_deps += target_specific.dependencies()
- static_library('qemu-' + target,
+ lib = static_library('qemu-' + target,
sources: arch_srcs + [config_target_h] + genh,
objects: objects,
include_directories: target_inc,
- c_args: ['-DNEED_CPU_H',
- '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
- '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)],
+ c_args: c_args,
+ build_by_default: false,
name_suffix: 'fa')
+
+ if target.endswith('-softmmu')
+ softmmu_emulator = softmmu_emulator_ss.apply(config_target, strict: false)
+ softmmu_emulator_objs = common_all.extract_objects(softmmu_emulator.sources())
+ softmmu_emulator_deps = softmmu_emulator.dependencies()
+ execs = [{
+ 'name': 'qemu-system-' + target_name,
+ 'gui': false,
+ 'sources': [],
+ 'objects': softmmu_emulator_objs,
+ 'dependencies': softmmu_emulator_deps
+ }]
+ if sdlwindows
+ execs += [{
+ 'name': 'qemu-system-' + target_name + 'w',
+ 'gui': true,
+ 'sources': [],
+ 'objects': softmmu_emulator_objs,
+ 'dependencies': softmmu_emulator_deps
+ }]
+ endif
+ if config_host.has_key('CONFIG_FUZZ')
+ specific_fuzz = specific_fuzz_ss.apply(config_target, strict: false)
+ execs += [{
+ 'name': 'qemu-fuzz-' + target_name,
+ 'gui': false,
+ 'sources': specific_fuzz.sources(),
+ 'dependencies': specific_fuzz.dependencies(),
+ 'objects': [],
+ 'link_depends': [files('tests/qtest/fuzz/fork_fuzz.ld')],
+ }]
+ endif
+ else
+ execs = [{
+ 'name': 'qemu-' + target_name,
+ 'gui': false,
+ 'sources': [],
+ 'objects': [],
+ 'dependencies': []
+ }]
+ endif
+ foreach exe: execs
+ emulators += executable(exe['name'], exe['sources'],
+ install: true,
+ c_args: c_args,
+ dependencies: arch_deps + deps + exe['dependencies'],
+ objects: [lib.extract_all_objects(recursive: true), exe['objects']],
+ link_language: 'cpp',
+ link_depends: [block_syms, qemu_syms] + exe.get('link_depends', []),
+ link_args: link_args,
+ gui_app: exe['gui'])
+ endforeach
endforeach
# Other build targets
diff --git a/os-posix.c b/os-posix.c
index 3572db3..8334193 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -96,7 +96,7 @@ char *os_find_datadir(void)
exec_dir = qemu_get_exec_dir();
g_return_val_if_fail(exec_dir != NULL, NULL);
- dir = g_build_filename(exec_dir, "..", "pc-bios", NULL);
+ dir = g_build_filename(exec_dir, "pc-bios", NULL);
if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
return g_steal_pointer(&dir);
}
diff --git a/plugins/meson.build b/plugins/meson.build
index 9608e52..e777230 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,5 +1,13 @@
+if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host
+ plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.build_root() / 'qemu-plugins-ld.symbols')]
+elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host
+ plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.build_root() / 'qemu-plugins-ld64.symbols')]
+else
+ plugin_ldflags = []
+endif
+
specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files(
'loader.c',
'core.c',
'api.c',
-)])
+), declare_dependency(link_args: plugin_ldflags)])
diff --git a/rules.mak b/rules.mak
index 8285fe5..6488dc3 100644
--- a/rules.mak
+++ b/rules.mak
@@ -21,7 +21,6 @@ MAKEFLAGS += -rR
%.cpp:
%.m:
%.mak:
-clean-target:
# Flags for dependency generation
QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 305d042..866baf7 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -383,7 +383,7 @@ def binariesToTest(args, testcase):
if args.qemu:
r = args.qemu
else:
- r = glob.glob('./*-softmmu/qemu-system-*')
+ r = glob.glob('./qemu-system-*')
return r
diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
deleted file mode 100644
index dd15c24..0000000
--- a/softmmu/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-softmmu-main-y = softmmu/main.o
-obj-y += vl.o
-vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
diff --git a/softmmu/meson.build b/softmmu/meson.build
index 95d38df..28eeb78 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -8,3 +8,7 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
'memory_mapping.c',
'qtest.c',
'vl.c'))
+
+softmmu_emulator_ss.add(files(
+ 'main.c',
+), sdl)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 567ad69..7468e99 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -494,7 +494,7 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel
.PHONY: check-tests/check-block.sh
check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
- $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS)))
+ $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS)))
@$<
# Python venv for running tests
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 77d1c1d..71ed812 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -57,8 +57,7 @@ def pick_default_qemu_bin(arch=None):
# qemu binary path does not match arch for powerpc, handle it
if 'ppc64le' in arch:
arch = 'ppc64'
- qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
- "qemu-system-%s" % arch)
+ qemu_bin_relative_path = "qemu-system-%s" % arch
if is_readable_executable_file(qemu_bin_relative_path):
return qemu_bin_relative_path
diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
index 76cd797..fc78770 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -12,7 +12,7 @@
# This work is licensed under the terms of the GNU GPLv2.
# See the COPYING.LIB file in the top-level directory.
-qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64"
+qemu_bins="./qemu-system-x86_64 ./qemu-system-aarch64"
if [ ! -e "tests/qtest/bios-tables-test" ]; then
echo "Test: bios-tables-test is required! Run make check before this script."
diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh
index 98df91e..f968bf7 100755
--- a/tests/multiboot/run_test.sh
+++ b/tests/multiboot/run_test.sh
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-QEMU=${QEMU:-"../../x86_64-softmmu/qemu-system-x86_64"}
+QEMU=${QEMU:-"../../qemu-system-x86_64"}
run_qemu() {
local kernel=$1
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 0657f72..3ab859a 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -577,11 +577,11 @@ if [ -z "$QEMU_PROG" ]
then
if [ -x "$build_iotests/qemu" ]; then
export QEMU_PROG="$build_iotests/qemu"
- elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then
- export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}"
+ elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then
+ export QEMU_PROG="$build_root/qemu-system-${qemu_arch}"
else
pushd "$build_root" > /dev/null
- for binary in *-softmmu/qemu-system-*
+ for binary in qemu-system-*
do
if [ -x "$binary" ]
then
diff --git a/tests/qtest/fuzz/Makefile.include b/tests/qtest/fuzz/Makefile.include
deleted file mode 100644
index 5bde793..0000000
--- a/tests/qtest/fuzz/Makefile.include
+++ /dev/null
@@ -1,39 +0,0 @@
-QEMU_PROG_FUZZ=qemu-fuzz-$(TARGET_NAME)$(EXESUF)
-
-fuzz-obj-y += tests/qtest/libqtest.o
-fuzz-obj-y += $(libqos-obj-y)
-fuzz-obj-y += tests/qtest/fuzz/fuzz.o # Fuzzer skeleton
-fuzz-obj-y += tests/qtest/fuzz/fork_fuzz.o
-fuzz-obj-y += tests/qtest/fuzz/qos_fuzz.o
-fuzz-obj-y += tests/qtest/fuzz/qtest_wrappers.o
-
-# Targets
-fuzz-obj-$(CONFIG_PCI_I440FX) += tests/qtest/fuzz/i440fx_fuzz.o
-fuzz-obj-$(CONFIG_VIRTIO_NET) += tests/qtest/fuzz/virtio_net_fuzz.o
-fuzz-obj-$(CONFIG_SCSI) += tests/qtest/fuzz/virtio_scsi_fuzz.o
-
-FUZZ_CFLAGS += -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest
-
-# Linker Script to force coverage-counters into known regions which we can mark
-# shared
-FUZZ_LDFLAGS += -Xlinker -T$(SRC_PATH)/tests/qtest/fuzz/fork_fuzz.ld
-
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_inb
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_inw
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_inl
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_outb
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_outw
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_outl
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_readb
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_readw
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_readl
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_readq
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_writeb
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_writew
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_writel
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_writeq
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_memread
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_bufread
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_memwrite
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_bufwrite
-FUZZ_LDFLAGS += -Wl,-wrap,qtest_memset
diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
index f45373f..86796bf 100644
--- a/tests/qtest/fuzz/i440fx_fuzz.c
+++ b/tests/qtest/fuzz/i440fx_fuzz.c
@@ -17,8 +17,8 @@
#include "tests/qtest/libqos/pci.h"
#include "tests/qtest/libqos/pci-pc.h"
#include "fuzz.h"
-#include "fuzz/qos_fuzz.h"
-#include "fuzz/fork_fuzz.h"
+#include "qos_fuzz.h"
+#include "fork_fuzz.h"
#define I440FX_PCI_HOST_BRIDGE_CFG 0xcf8
diff --git a/tests/qtest/fuzz/meson.build b/tests/qtest/fuzz/meson.build
new file mode 100644
index 0000000..58ab69a
--- /dev/null
+++ b/tests/qtest/fuzz/meson.build
@@ -0,0 +1,34 @@
+specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c'), qos)
+
+# Targets
+specific_fuzz_ss.add(when: 'CONFIG_I440FX', if_true: files('i440fx_fuzz.c'))
+specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio_net_fuzz.c'))
+specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio_scsi_fuzz.c'))
+
+# unfortunately declare_dependency does not support link_depends, so
+# this will be duplicated in meson.build
+fork_fuzz = declare_dependency(
+ link_args: ['-fsanitize=fuzzer',
+ '-Ttests/qtest/fuzz/fork_fuzz.ld',
+ '-wrap', 'qtest_inb',
+ '-wrap', 'qtest_inw',
+ '-wrap', 'qtest_inl',
+ '-wrap', 'qtest_outb',
+ '-wrap', 'qtest_outw',
+ '-wrap', 'qtest_outl',
+ '-wrap', 'qtest_readb',
+ '-wrap', 'qtest_readw',
+ '-wrap', 'qtest_readl',
+ '-wrap', 'qtest_readq',
+ '-wrap', 'qtest_writeb',
+ '-wrap', 'qtest_writew',
+ '-wrap', 'qtest_writel',
+ '-wrap', 'qtest_writeq',
+ '-wrap', 'qtest_memread',
+ '-wrap', 'qtest_bufread',
+ '-wrap', 'qtest_memwrite',
+ '-wrap', 'qtest_bufwrite',
+ '-wrap', 'qtest_memset']
+)
+
+specific_fuzz_ss.add(fork_fuzz)
diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_net_fuzz.c
index 277a9e2..0e873ab 100644
--- a/tests/qtest/fuzz/virtio_net_fuzz.c
+++ b/tests/qtest/fuzz/virtio_net_fuzz.c
@@ -61,7 +61,8 @@ static void virtio_net_fuzz_multi(QTestState *s,
* backend. Otherwise, always place the input on a virtqueue.
*/
if (vqa.rx && sockfds_initialized) {
- write(sockfds[0], Data, vqa.length);
+ int ignored = write(sockfds[0], Data, vqa.length);
+ (void) ignored;
} else {
vqa.rx = 0;
uint64_t req_addr = guest_alloc(t_alloc, vqa.length);
diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h
index 1054326..5f63d35 100644
--- a/tests/qtest/libqos/qgraph.h
+++ b/tests/qtest/libqos/qgraph.h
@@ -226,7 +226,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
* my_test <--consumed_by-- my_interface <--produces--+
*
* Assuming there the binary is
- * QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
+ * QTEST_QEMU_BINARY=./qemu-system-x86_64
* a valid test path will be:
* "/x86_64/pc/other_node/my_driver/my_interface/my_test".
*
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 820c15c..c2601d9 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -231,7 +231,7 @@ foreach dir : target_dirs
qtest_env = environment()
qtest_env.set('QTEST_QEMU_IMG', './qemu-img')
qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
- qtest_env.set('QTEST_QEMU_BINARY', '@0@-softmmu/qemu-system-@0@'.format(target_base))
+ qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
foreach test : qtests
# Executables are shared across targets, declare them only the first time we
diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c
index a7e83e7..16751db 100644
--- a/tests/qtest/rtas-test.c
+++ b/tests/qtest/rtas-test.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "ppc64")) {
- g_printerr("RTAS requires ppc64-softmmu/qemu-system-ppc64\n");
+ g_printerr("RTAS requires qemu-system-ppc64\n");
exit(EXIT_FAILURE);
}
qtest_add_func("rtas/get-time-of-day", test_rtas_get_time_of_day);
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 102578c..7d714f9 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -193,11 +193,11 @@ for target in $target_list; do
case $target in
*-linux-user | *-bsd-user)
echo "CONFIG_USER_ONLY=y" >> $config_target_mak
- echo "QEMU=\$(BUILD_DIR)/$target/qemu-$arch" >> $config_target_mak
+ echo "QEMU=\$(BUILD_DIR)/qemu-$arch" >> $config_target_mak
;;
*-softmmu)
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "QEMU=\$(BUILD_DIR)/$target/qemu-system-$arch" >> $config_target_mak
+ echo "QEMU=\$(BUILD_DIR)/qemu-system-$arch" >> $config_target_mak
;;
esac
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 131/143] meson: convert systemtap files
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (129 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 130/143] meson: link emulators without Makefile.target Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 132/143] rules.mak: remove version.o Paolo Bonzini
` (16 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 85 ++-----------------------------------------------------
meson.build | 26 +++++++++++++++++
rules.mak | 3 --
trace/meson.build | 14 ++++-----
4 files changed, 35 insertions(+), 93 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 8ee4c78..a07149c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -6,88 +6,7 @@ include ../config-host.mak
include config-target.mak
include $(SRC_PATH)/rules.mak
-$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
-
-ifdef CONFIG_USER_ONLY
-# user emulator name
-QEMU_PROG=qemu-$(TARGET_NAME)
-else
-# system emulator name
-QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
-endif
-
-STPFILES=
-
-ifdef CONFIG_TRACE_SYSTEMTAP
-stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp $(QEMU_PROG)-log.stp
-
-ifdef CONFIG_USER_ONLY
-TARGET_TYPE=user
-else
-TARGET_TYPE=system
-endif
-
-tracetool-y = $(SRC_PATH)/scripts/tracetool.py
-tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-
-$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=stap \
- --backends=$(TRACE_BACKENDS) \
- --binary=$(bindir)/$(QEMU_PROG) \
- --target-name=$(TARGET_NAME) \
- --target-type=$(TARGET_TYPE) \
- $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed")
-
-$(QEMU_PROG).stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=stap \
- --backends=$(TRACE_BACKENDS) \
- --binary=$(realpath .)/$(QEMU_PROG) \
- --target-name=$(TARGET_NAME) \
- --target-type=$(TARGET_TYPE) \
- $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp")
-
-$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=simpletrace-stap \
- --backends=$(TRACE_BACKENDS) \
- --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
- $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
-
-$(QEMU_PROG)-log.stp: $(BUILD_DIR)/trace/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --group=all \
- --format=log-stap \
- --backends=$(TRACE_BACKENDS) \
- --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
- $< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG)-log.stp")
-
-else
-stap:
-endif
-.PHONY: stap
-
-all: stap
-
-clean:
- rm -f *.a *~
- rm -f $(shell find . -name '*.[od]')
- rm -f hmp-commands.h gdbstub-xml.c
- rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp
-ifdef CONFIG_TRACE_SYSTEMTAP
- rm -f *.stp
-endif
-
+all:
install: all
-ifdef CONFIG_TRACE_SYSTEMTAP
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
- $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
- $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp"
- $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp"
-endif
-
+
.PHONY: all clean install
diff --git a/meson.build b/meson.build
index 5052165..44b2645 100644
--- a/meson.build
+++ b/meson.build
@@ -797,6 +797,7 @@ common_all = static_library('common',
name_suffix: 'fa')
feature_to_c = find_program('scripts/feature_to_c.sh')
+tracetool = find_program('scripts/tracetool.py')
emulators = []
foreach target : target_dirs
@@ -939,6 +940,31 @@ foreach target : target_dirs
link_depends: [block_syms, qemu_syms] + exe.get('link_depends', []),
link_args: link_args,
gui_app: exe['gui'])
+
+ if 'CONFIG_TRACE_SYSTEMTAP' in config_host
+ foreach stp: [
+ {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir() / exe_name, 'install': false},
+ {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_option('bindir') / exe_name, 'install': true},
+ {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '', 'install': true},
+ {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': true},
+ ]
+ custom_target(exe_name + stp['ext'],
+ input: trace_events_all,
+ output: exe_name + stp['ext'],
+ capture: true,
+ install: stp['install'],
+ install_dir: config_host['qemu_datadir'] / '../systemtap/tapset',
+ command: [
+ tracetool, '--group=all', '--format=' + stp['fmt'],
+ '--backends=' + config_host['TRACE_BACKENDS'],
+ '--binary=' + stp['bin'],
+ '--target-name=' + target_name,
+ '--target-type=' + target_type,
+ '--probe-prefix=qemu.' + target_type + '.' + target_name,
+ '@INPUT@',
+ ])
+ endforeach
+ endif
endforeach
endforeach
diff --git a/rules.mak b/rules.mak
index 6488dc3..b983c7f 100644
--- a/rules.mak
+++ b/rules.mak
@@ -199,9 +199,6 @@ ne = $(if $(subst $2,,$1)$(subst $1,,$2),y,n)
isempty = $(if $1,n,y)
notempty = $(if $1,y,n)
-# Generate files with tracetool
-TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
-
.PHONY: clean-timestamp
clean-timestamp:
rm -f *.timestamp
diff --git a/trace/meson.build b/trace/meson.build
index b113425..eb28aff 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -55,13 +55,13 @@ foreach dir : [ '.' ] + trace_events_subdirs
endif
endforeach
-custom_target('trace-events-all',
- output: 'trace-events-all',
- input: trace_events_files,
- command: [ 'cat', '@INPUT@' ],
- capture: true,
- install: true,
- install_dir: config_host['qemu_datadir'])
+trace_events_all = custom_target('trace-events-all',
+ output: 'trace-events-all',
+ input: trace_events_files,
+ command: [ 'cat', '@INPUT@' ],
+ capture: true,
+ install: true,
+ install_dir: config_host['qemu_datadir'])
foreach d : [
['generated-tcg-tracers.h', 'tcg-h'],
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 132/143] rules.mak: remove version.o
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (130 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 131/143] meson: convert systemtap files Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 133/143] remove Makefile.target Paolo Bonzini
` (15 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
Makefile.objs | 4 ----
rules.mak | 4 +---
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 1f89680..603869d 100644
--- a/Makefile
+++ b/Makefile
@@ -226,11 +226,6 @@ recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
recurse-install: $(addsuffix /install, $(TARGET_DIRS))
$(addsuffix /install, $(TARGET_DIRS)): all
-$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
- $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")
-
-Makefile: $(version-obj-y)
-
######################################################################
clean: recurse-clean
diff --git a/Makefile.objs b/Makefile.objs
index 9f73e86..306d81d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -31,7 +31,3 @@ crypto-obj-y = crypto/libcrypto.fa
io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
-
-######################################################################
-# Resource file for Windows executables
-version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
diff --git a/rules.mak b/rules.mak
index b983c7f..6d89001 100644
--- a/rules.mak
+++ b/rules.mak
@@ -77,8 +77,6 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
$(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
$(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \
-c -o $@ $<,"CC","$(TARGET_DIR)$@")
-%.o: %.rc
- $(call quiet-command,$(WINDRES) -I. -o $@ $<,"RC","$(TARGET_DIR)$@")
# If we have a CXX we might have some C++ objects, in which case we
# must link with the C++ compiler, not the plain C compiler.
@@ -86,7 +84,7 @@ LINKPROG = $(or $(CXX),$(CC))
LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
$(call process-archive-undefs, $1) \
- $(version-obj-y) $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@")
+ $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@")
%.o: %.S
$(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 133/143] remove Makefile.target
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (131 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 132/143] rules.mak: remove version.o Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 134/143] meson: sphinx-build Paolo Bonzini
` (14 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 53 ++++-------------------------------------------------
Makefile.target | 12 ------------
configure | 2 --
3 files changed, 4 insertions(+), 63 deletions(-)
delete mode 100644 Makefile.target
diff --git a/Makefile b/Makefile
index 603869d..9a97de0 100644
--- a/Makefile
+++ b/Makefile
@@ -164,17 +164,6 @@ include $(SRC_PATH)/tests/Makefile.include
all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules
-config-host.h: config-host.h-timestamp
-config-host.h-timestamp: config-host.mak
-
-TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), $(TARGET_DIRS)))
-
-.PHONY: $(TARGET_DIRS_RULES)
-# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
-# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
-$(TARGET_DIRS_RULES): $(TARGET_DEPS)
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
-
# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
@@ -211,8 +200,6 @@ slirp/all: .git-submodule-status
CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \
CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")
-$(filter %/all, $(TARGET_DIRS_RULES)):
-
ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
# Only keep -O and -g cflags
@@ -220,11 +207,9 @@ ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
$(ROM_DIRS_RULES):
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" CFLAGS="$(filter -O% -g%,$(CFLAGS))" $(notdir $@),)
-.PHONY: recurse-all recurse-clean recurse-install
-recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
-recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
-recurse-install: $(addsuffix /install, $(TARGET_DIRS))
-$(addsuffix /install, $(TARGET_DIRS)): all
+.PHONY: recurse-all recurse-clean
+recurse-all: $(ROM_DIRS)
+recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
######################################################################
@@ -274,9 +259,6 @@ distclean: clean
$(call clean-manual,system)
$(call clean-manual,tools)
$(call clean-manual,user)
- for d in $(TARGET_DIRS); do \
- rm -rf $$d || exit 1 ; \
- done
rm -Rf .sdk
KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \
@@ -386,8 +368,7 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
export DESTDIR
install: all $(if $(BUILD_DOCS),install-doc) \
install-datadir install-localstatedir \
- $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
- recurse-install
+ $(if $(INSTALL_BLOBS),$(edk2-decompressed))
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif
@@ -432,9 +413,6 @@ endif
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
done
- for d in $(TARGET_DIRS); do \
- $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
- done
# documentation
MAKEINFO=makeinfo
@@ -549,20 +527,6 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \
$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl
-# Reports/Analysis
-
-%/coverage-report.html:
- @mkdir -p $*
- $(call quiet-command,\
- gcovr -r $(SRC_PATH) \
- $(foreach t, $(TARGET_DIRS), --object-directory $(BUILD_DIR)/$(t)) \
- --object-directory $(BUILD_DIR) \
- -p --html --html-details -o $@, \
- "GEN", "coverage-report.html")
-
-.PHONY: coverage-report
-coverage-report: $(CURDIR)/reports/coverage/coverage-report.html
-
ifdef CONFIG_WIN32
INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
@@ -650,15 +614,6 @@ endif
$(call print-help,cscope,Generate cscope index)
$(call print-help,sparse,Run sparse on the QEMU source)
@echo ''
- @$(if $(TARGET_DIRS), \
- echo 'Architecture specific targets:'; \
- $(foreach t, $(TARGET_DIRS), \
- $(call print-help-run,$(t)/all,Build for $(t)); \
- $(if $(CONFIG_FUZZ), \
- $(if $(findstring softmmu,$(t)), \
- $(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \
- ))) \
- echo '')
@echo 'Cleaning targets:'
$(call print-help,clean,Remove most generated files but keep the config)
$(call print-help,distclean,Remove all generated files)
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index a07149c..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: makefile -*-
-
-BUILD_DIR?=$(CURDIR)/..
-
-include ../config-host.mak
-include config-target.mak
-include $(SRC_PATH)/rules.mak
-
-all:
-install: all
-
-.PHONY: all clean install
diff --git a/configure b/configure
index 61100c1..a3727dc 100755
--- a/configure
+++ b/configure
@@ -8094,8 +8094,6 @@ if [ "$TARGET_SYSTBL_ABI" != "" ] && [ "$TARGET_SYSTBL" = "" ]; then
TARGET_SYSTBL=syscall.tbl
fi
-symlink "$source_path/Makefile.target" "$target_dir/Makefile"
-
upper() {
echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]'
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 134/143] meson: sphinx-build
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (132 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 133/143] remove Makefile.target Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 135/143] meson: build texi doc Paolo Bonzini
` (13 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 142 +++--------------------------------------------------
configure | 1 -
docs/index.html.in | 4 +-
docs/meson.build | 68 +++++++++++++++++++++++++
meson.build | 2 +
rules.mak | 48 ------------------
6 files changed, 79 insertions(+), 186 deletions(-)
create mode 100644 docs/meson.build
diff --git a/Makefile b/Makefile
index 9a97de0..d0d0294 100644
--- a/Makefile
+++ b/Makefile
@@ -120,36 +120,9 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-# Sphinx does not allow building manuals into the same directory as
-# the source files, so if we're doing an in-tree QEMU build we must
-# build the manuals into a subdirectory (and then install them from
-# there for 'make install'). For an out-of-tree build we can just
-# use the docs/ subdirectory in the build tree as normal.
-ifeq ($(realpath $(SRC_PATH)),$(realpath .))
-MANUAL_BUILDDIR := docs/built
-else
-MANUAL_BUILDDIR := docs
-endif
-
ifdef BUILD_DOCS
-DOCS+=$(MANUAL_BUILDDIR)/system/qemu.1
-DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1
-DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8
-DOCS+=$(MANUAL_BUILDDIR)/interop/qemu-ga.8
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
-DOCS+=$(MANUAL_BUILDDIR)/tools/virtiofsd.1
-endif
-DOCS+=$(MANUAL_BUILDDIR)/system/qemu-block-drivers.7
DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
-DOCS+=$(MANUAL_BUILDDIR)/system/qemu-cpu-models.7
-DOCS+=$(MANUAL_BUILDDIR)/index.html
-ifdef CONFIG_VIRTFS
-DOCS+=$(MANUAL_BUILDDIR)/tools/virtfs-proxy-helper.1
-endif
-ifdef CONFIG_TRACE_SYSTEMTAP
-DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1
-endif
else
DOCS=
endif
@@ -232,11 +205,6 @@ dist: qemu-$(VERSION).tar.bz2
qemu-%.tar.bz2:
$(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)"
-define clean-manual =
-rm -rf $(MANUAL_BUILDDIR)/$1/_static
-rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(MANUAL_BUILDDIR)/$1/*.html
-endef
-
distclean: clean
rm -f config-host.mak config-host.h* $(DOCS)
rm -f tests/tcg/config-*.mak
@@ -252,13 +220,6 @@ distclean: clean
rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
- rm -rf .doctrees
- $(call clean-manual,devel)
- $(call clean-manual,interop)
- $(call clean-manual,specs)
- $(call clean-manual,system)
- $(call clean-manual,tools)
- $(call clean-manual,user)
rm -Rf .sdk
KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \
@@ -297,28 +258,8 @@ BLOBS=
DESCS=
endif
-# Note that we manually filter-out the non-Sphinx documentation which
-# is currently built into the docs/interop directory in the build tree,
-# and also any sphinx-built manpages.
-define install-manual =
-for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done
-for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f -a '!' '(' -name '*.[0-9]' -o -name 'qemu-*-qapi.*' -o -name 'qemu-*-ref.*' ')' ); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done
-endef
-
-# Note that we deliberately do not install the "devel" manual: it is
-# for QEMU developers, and not interesting to our users.
-.PHONY: install-sphinxdocs
-install-sphinxdocs: sphinxdocs
- $(call install-manual,interop)
- $(call install-manual,specs)
- $(call install-manual,system)
- $(call install-manual,tools)
- $(call install-manual,user)
-
-install-doc: $(DOCS) install-sphinxdocs
+install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
ifdef CONFIG_POSIX
@@ -326,19 +267,7 @@ ifdef CONFIG_POSIX
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"
-ifeq ($(CONFIG_TOOLS),y)
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-img.1 "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
-endif
-ifdef CONFIG_TRACE_SYSTEMTAP
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1"
-endif
ifeq ($(CONFIG_GUEST_AGENT),y)
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
$(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
@@ -441,69 +370,6 @@ docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
%.pdf: %.texi docs/version.texi
$(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@")
-# Sphinx builds all its documentation at once in one invocation
-# and handles "don't rebuild things unless necessary" itself.
-# The '.doctrees' files are cached information to speed this up.
-.PHONY: sphinxdocs
-sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \
- $(MANUAL_BUILDDIR)/interop/index.html \
- $(MANUAL_BUILDDIR)/specs/index.html \
- $(MANUAL_BUILDDIR)/system/index.html \
- $(MANUAL_BUILDDIR)/tools/index.html \
- $(MANUAL_BUILDDIR)/user/index.html
-
-# Canned command to build a single manual
-# Arguments: $1 = manual name, $2 = Sphinx builder ('html' or 'man')
-# Note the use of different doctree for each (manual, builder) tuple;
-# this works around Sphinx not handling parallel invocation on
-# a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946
-build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) $(SPHINX_WERROR) -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")
-# We assume all RST files in the manual's directory are used in it
-manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*/*.rst) \
- $(SRC_PATH)/docs/defs.rst.inc \
- $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py \
- $(SRC_PATH)/docs/sphinx/*.py
-# Macro to write out the rule and dependencies for building manpages
-# Usage: $(call define-manpage-rule,manualname,manpage1 manpage2...[,extradeps])
-# 'extradeps' is optional, and specifies extra files (eg .hx files) that
-# the manual page depends on.
-define define-manpage-rule
-$(call atomic,$(foreach manpage,$2,$(MANUAL_BUILDDIR)/$1/$(manpage)),$(call manual-deps,$1) $3)
- $(call build-manual,$1,man)
-endef
-
-$(MANUAL_BUILDDIR)/devel/index.html: $(call manual-deps,devel)
- $(call build-manual,devel,html)
-
-$(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop)
- $(call build-manual,interop,html)
-
-$(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs)
- $(call build-manual,specs,html)
-
-$(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system) $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/qemu-options.hx
- $(call build-manual,system,html)
-
-$(MANUAL_BUILDDIR)/tools/index.html: $(call manual-deps,tools) $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst.inc
- $(call build-manual,tools,html)
-
-$(MANUAL_BUILDDIR)/user/index.html: $(call manual-deps,user)
- $(call build-manual,user,html)
-
-$(call define-manpage-rule,interop,qemu-ga.8)
-
-$(call define-manpage-rule,system,qemu.1 qemu-block-drivers.7 qemu-cpu-models.7)
-
-$(call define-manpage-rule,tools,\
- qemu-img.1 qemu-nbd.8 qemu-trace-stap.1\
- virtiofsd.1 virtfs-proxy-helper.1,\
- $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst.inc)
-
-$(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h
- @mkdir -p "$(MANUAL_BUILDDIR)"
- $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \
- "GEN","$@")
-
docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi
@cp -p $< $@
@@ -526,6 +392,12 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \
docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi
$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl
+ $(call quiet-command, \
+ perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod && \
+ $(POD2MAN) --section=$(subst .,,$(suffix $@)) --center=" " --release=" " $@.pod > $@, \
+ "GEN","$@")
+
+man: $(filter %.1 %.7 %.8,$(DOCS))
ifdef CONFIG_WIN32
diff --git a/configure b/configure
index a3727dc..08aee81 100755
--- a/configure
+++ b/configure
@@ -7764,7 +7764,6 @@ echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
-echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
diff --git a/docs/index.html.in b/docs/index.html.in
index 6736fa4..ca28047 100644
--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -2,10 +2,10 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>QEMU @@VERSION@@ Documentation</title>
+ <title>QEMU @VERSION@ Documentation</title>
</head>
<body>
- <h1>QEMU @@VERSION@@ Documentation</h1>
+ <h1>QEMU @VERSION@ Documentation</h1>
<ul>
<li><a href="system/index.html">System Emulation User's Guide</a></li>
<li><a href="user/index.html">User Mode Emulation User's Guide</a></li>
diff --git a/docs/meson.build b/docs/meson.build
new file mode 100644
index 0000000..fe7d875
--- /dev/null
+++ b/docs/meson.build
@@ -0,0 +1,68 @@
+SPHINX_ARGS = [config_host['SPHINX_BUILD'],
+ '-Dversion=' + meson.project_version(),
+ '-Drelease=' + config_host['PKGVERSION']]
+
+if get_option('werror')
+ SPHINX_ARGS += [ '-W' ]
+endif
+
+if build_docs
+ configure_file(output: 'index.html',
+ input: files('index.html.in'),
+ configuration: {'VERSION': meson.project_version()},
+ install_dir: config_host['qemu_docdir'])
+ manuals = [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ]
+ man_pages = {
+ 'interop' : {
+ 'qemu-ga.8': (have_tools ? 'man8' : ''),
+ },
+ 'tools': {
+ 'qemu-img.1': (have_tools ? 'man1' : ''),
+ 'qemu-nbd.8': (have_tools ? 'man8' : ''),
+ 'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
+ 'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
+ 'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
+ },
+ 'system': {
+ 'qemu.1': 'man1',
+ 'qemu-block-drivers.7': 'man7',
+ 'qemu-cpu-models.7': 'man7'
+ },
+ }
+
+ sphinxdocs = []
+ sphinxmans = []
+ foreach manual : manuals
+ private_dir = meson.current_build_dir() / (manual + '.p')
+ input_dir = meson.current_source_dir() / manual
+ sphinxdocs += custom_target(manual + ' manual',
+ build_always_stale: true,
+ build_by_default: build_docs,
+ output: manual,
+ command: [SPHINX_ARGS, '-b', 'html', '-d', private_dir,
+ input_dir, meson.current_build_dir() / manual])
+ if build_docs
+ install_subdir(meson.current_build_dir() / manual,
+ install_dir: config_host['qemu_docdir'] / manual)
+ endif
+
+ these_man_pages = []
+ install_dirs = []
+ foreach page, section : man_pages.get(manual, {})
+ these_man_pages += page
+ install_dirs += section == '' ? false : get_option('mandir') / section
+ endforeach
+ if these_man_pages.length() > 0
+ sphinxmans += custom_target(manual + ' man pages',
+ build_always_stale: true,
+ build_by_default: build_docs,
+ output: these_man_pages,
+ install: build_docs,
+ install_dir: install_dirs,
+ command: [SPHINX_ARGS, '-b', 'man', '-d', private_dir,
+ input_dir, meson.current_build_dir()])
+ endif
+ endforeach
+ alias_target('sphinxdocs', sphinxdocs)
+ alias_target('man', sphinxmans)
+endif
diff --git a/meson.build b/meson.build
index 44b2645..eb1b0cd 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,7 @@ cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
config_all_disas = keyval.load(meson.current_build_dir() / 'config-all-disas.mak')
enable_modules = 'CONFIG_MODULES' in config_host
+build_docs = 'BUILD_DOCS' in config_host
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
language: ['c', 'objc'])
@@ -1031,6 +1032,7 @@ endif
subdir('tools')
subdir('pc-bios')
subdir('tests')
+subdir('docs')
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
diff --git a/rules.mak b/rules.mak
index 6d89001..6cab0b9 100644
--- a/rules.mak
+++ b/rules.mak
@@ -375,53 +375,5 @@ define unnest-vars
$(eval $v := $(filter-out %/,$($v))))
endef
-TEXI2MAN = $(call quiet-command, \
- perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod && \
- $(POD2MAN) --section=$(subst .,,$(suffix $@)) --center=" " --release=" " $@.pod > $@, \
- "GEN","$@")
-
-%.1:
- $(call TEXI2MAN)
-%.7:
- $(call TEXI2MAN)
-%.8:
- $(call TEXI2MAN)
-
-# Support for building multiple output files by atomically executing
-# a single rule which depends on several input files (so the rule
-# will be executed exactly once, not once per output file, and
-# not multiple times in parallel.) For more explanation see:
-# https://www.cmcrossroads.com/article/atomic-rules-gnu-make
-
-# Given a space-separated list of filenames, create the name of
-# a 'sentinel' file to use to indicate that they have been built.
-# We use fixed text on the end to avoid accidentally triggering
-# automatic pattern rules, and . on the start to make the file
-# not show up in ls output.
-sentinel = .$(subst $(SPACE),_,$(subst /,_,$1)).sentinel.
-
-# Define an atomic rule that builds multiple outputs from multiple inputs.
-# To use:
-# $(call atomic,out1 out2 ...,in1 in2 ...)
-# <TAB>rule to do the operation
-#
-# Make 4.3 will have native support for this, and you would be able
-# to instead write:
-# out1 out2 ... &: in1 in2 ...
-# <TAB>rule to do the operation
-#
-# The way this works is that it creates a make rule
-# "out1 out2 ... : sentinel-file ; @:" which says that the sentinel
-# depends on the dependencies, and the rule to do that is "do nothing".
-# Then we have a rule
-# "sentinel-file : in1 in2 ..."
-# whose commands start with "touch sentinel-file" and then continue
-# with the rule text provided by the user of this 'atomic' function.
-# The foreach... is there to delete the sentinel file if any of the
-# output files don't exist, so that we correctly rebuild in that situation.
-atomic = $(eval $1: $(call sentinel,$1) ; @:) \
- $(call sentinel,$1) : $2 ; @touch $$@ \
- $(foreach t,$1,$(if $(wildcard $t),,$(shell rm -f $(call sentinel,$1))))
-
print-%:
@echo '$*=$($*)'
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 135/143] meson: build texi doc
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (133 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 134/143] meson: sphinx-build Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 136/143] meson: convert check-block Paolo Bonzini
` (12 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 108 +++--------------------------------------
docs/interop/qemu-ga-ref.texi | 2 +-
docs/interop/qemu-qmp-ref.texi | 2 +-
meson.build | 85 ++++++++++++++++++++++++++++++++
qga/meson.build | 12 +++--
version.texi.in | 2 +
6 files changed, 105 insertions(+), 106 deletions(-)
create mode 100644 version.texi.in
diff --git a/Makefile b/Makefile
index d0d0294..6735832 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ BUILD_DIR=$(CURDIR)
SRC_PATH=.
UNCHECKED_GOALS := %clean TAGS cscope ctags dist \
- html info pdf txt \
help check-help print-% \
docker docker-% vm-help vm-test vm-build-%
@@ -113,20 +112,13 @@ edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))
Makefile: ;
configure: ;
-.PHONY: all clean cscope distclean html info install install-doc \
- pdf txt recurse-all dist msi FORCE
+.PHONY: all clean cscope distclean install \
+ recurse-all dist msi FORCE
$(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-ifdef BUILD_DOCS
-DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
-DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
-else
-DOCS=
-endif
-
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
ifneq ($(wildcard config-host.mak),)
@@ -135,7 +127,7 @@ endif
include $(SRC_PATH)/tests/Makefile.include
-all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules
+all: recurse-all modules
# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
@@ -206,7 +198,7 @@ qemu-%.tar.bz2:
$(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)"
distclean: clean
- rm -f config-host.mak config-host.h* $(DOCS)
+ rm -f config-host.mak config-host.h*
rm -f tests/tcg/config-*.mak
rm -f config-all-disas.mak config.status
rm -f po/*.mo tests/qemu-iotests/common.env
@@ -214,12 +206,6 @@ distclean: clean
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
rm -f config.log
rm -f linux-headers/asm
- rm -f docs/version.texi
- rm -f docs/interop/qemu-ga-qapi.texi docs/interop/qemu-qmp-qapi.texi
- rm -f docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7
- rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
- rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
- rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
rm -Rf .sdk
KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \
@@ -258,29 +244,6 @@ BLOBS=
DESCS=
endif
-install-doc: $(DOCS)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
-ifdef CONFIG_POSIX
- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
-ifeq ($(CONFIG_GUEST_AGENT),y)
- $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
- $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
- $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
-endif
-endif
-ifdef CONFIG_VIRTFS
- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
-endif
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/virtiofsd.1 "$(DESTDIR)$(mandir)/man1"
-endif
-
install-datadir:
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
@@ -295,8 +258,7 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
# Needed by "meson install"
export DESTDIR
-install: all $(if $(BUILD_DOCS),install-doc) \
- install-datadir install-localstatedir \
+install: all install-datadir install-localstatedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed))
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
@@ -343,62 +305,6 @@ endif
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
done
-# documentation
-MAKEINFO=makeinfo
-MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
-MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
-TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
-
-docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
- $(call quiet-command,(\
- echo "@set VERSION $(VERSION)" && \
- echo "@set CONFDIR $(qemu_confdir)" \
- )> $@,"GEN","$@")
-
-%.html: %.texi docs/version.texi
- $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
- --html $< -o $@,"GEN","$@")
-
-%.info: %.texi docs/version.texi
- $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
-
-%.txt: %.texi docs/version.texi
- $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
- --plaintext $< -o $@,"GEN","$@")
-
-%.pdf: %.texi docs/version.texi
- $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@")
-
-docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi
- @cp -p $< $@
-
-docs/interop/qemu-ga-qapi.texi: qga/qga-qapi-doc.texi
- @cp -p $< $@
-
-html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs
-info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info
-pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
-txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
-
-docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \
- docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \
- docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7: \
- docs/interop/qemu-ga-ref.texi docs/interop/qemu-ga-qapi.texi
-
-docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \
- docs/interop/qemu-qmp-ref.info docs/interop/qemu-qmp-ref.pdf \
- docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \
- docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi
-
-$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl
- $(call quiet-command, \
- perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod && \
- $(POD2MAN) --section=$(subst .,,$(suffix $@)) --center=" " --release=" " $@.pod > $@, \
- "GEN","$@")
-
-man: $(filter %.1 %.7 %.8,$(DOCS))
-
ifdef CONFIG_WIN32
INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
@@ -421,7 +327,7 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis
-$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi
+$(INSTALLER): $(SRC_PATH)/qemu.nsi
$(MAKE) install prefix=${INSTDIR}
ifdef SIGNCODE
(cd ${INSTDIR}; \
@@ -497,7 +403,7 @@ endif
$(call print-help,vm-help,Help about targets running tests inside VM)
@echo ''
@echo 'Documentation targets:'
- $(call print-help,html info pdf txt,Build documentation in specified format)
+ $(call print-help,html info pdf txt man,Build documentation in specified format)
@echo ''
ifdef CONFIG_WIN32
@echo 'Windows targets:'
diff --git a/docs/interop/qemu-ga-ref.texi b/docs/interop/qemu-ga-ref.texi
index ddb76ce..a23cc2e 100644
--- a/docs/interop/qemu-ga-ref.texi
+++ b/docs/interop/qemu-ga-ref.texi
@@ -65,7 +65,7 @@ along with this manual. If not, see http://www.gnu.org/licenses/.
@c for texi2pod:
@c man begin DESCRIPTION
-@include qemu-ga-qapi.texi
+@include qga/qga-qapi-doc.texi
@c man end
diff --git a/docs/interop/qemu-qmp-ref.texi b/docs/interop/qemu-qmp-ref.texi
index bb25758..ea1d7fe 100644
--- a/docs/interop/qemu-qmp-ref.texi
+++ b/docs/interop/qemu-qmp-ref.texi
@@ -65,7 +65,7 @@ along with this manual. If not, see http://www.gnu.org/licenses/.
@c for texi2pod:
@c man begin DESCRIPTION
-@include qemu-qmp-qapi.texi
+@include qapi/qapi-doc.texi
@c man end
diff --git a/meson.build b/meson.build
index eb1b0cd..e2e3348 100644
--- a/meson.build
+++ b/meson.build
@@ -1034,6 +1034,91 @@ subdir('pc-bios')
subdir('tests')
subdir('docs')
+if build_docs
+ makeinfo = find_program('makeinfo', required: build_docs)
+
+ docs_inc = [
+ '-I', meson.current_source_dir(),
+ '-I', meson.current_build_dir() / 'docs',
+ '-I', '@OUTDIR@',
+ ]
+
+ version_texi = configure_file(output: 'version.texi',
+ input: 'version.texi.in',
+ configuration: {'VERSION': meson.project_version(),
+ 'qemu_confdir': config_host['qemu_confdir']})
+
+ texi = {
+ 'qemu-qmp-ref': ['docs/interop/qemu-qmp-ref.texi', qapi_doc_texi, version_texi],
+ }
+ if 'CONFIG_GUEST_AGENT' in config_host
+ texi += {'qemu-ga-ref': ['docs/interop/qemu-ga-ref.texi', qga_qapi_doc_texi, version_texi]}
+ endif
+
+ if makeinfo.found()
+ cmd = [
+ 'env', 'LC_ALL=C', makeinfo, '--no-split', '--number-sections', docs_inc,
+ '@INPUT0@', '-o', '@OUTPUT@',
+ ]
+ foreach ext, args: {
+ 'info': [],
+ 'html': ['--no-headers', '--html'],
+ 'txt': ['--no-headers', '--plaintext'],
+ }
+ t = []
+ foreach doc, input: texi
+ output = doc + '.' + ext
+ t += custom_target(output,
+ input: input,
+ output: output,
+ install: true,
+ install_dir: config_host['qemu_docdir'] / 'interop',
+ command: cmd + args)
+ endforeach
+ alias_target(ext, t)
+ endforeach
+ endif
+
+ texi2pdf = find_program('texi2pdf', required: false)
+
+ if texi2pdf.found()
+ pdfs = []
+ foreach doc, input: texi
+ output = doc + '.pdf'
+ pdfs += custom_target(output,
+ input: input,
+ output: output,
+ command: [texi2pdf, '-q', docs_inc, '@INPUT0@', '-o', '@OUTPUT@'],
+ build_by_default: false)
+ endforeach
+ alias_target('pdf', pdfs)
+ endif
+
+ texi2pod = find_program('scripts/texi2pod.pl')
+ pod2man = find_program('pod2man', required: build_docs)
+
+ if pod2man.found()
+ foreach doc, input: texi
+ man = doc + '.7'
+ pod = custom_target(man + '.pod',
+ input: input,
+ output: man + '.pod',
+ command: [texi2pod,
+ '-DVERSION="' + meson.project_version() + '"',
+ '-DCONFDIR="' + config_host['qemu_confdir'] + '"',
+ '@INPUT0@', '@OUTPUT@'])
+ man = custom_target(man,
+ input: pod,
+ output: man,
+ capture: true,
+ install: true,
+ install_dir: config_host['mandir'] / 'man7',
+ command: [pod2man, '--utf8', '--section=7', '--center=" "',
+ '--release=" "', '@INPUT@'])
+ endforeach
+ endif
+endif
+
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
summary_info += {'BIOS directory': config_host['qemu_datadir']}
diff --git a/qga/meson.build b/qga/meson.build
index dcd4772..55d590c 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -1,7 +1,6 @@
qga_qapi_outputs = [
'qga-qapi-commands.c',
'qga-qapi-commands.h',
- 'qga-qapi-doc.texi',
'qga-qapi-emit-events.c',
'qga-qapi-emit-events.h',
'qga-qapi-events.c',
@@ -17,12 +16,19 @@ qga_qapi_outputs = [
]
qga_qapi_files = custom_target('QGA QAPI files',
- output: qga_qapi_outputs,
+ output: qga_qapi_outputs + ['qga-qapi-doc.texi'],
input: 'qapi-schema.json',
command: [ qapi_gen, '-o', 'qga', '-p', 'qga-', '@INPUT0@' ],
depend_files: qapi_gen_depends)
+
qga_ss = ss.source_set()
-qga_ss.add(qga_qapi_files)
+i = 0
+foreach output: qga_qapi_outputs
+ qga_ss.add(qga_qapi_files[i])
+ i = i + 1
+endforeach
+qga_qapi_doc_texi = qga_qapi_files[i]
+
qga_ss.add(files(
'commands.c',
'guest-agent-command-state.c',
diff --git a/version.texi.in b/version.texi.in
new file mode 100644
index 0000000..0a723b8
--- /dev/null
+++ b/version.texi.in
@@ -0,0 +1,2 @@
+@set VERSION @VERSION@
+@set CONFDIR @qemu_confdir@
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 136/143] meson: convert check-block
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (134 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 135/143] meson: build texi doc Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 137/143] rules.mak: drop unneeded macros Paolo Bonzini
` (11 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/Makefile.include | 18 ++----------------
tests/meson.build | 4 ++++
tests/qemu-iotests/meson.build | 8 ++++++++
3 files changed, 14 insertions(+), 16 deletions(-)
create mode 100644 tests/qemu-iotests/meson.build
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 7468e99..a1e4871 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -160,8 +160,6 @@ check-unit-y += tests/test-uuid$(EXESUF)
check-unit-y += tests/ptimer-test$(EXESUF)
check-unit-y += tests/test-qapi-util$(EXESUF)
-check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh
-
generated-files-y += tests/test-qapi-types.h
generated-files-y += tests/include/test-qapi-types-sub-module.h
generated-files-y += tests/test-qapi-types-sub-sub-module.h
@@ -487,16 +485,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES)
clean-tcg: $(CLEAN_TCG_TARGET_RULES)
-QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
-
-tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
-
-.PHONY: check-tests/check-block.sh
-check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
- qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
- $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS)))
- @$<
-
# Python venv for running tests
.PHONY: check-venv check-acceptance
@@ -550,13 +538,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
# Consolidated targets
-.PHONY: check-block check-unit check check-clean get-vm-images
+.PHONY: check-unit check check-clean get-vm-images
ifeq ($(CONFIG_TOOLS),y)
check-block: $(patsubst %,check-%, $(check-block-y))
endif
check-build: build-unit
-check: check-block check-unit
+check: check-unit
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -f tests/test-qapi-gen-timestamp
@@ -568,8 +556,6 @@ clean: check-clean
# Build the help program automatically
-all: $(QEMU_IOTESTS_HELPERS-y)
-
-include $(wildcard tests/*.d)
endif
diff --git a/tests/meson.build b/tests/meson.build
index d724402..f834c27 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,3 +1,7 @@
+if have_system and 'CONFIG_POSIX' in config_host
+ subdir('qemu-iotests')
+endif
+
test('decodetree', sh,
args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
workdir: meson.current_source_dir() / 'decode',
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
new file mode 100644
index 0000000..60e81a2
--- /dev/null
+++ b/tests/qemu-iotests/meson.build
@@ -0,0 +1,8 @@
+dep = [qemu_img, qemu_io, qemu_nbd, emulators]
+if 'CONFIG_LINUX' in config_host
+ dep += executable('socket_scm_helper', 'socket_scm_helper.c',
+ build_by_default: false)
+endif
+test('qemu-iotests', sh, args: [files('../check-block.sh')], depends: dep,
+ suite: 'block', timeout: 10000)
+
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 137/143] rules.mak: drop unneeded macros
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (135 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 136/143] meson: convert check-block Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 138/143] meson: replace create-config with meson configure_file Paolo Bonzini
` (10 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitignore | 1 -
Makefile | 7 +-
configure | 32 +-----
docs/devel/build-system.txt | 5 +-
rules.mak | 231 +-------------------------------------------
scripts/create_config | 6 +-
6 files changed, 14 insertions(+), 268 deletions(-)
diff --git a/.gitignore b/.gitignore
index de1f20e..5eaeada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@
*.msi
*.dll
*.so
-*.mo
*.fn
*.ky
*.log
diff --git a/Makefile b/Makefile
index 6735832..cc0b053 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ endif
include $(SRC_PATH)/tests/Makefile.include
-all: recurse-all modules
+all: recurse-all
# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
@@ -181,7 +181,7 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
clean: recurse-clean
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
- find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
+ find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
@@ -383,9 +383,6 @@ print-help = $(quiet-@)$(call print-help-run,$1,$2)
help:
@echo 'Generic targets:'
$(call print-help,all,Build all)
-ifdef CONFIG_MODULES
- $(call print-help,modules,Build all modules)
-endif
$(call print-help,dir/file.o,Build specified target only)
$(call print-help,install,Install QEMU, documentation and tools)
$(call print-help,ctags/TAGS,Generate tags file for editors)
diff --git a/configure b/configure
index 08aee81..99ed6fa 100755
--- a/configure
+++ b/configure
@@ -29,7 +29,6 @@ TMPC="${TMPDIR1}/${TMPB}.c"
TMPO="${TMPDIR1}/${TMPB}.o"
TMPCXX="${TMPDIR1}/${TMPB}.cxx"
TMPE="${TMPDIR1}/${TMPB}.exe"
-TMPMO="${TMPDIR1}/${TMPB}.mo"
TMPTXT="${TMPDIR1}/${TMPB}.txt"
rm -f config.log
@@ -424,7 +423,7 @@ bigendian="no"
mingw32="no"
gcov="no"
EXESUF=""
-DSOSUF=".so"
+HOST_DSOSUF=".so"
LDFLAGS_SHARED="-shared"
modules="no"
module_upgrades="no"
@@ -958,7 +957,7 @@ fi
if test "$mingw32" = "yes" ; then
EXESUF=".exe"
- DSOSUF=".dll"
+ HOST_DSOSUF=".dll"
# MinGW needs -mthreads for TLS and macro _MT.
QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
LIBS="-lwinmm -lws2_32 $LIBS"
@@ -6205,31 +6204,6 @@ EOF
fi
fi
-#################################################
-# Sparc implicitly links with --relax, which is
-# incompatible with -r, so --no-relax should be
-# given. It does no harm to give it on other
-# platforms too.
-
-# Note: the prototype is needed since QEMU_CFLAGS
-# contains -Wmissing-prototypes
-cat > $TMPC << EOF
-extern int foo(void);
-int foo(void) { return 0; }
-EOF
-if ! compile_object ""; then
- error_exit "Failed to compile object file for LD_REL_FLAGS test"
-fi
-for i in '-Wl,-r -Wl,--no-relax' -Wl,-r -r; do
- if do_cc -nostdlib $i -o $TMPMO $TMPO; then
- LD_REL_FLAGS=$i
- break
- fi
-done
-if test "$modules" = "yes" && test "$LD_REL_FLAGS" = ""; then
- feature_not_found "modules" "Cannot find how to build relocatable objects"
-fi
-
##########################################
# check for sysmacros.h
@@ -7803,7 +7777,7 @@ echo "LIBS+=$LIBS" >> $config_host_mak
echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
echo "PTHREAD_LIB=$PTHREAD_LIB" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
-echo "DSOSUF=$DSOSUF" >> $config_host_mak
+echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
echo "LIBS_QGA=$libs_qga" >> $config_host_mak
echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak
diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt
index 41bd08e..fea67b2 100644
--- a/docs/devel/build-system.txt
+++ b/docs/devel/build-system.txt
@@ -404,10 +404,7 @@ using Makefile.target for the build rules.
- rules.mak
This file provides the generic helper rules for invoking build tools, in
-particular the compiler and linker. This also contains the magic (hairy)
-'unnest-vars' function which is used to merge the variable definitions
-from all Makefile.objs in the source tree down into the main Makefile
-context.
+particular the compiler and linker.
- default-configs/*.mak
diff --git a/rules.mak b/rules.mak
index 6cab0b9..c66c821 100644
--- a/rules.mak
+++ b/rules.mak
@@ -33,11 +33,6 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
# different for target-dependent ones.
QEMU_LOCAL_INCLUDES = -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -iquote $(@D)
-WL_U := -Wl,-u,
-find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2)))
-defined-symbols = $(call find-symbols,$1,awk '$$2!="U"{print $$1}')
-undefined-symbols = $(call find-symbols,$1,awk '$$2=="U"{print $$1}')
-
WL := -Wl,
ifdef CONFIG_DARWIN
whole-archive = $(WL)-force_load,$1
@@ -45,32 +40,7 @@ else
whole-archive = $(WL)--whole-archive $1 $(WL)--no-whole-archive
endif
-# All the .mo objects in -m variables are also added into corresponding -y
-# variable in unnest-vars, but filtered out here, when LINK is called.
-#
-# The .mo objects are supposed to be linked as a DSO, for module build. So here
-# they are only used as a placeholders to generate those "archive undefined"
-# symbol options (-Wl,-u,$symbol_name), which are the archive functions
-# referenced by the code in the DSO.
-#
-# Also the presence in -y variables will also guarantee they are built before
-# linking executables that will load them. So we can look up symbol reference
-# in LINK.
-#
-# This is necessary because the exectuable itself may not use the function, in
-# which case the function would not be linked in. Then the DSO loading will
-# fail because of the missing symbol.
-process-archive-undefs = $(filter-out %.a %.fa %.mo %$(DSOSUF),$1) \
- $(addprefix $(WL_U), \
- $(filter $(call defined-symbols,$(filter %.a %.fa, $1)), \
- $(call undefined-symbols,$(filter %.mo %$(DSOSUF),$1)))) \
- $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \
- $(filter %.a,$1)
-
-extract-libs = $(strip $(foreach o,$(filter-out %.mo %$(DSOSUF),$1),$($o-libs)))
-expand-objs = $(strip $(sort $(filter %.o,$1)) \
- $(foreach o,$(filter %.mo %$(DSOSUF),$1),$($o-objs)) \
- $(filter-out %.o %.mo %$(DSOSUF),$1))
+extract-libs = $(strip $(foreach o,$1,$($o-libs)))
%.o: %.c
@mkdir -p $(dir $@)
@@ -83,7 +53,9 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
LINKPROG = $(or $(CXX),$(CC))
LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
- $(call process-archive-undefs, $1) \
+ $(filter-out %.a %.fa,$1) \
+ $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \
+ $(filter %.a,$1) \
$(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@")
%.o: %.S
@@ -109,25 +81,11 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
%.o: %.dtrace
$(call quiet-command,dtrace -o $@ -G -s $<,"GEN","$(TARGET_DIR)$@")
-DSO_OBJ_CFLAGS := -fPIC -DBUILD_DSO
-module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)
-%$(DSOSUF): QEMU_LDFLAGS += $(LDFLAGS_SHARED)
-%$(DSOSUF): %.mo
- $(call LINK,$^)
- @# Copy to build root so modules can be loaded when program started without install
- $(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@),"CP","$(subst /,-,$@)"))
-
-
-LD_REL := $(CC) -nostdlib $(LD_REL_FLAGS)
-
-%.mo:
- $(call quiet-command,$(LD_REL) -o $@ $^,"LD","$(TARGET_DIR)$@")
-
.PHONY: modules
modules:
%$(EXESUF): %.o
- $(call LINK,$(filter %.o %.a %.mo %.fa, $^))
+ $(call LINK,$(filter %.o %.a %.fa, $^))
%.a:
$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@")
@@ -160,15 +118,6 @@ define install-prog
$(if $(STRIP),$(STRIP) $(foreach T,$1,"$2/$(notdir $T)"),)
endef
-# find-in-path
-# Usage: $(call find-in-path, prog)
-# Looks in the PATH if the argument contains no slash, else only considers one
-# specific directory. Returns an # empty string if the program doesn't exist
-# there.
-find-in-path = $(if $(findstring /, $1), \
- $(wildcard $1), \
- $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
-
# Logical functions (for operating on y/n values like CONFIG_FOO vars)
# Inputs to these must be either "y" (true) or "n" or "" (both false)
# Output is always either "y" or "n".
@@ -205,175 +154,5 @@ clean: clean-timestamp
# will delete the target of a rule if commands exit with a nonzero exit status
.DELETE_ON_ERROR:
-# save-vars
-# Usage: $(call save-vars, vars)
-# Save each variable $v in $vars as save-vars-$v, save their object's
-# variables, then clear $v. saved-vars-$v contains the variables that
-# where saved for the objects, in order to speedup load-vars.
-define save-vars
- $(foreach v,$1,
- $(eval save-vars-$v := $(value $v))
- $(eval saved-vars-$v := $(foreach o,$($v), \
- $(if $($o-cflags), $o-cflags $(eval save-vars-$o-cflags := $($o-cflags))$(eval $o-cflags := )) \
- $(if $($o-libs), $o-libs $(eval save-vars-$o-libs := $($o-libs))$(eval $o-libs := )) \
- $(if $($o-objs), $o-objs $(eval save-vars-$o-objs := $($o-objs))$(eval $o-objs := ))))
- $(eval $v := ))
-endef
-
-# load-vars
-# Usage: $(call load-vars, vars, add_var)
-# Load the saved value for each variable in @vars, and the per object
-# variables.
-# Append @add_var's current value to the loaded value.
-define load-vars
- $(eval $2-new-value := $(value $2))
- $(foreach v,$1,
- $(eval $v := $(value save-vars-$v))
- $(foreach o,$(saved-vars-$v),
- $(eval $o := $(save-vars-$o)) $(eval save-vars-$o := ))
- $(eval save-vars-$v := )
- $(eval saved-vars-$v := ))
- $(eval $2 := $(value $2) $($2-new-value))
-endef
-
-# fix-paths
-# Usage: $(call fix-paths, obj_path, src_path, vars)
-# Add prefix @obj_path to all objects in @vars, and add prefix @src_path to all
-# directories in @vars.
-define fix-paths
- $(foreach v,$3,
- $(foreach o,$($v),
- $(if $($o-libs),
- $(eval $1$o-libs := $($o-libs)))
- $(if $($o-cflags),
- $(eval $1$o-cflags := $($o-cflags)))
- $(if $($o-objs),
- $(eval $1$o-objs := $(addprefix $1,$($o-objs)))))
- $(eval $v := $(addprefix $1,$(filter-out %/,$($v))) \
- $(addprefix $2,$(filter %/,$($v)))))
-endef
-
-# unnest-var-recursive
-# Usage: $(call unnest-var-recursive, obj_prefix, vars, var)
-#
-# Unnest @var by including subdir Makefile.objs, while protect others in @vars
-# unchanged.
-#
-# @obj_prefix is the starting point of object path prefix.
-#
-define unnest-var-recursive
- $(eval dirs := $(sort $(filter %/,$($3))))
- $(eval $3 := $(filter-out %/,$($3)))
- $(foreach d,$(dirs:%/=%),
- $(call save-vars,$2)
- $(eval obj := $(if $1,$1/)$d)
- $(eval -include $(SRC_PATH)/$d/Makefile.objs)
- $(call fix-paths,$(if $1,$1/)$d/,$d/,$2)
- $(call load-vars,$2,$3)
- $(call unnest-var-recursive,$1,$2,$3))
-endef
-
-# unnest-vars
-# Usage: $(call unnest-vars, obj_prefix, vars)
-#
-# @obj_prefix: object path prefix, can be empty, or '..', etc. Don't include
-# ending '/'.
-#
-# @vars: the list of variable names to unnest.
-#
-# This macro will scan subdirectories's Makefile.objs, include them, to build
-# up each variable listed in @vars.
-#
-# Per object and per module cflags and libs are saved with relative path fixed
-# as well, those variables include -libs, -cflags and -objs. Items in -objs are
-# also fixed to relative path against SRC_PATH plus the prefix @obj_prefix.
-#
-# All nested variables postfixed by -m in names are treated as DSO variables,
-# and will be built as modules, if enabled.
-#
-# A simple example of the unnest:
-#
-# obj_prefix = ..
-# vars = hot cold
-# hot = fire.o sun.o season/
-# cold = snow.o water/ season/
-#
-# Unnest through a faked source directory structure:
-#
-# SRC_PATH
-# ├── water
-# │ └── Makefile.objs──────────────────┐
-# │ │ hot += steam.o │
-# │ │ cold += ice.mo │
-# │ │ ice.mo-libs := -licemaker │
-# │ │ ice.mo-objs := ice1.o ice2.o │
-# │ └──────────────────────────────┘
-# │
-# └── season
-# └── Makefile.objs──────┐
-# │ hot += summer.o │
-# │ cold += winter.o │
-# └──────────────────┘
-#
-# In the end, the result will be:
-#
-# hot = ../fire.o ../sun.o ../season/summer.o
-# cold = ../snow.o ../water/ice.mo ../season/winter.o
-# ../water/ice.mo-libs = -licemaker
-# ../water/ice.mo-objs = ../water/ice1.o ../water/ice2.o
-#
-# Note that 'hot' didn't include 'water/' in the input, so 'steam.o' is not
-# included.
-#
-define unnest-vars
- # In the case of target build (i.e. $1 == ..), fix path for top level
- # Makefile.objs objects
- $(if $1,$(call fix-paths,$1/,,$2))
-
- # Descend and include every subdir Makefile.objs
- $(foreach v, $2,
- $(call unnest-var-recursive,$1,$2,$v)
- # Pass the .mo-cflags and .mo-libs along to its member objects
- $(foreach o, $(filter %.mo,$($v)),
- $(foreach p,$($o-objs),
- $(if $($o-cflags), $(eval $p-cflags += $($o-cflags)))
- $(if $($o-libs), $(eval $p-libs += $($o-libs))))))
-
- # For all %.mo objects that are directly added into -y, just expand them
- $(foreach v,$(filter %-y,$2),
- $(eval $v := $(foreach o,$($v),$(if $($o-objs),$($o-objs),$o))))
-
- $(foreach v,$(filter %-m,$2),
- # All .o found in *-m variables are single object modules, create .mo
- # for them
- $(foreach o,$(filter %.o,$($v)),
- $(eval $(o:%.o=%.mo)-objs := $o))
- # Now unify .o in -m variable to .mo
- $(eval $v := $($v:%.o=%.mo))
- $(eval modules-m += $($v))
-
- # For module build, build shared libraries during "make modules"
- # For non-module build, add -m to -y
- $(if $(CONFIG_MODULES),
- $(foreach o,$($v),
- $(eval $($o-objs): CFLAGS += $(DSO_OBJ_CFLAGS))
- $(eval $o: $($o-objs)))
- $(eval $(patsubst %-m,%-y,$v) += $($v))
- $(eval modules: $($v:%.mo=%$(DSOSUF))),
- $(eval $(patsubst %-m,%-y,$v) += $(call expand-objs, $($v)))))
-
- # Post-process all the unnested vars
- $(foreach v,$2,
- $(foreach o, $(filter %.mo,$($v)),
- # Find all the .mo objects in variables and add dependency rules
- # according to .mo-objs. Report error if not set
- $(if $($o-objs),
- $(eval $(o:%.mo=%$(DSOSUF)): module-common.o $($o-objs))))
- $(shell mkdir -p ./ $(sort $(dir $($v))))
- # Include all the .d files
- $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$(filter %.o,$($v)))))
- $(eval $v := $(filter-out %/,$($v))))
-endef
-
print-%:
@echo '$*=$($*)'
diff --git a/scripts/create_config b/scripts/create_config
index bc82661..ec5c0b4 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -91,6 +91,9 @@ case $line in
name=${line%=*}
echo "#define $name 1"
;;
+ HOST_DSOSUF=*)
+ echo "#define HOST_DSOSUF \"${line#*=}\""
+ ;;
HOST_*=*) # configuration
name=${line%=*}
value=${line#*=}
@@ -123,9 +126,6 @@ case $line in
value=${line#*=}
echo "#define $name $value"
;;
- DSOSUF=*)
- echo "#define HOST_DSOSUF \"${line#*=}\""
- ;;
esac
done # read
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 138/143] meson: replace create-config with meson configure_file
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (136 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 137/143] rules.mak: drop unneeded macros Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 139/143] meson: convert sample plugins Paolo Bonzini
` (9 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Move the create-config logic to meson.build; create a
configuration_data object and let meson handle the
quoting and output.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 +-
block.c | 4 +-
configure | 9 ++-
meson.build | 100 ++++++++++++++++++++++---------
scripts/create_config | 131 -----------------------------------------
tests/qtest/bios-tables-test.c | 2 +-
6 files changed, 80 insertions(+), 168 deletions(-)
delete mode 100755 scripts/create_config
diff --git a/Makefile b/Makefile
index cc0b053..bab1021 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ clean: recurse-clean
rm -f fsdev/*.pod scsi/*.pod
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
-VERSION ?= $(shell cat VERSION)
+VERSION = $(shell cat $(SRC_PATH)/VERSION)
dist: qemu-$(VERSION).tar.bz2
diff --git a/block.c b/block.c
index 67c5028..67ca543 100644
--- a/block.c
+++ b/block.c
@@ -443,13 +443,13 @@ static int bdrv_format_is_whitelisted(const char *format_name, bool read_only)
return 1; /* no whitelist, anything goes */
}
- for (p = whitelist_rw; *p; p++) {
+ for (p = whitelist_rw; p < &whitelist_rw[ARRAY_SIZE(whitelist_rw)]; p++) {
if (!strcmp(format_name, *p)) {
return 1;
}
}
if (read_only) {
- for (p = whitelist_ro; *p; p++) {
+ for (p = whitelist_ro; p < &whitelist_ro[ARRAY_SIZE(whitelist_ro)]; p++) {
if (!strcmp(format_name, *p)) {
return 1;
}
diff --git a/configure b/configure
index 99ed6fa..13b03ac 100755
--- a/configure
+++ b/configure
@@ -6905,7 +6905,7 @@ if test "$slirp" != "no"; then
echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak
fi
if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then
- echo "config-host.h: slirp/all" >> $config_host_mak
+ echo "all Makefile: slirp/all" >> $config_host_mak
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
@@ -6983,7 +6983,6 @@ if test "$xfs" = "yes" ; then
echo "CONFIG_XFS=y" >> $config_host_mak
fi
qemu_version=$(head $source_path/VERSION)
-echo "VERSION=$qemu_version" >>$config_host_mak
echo "PKGVERSION=$pkgversion" >>$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak
@@ -7742,7 +7741,7 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
- echo "IASL=$iasl" >> $config_host_mak
+ echo "CONFIG_IASL=$iasl" >> $config_host_mak
fi
echo "HOST_CC=$host_cc" >> $config_host_mak
echo "CXX=$cxx" >> $config_host_mak
@@ -8271,10 +8270,10 @@ echo "PIXMAN_CFLAGS=$pixman_cflags" >> $config_host_mak
echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak
if [ "$fdt" = "git" ]; then
- echo "config-host.h: dtc/all" >> $config_host_mak
+ echo "all Makefile: dtc/all" >> $config_host_mak
fi
if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then
- echo "config-host.h: capstone/all" >> $config_host_mak
+ echo "all Makefile: capstone/all" >> $config_host_mak
fi
if test -n "$LIBCAPSTONE"; then
echo "LIBCAPSTONE=$LIBCAPSTONE" >> $config_host_mak
diff --git a/meson.build b/meson.build
index e2e3348..cb2ffd6 100644
--- a/meson.build
+++ b/meson.build
@@ -12,6 +12,8 @@ config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
config_all_disas = keyval.load(meson.current_build_dir() / 'config-all-disas.mak')
enable_modules = 'CONFIG_MODULES' in config_host
build_docs = 'BUILD_DOCS' in config_host
+config_host_data = configuration_data()
+genh = []
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
language: ['c', 'objc'])
@@ -342,13 +344,47 @@ if 'CONFIG_LIBPMEM' in config_host
link_args: config_host['LIBPMEM_LIBS'].split())
endif
-create_config = find_program('scripts/create_config')
+# Create config-host.h
+
+config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
+config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
+config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
+config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2])
+
+arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
+ignored = ['HOST_USB', 'HOST_CC']
+strings = ['HOST_DSOSUF', 'CONFIG_IASL']
+foreach k, v: config_host
+ if arrays.contains(k)
+ if v != ''
+ v = '"' + '", "'.join(v.split()) + '", '
+ endif
+ config_host_data.set(k, v)
+ elif k == 'ARCH'
+ config_host_data.set('HOST_' + v.to_upper(), 1)
+ elif ignored.contains(k)
+ # do nothing
+ elif k.startswith('qemu') and (k.endswith('dir') or k.endswith('path'))
+ config_host_data.set_quoted('CONFIG_' + k.to_upper(), v)
+ elif strings.contains(k)
+ config_host_data.set_quoted(k, v)
+ elif k.startswith('CONFIG_') or k.startswith('HAVE_') or k.startswith('HOST_')
+ if v == 'y' or v == 'm'
+ config_host_data.set(k, 1)
+ else
+ config_host_data.set(k, v)
+ endif
+ endif
+endforeach
+genh += configure_file(output: 'config-host.h', configuration: config_host_data)
+
minikconf = find_program('scripts/minikconf.py')
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
have_system = false
config_devices_mak_list = []
config_devices_h = {}
+config_target_h = {}
config_target_mak = {}
kconfig_external_symbols = [
'CONFIG_KVM',
@@ -364,16 +400,36 @@ kconfig_external_symbols = [
'CONFIG_LINUX',
'CONFIG_PVRDMA',
]
+ignored = ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS']
foreach target : target_dirs
have_user = have_user or target.endswith('-user')
- config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak') + config_host
+ config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak')
+
+ config_target_data = configuration_data()
+ foreach k, v: config_target
+ if not k.startswith('TARGET_') and not k.startswith('CONFIG_')
+ # do nothing
+ elif ignored.contains(k)
+ # do nothing
+ elif k == 'TARGET_BASE_ARCH'
+ config_target_data.set('TARGET_' + v.to_upper(), 1)
+ elif k == 'TARGET_NAME'
+ config_target_data.set_quoted(k, v)
+ elif v == 'y'
+ config_target_data.set(k, 1)
+ else
+ config_target_data.set(k, v)
+ endif
+ endforeach
+ config_target_h += {target: configure_file(output: target + '-config-target.h',
+ configuration: config_target_data)}
if target.endswith('-softmmu')
have_system = true
base_kconfig = []
foreach sym : kconfig_external_symbols
- if sym in config_target
+ if sym in config_target or sym in config_host
base_kconfig += '@0@=y'.format(sym)
endif
endforeach
@@ -387,14 +443,16 @@ foreach target : target_dirs
command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'],
config_devices_mak, '@DEPFILE@', '@INPUT@',
base_kconfig])
- config_devices_h += {target: custom_target(
- target + '-config-devices.h',
- input: config_devices_mak,
- output: target + '-config-devices.h',
- capture: true,
- command: [create_config, '@INPUT@'])}
+
+ config_devices_data = configuration_data()
+ config_devices = keyval.load(config_devices_mak)
+ foreach k, v: config_devices
+ config_devices_data.set(k, 1)
+ endforeach
config_devices_mak_list += config_devices_mak
- config_target += keyval.load(config_devices_mak)
+ config_devices_h += {target: configure_file(output: target + '-config-devices.h',
+ configuration: config_devices_data)}
+ config_target += config_devices
endif
config_target_mak += {target: config_target}
endforeach
@@ -434,7 +492,6 @@ config_all += {
# Generators
-genh = []
hxtool = find_program('scripts/hxtool')
shaderinclude = find_program('scripts/shaderinclude.pl')
qapi_gen = find_program('scripts/qapi-gen.py')
@@ -458,7 +515,7 @@ qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py',
qemu_version_cmd = [find_program('scripts/qemu-version.sh'),
meson.current_source_dir(),
- config_host['PKGVERSION'], config_host['VERSION']]
+ config_host['PKGVERSION'], meson.project_version()]
qemu_version = custom_target('qemu-version.h',
output: 'qemu-version.h',
command: qemu_version_cmd,
@@ -467,13 +524,6 @@ qemu_version = custom_target('qemu-version.h',
build_always_stale: true)
genh += qemu_version
-config_host_h = custom_target('config-host.h',
- input: meson.current_build_dir() / 'config-host.mak',
- output: 'config-host.h',
- capture: true,
- command: [create_config, '@INPUT@'])
-genh += config_host_h
-
hxdep = []
hx_headers = [
['qemu-options.hx', 'qemu-options.def'],
@@ -805,13 +855,14 @@ foreach target : target_dirs
config_target = config_target_mak[target]
target_name = config_target['TARGET_NAME']
arch = config_target['TARGET_BASE_ARCH']
- arch_srcs = []
+ arch_srcs = [config_target_h[target]]
arch_deps = []
c_args = config_target['QEMU_CFLAGS'].split() + ['-DNEED_CPU_H',
'-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
'-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
link_args = config_target['QEMU_LDFLAGS'].split()
+ config_target += config_host
target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
if host_machine.system() == 'linux'
target_inc += include_directories('linux-headers', is_system: true)
@@ -872,19 +923,12 @@ foreach target : target_dirs
objects = common_all.extract_objects(target_common.sources())
deps = target_common.dependencies()
- # TODO: Change to generator once obj-y goes away
- config_target_h = custom_target(target + '-config-target.h',
- input: meson.current_build_dir() / target / 'config-target.mak',
- output: target + '-config-target.h',
- capture: true,
- command: [create_config, '@INPUT@'])
-
target_specific = specific_ss.apply(config_target, strict: false)
arch_srcs += target_specific.sources()
arch_deps += target_specific.dependencies()
lib = static_library('qemu-' + target,
- sources: arch_srcs + [config_target_h] + genh,
+ sources: arch_srcs + genh,
objects: objects,
include_directories: target_inc,
c_args: c_args,
diff --git a/scripts/create_config b/scripts/create_config
deleted file mode 100755
index ec5c0b4..0000000
--- a/scripts/create_config
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-test $# -gt 0 && exec < $1
-
-echo "/* Automatically generated by create_config - do not modify */"
-
-while read line; do
-
-case $line in
- VERSION=*) # configuration
- version=${line#*=}
- major=$(echo "$version" | cut -d. -f1)
- minor=$(echo "$version" | cut -d. -f2)
- micro=$(echo "$version" | cut -d. -f3)
- echo "#define QEMU_VERSION \"$version\""
- echo "#define QEMU_VERSION_MAJOR $major"
- echo "#define QEMU_VERSION_MINOR $minor"
- echo "#define QEMU_VERSION_MICRO $micro"
- ;;
- qemu_*dir=* | qemu_*path=*) # qemu-specific directory configuration
- name=${line%=*}
- value=${line#*=}
- define_name=$(echo $name | LC_ALL=C tr '[a-z]' '[A-Z]')
- eval "define_value=\"$value\""
- echo "#define CONFIG_$define_name \"$define_value\""
- # save for the next definitions
- eval "$name=\$define_value"
- ;;
- prefix=*)
- # save for the next definitions
- prefix=${line#*=}
- ;;
- IASL=*) # iasl executable
- value=${line#*=}
- echo "#define CONFIG_IASL $value"
- ;;
- CONFIG_AUDIO_DRIVERS=*)
- drivers=${line#*=}
- echo "#define CONFIG_AUDIO_DRIVERS \\"
- for drv in $drivers; do
- echo " \"${drv}\",\\"
- done
- echo ""
- ;;
- CONFIG_BDRV_RW_WHITELIST=*)
- echo "#define CONFIG_BDRV_RW_WHITELIST\\"
- for drv in ${line#*=}; do
- echo " \"${drv}\",\\"
- done
- echo " NULL"
- ;;
- CONFIG_BDRV_RO_WHITELIST=*)
- echo "#define CONFIG_BDRV_RO_WHITELIST\\"
- for drv in ${line#*=}; do
- echo " \"${drv}\",\\"
- done
- echo " NULL"
- ;;
- CONFIG_*=y) # configuration
- name=${line%=*}
- echo "#define $name 1"
- ;;
- CONFIG_*=n) # configuration
- ;;
- CONFIG_*=*) # configuration
- name=${line%=*}
- value=${line#*=}
- echo "#define $name $value"
- ;;
- HAVE_*=y) # configuration
- name=${line%=*}
- echo "#define $name 1"
- ;;
- HAVE_*=*) # configuration
- name=${line%=*}
- value=${line#*=}
- echo "#define $name $value"
- ;;
- ARCH=*) # configuration
- arch=${line#*=}
- arch_name=$(echo $arch | LC_ALL=C tr '[a-z]' '[A-Z]')
- echo "#define HOST_$arch_name 1"
- ;;
- HOST_USB=*)
- # do nothing
- ;;
- HOST_CC=*)
- # do nothing
- ;;
- HOST_*=y) # configuration
- name=${line%=*}
- echo "#define $name 1"
- ;;
- HOST_DSOSUF=*)
- echo "#define HOST_DSOSUF \"${line#*=}\""
- ;;
- HOST_*=*) # configuration
- name=${line%=*}
- value=${line#*=}
- echo "#define $name $value"
- ;;
- TARGET_BASE_ARCH=*) # configuration
- target_base_arch=${line#*=}
- base_arch_name=$(echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]')
- echo "#define TARGET_$base_arch_name 1"
- ;;
- TARGET_XML_FILES=*)
- # do nothing
- ;;
- TARGET_ABI_DIR=*)
- # do nothing
- ;;
- TARGET_NAME=*)
- target_name=${line#*=}
- echo "#define TARGET_NAME \"$target_name\""
- ;;
- TARGET_DIRS=*)
- # do nothing
- ;;
- TARGET_*=y) # configuration
- name=${line%=*}
- echo "#define $name 1"
- ;;
- TARGET_*=*) # configuration
- name=${line%=*}
- value=${line#*=}
- echo "#define $name $value"
- ;;
-esac
-
-done # read
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index d49b398..d25ff35 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -88,7 +88,7 @@ typedef struct {
static char disk[] = "tests/acpi-test-disk-XXXXXX";
static const char *data_dir = "tests/data/acpi";
#ifdef CONFIG_IASL
-static const char *iasl = stringify(CONFIG_IASL);
+static const char *iasl = CONFIG_IASL;
#else
static const char *iasl;
#endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 139/143] meson: convert sample plugins
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (137 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 138/143] meson: replace create-config with meson configure_file Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 140/143] meson: move SDL and SDL-image detection to meson Paolo Bonzini
` (8 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 ----
tests/Makefile.include | 9 ---------
tests/meson.build | 3 +++
tests/plugin/Makefile | 46 ----------------------------------------------
tests/plugin/meson.build | 7 +++++++
5 files changed, 10 insertions(+), 59 deletions(-)
delete mode 100644 tests/plugin/Makefile
create mode 100644 tests/plugin/meson.build
diff --git a/configure b/configure
index 13b03ac..a0b51d0 100755
--- a/configure
+++ b/configure
@@ -6823,9 +6823,6 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
-echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
-echo "GLIB_LDFLAGS=$glib_ldflags" >> $config_host_mak
-
if test "$default_devices" = "yes" ; then
echo "CONFIG_MINIKCONF_MODE=--defconfig" >> $config_host_mak
else
@@ -8310,7 +8307,6 @@ DIRS="$DIRS roms/seabios"
LINKS="Makefile"
LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile"
LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS tests/plugin/Makefile"
LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
LINKS="$LINKS roms/seabios/Makefile"
diff --git a/tests/Makefile.include b/tests/Makefile.include
index a1e4871..89eeeaa 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -436,15 +436,6 @@ check-speed: $(check-speed-y)
check-report-unit.tap: $(check-unit-y)
$(call do_test_tap,$^)
-# Plugins
-ifeq ($(CONFIG_PLUGIN),y)
-.PHONY: plugins
-plugins:
- $(call quiet-command,\
- $(MAKE) $(SUBDIR_MAKEFLAGS) -C tests/plugin V="$(V)", \
- "BUILD", "plugins")
-endif
-
# Per guest TCG tests
BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
diff --git a/tests/meson.build b/tests/meson.build
index f834c27..fe2c6d8 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -9,6 +9,9 @@ test('decodetree', sh,
if 'CONFIG_TCG' in config_host
subdir('fp')
+ if 'CONFIG_PLUGIN' in config_host
+ subdir('plugin')
+ endif
endif
subdir('qapi-schema')
diff --git a/tests/plugin/Makefile b/tests/plugin/Makefile
deleted file mode 100644
index e9348fd..0000000
--- a/tests/plugin/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# This Makefile example is fairly independent from the main makefile
-# so users can take and adapt it for their build. We only really
-# include config-host.mak so we don't have to repeat probing for
-# cflags that the main configure has already done for us.
-#
-
-BUILD_DIR := $(CURDIR)/../..
-
-include $(BUILD_DIR)/config-host.mak
-
-VPATH += $(SRC_PATH)/tests/plugin
-
-NAMES :=
-NAMES += bb
-NAMES += empty
-NAMES += insn
-NAMES += mem
-NAMES += hotblocks
-NAMES += howvec
-NAMES += hotpages
-NAMES += lockstep
-
-SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES)))
-
-# The main QEMU uses Glib extensively so it's perfectly fine to use it
-# in plugins (which many example do).
-CFLAGS = $(GLIB_CFLAGS)
-CFLAGS += -fPIC
-CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi)
-CFLAGS += -I$(SRC_PATH)/include/qemu
-
-all: $(SONAMES)
-
-%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-lib%.so: %.o
- $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS)
-
-clean:
- rm -f *.o *.so *.d
- rm -Rf .libs
-
-.PHONY: all clean
diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build
new file mode 100644
index 0000000..dbbdcba
--- /dev/null
+++ b/tests/plugin/meson.build
@@ -0,0 +1,7 @@
+t = []
+foreach i : ['bb', 'empty', 'insn', 'mem', 'hotblocks', 'howvec', 'hotpages', 'lockstep']
+ t += shared_module(i, files(i + '.c'),
+ include_directories: '../../include/qemu',
+ dependencies: glib)
+endforeach
+alias_target('plugins', t)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 140/143] meson: move SDL and SDL-image detection to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (138 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 139/143] meson: convert sample plugins Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 141/143] meson: convert VNC and dependent libraries " Paolo Bonzini
` (7 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
chardev/meson.build | 2 +-
configure | 142 +++-------------------------------------------------
meson.build | 24 ++++++---
meson_options.txt | 2 +
ui/meson.build | 4 +-
5 files changed, 30 insertions(+), 144 deletions(-)
create mode 100644 meson_options.txt
diff --git a/chardev/meson.build b/chardev/meson.build
index 2122505..a0aaafa 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -36,7 +36,7 @@ softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c'))
chardev_modules = []
-if config_host.has_key('CONFIG_BRLAPI') and config_host.has_key('CONFIG_SDL')
+if config_host.has_key('CONFIG_BRLAPI') and sdl.found()
chardev_modules += [['baum', files('baum.c'), [sdl, brlapi]]]
endif
diff --git a/configure b/configure
index a0b51d0..288a75f 100755
--- a/configure
+++ b/configure
@@ -377,8 +377,8 @@ curses=""
docs=""
fdt=""
netmap="no"
-sdl=""
-sdl_image=""
+sdl="auto"
+sdl_image="auto"
virtfs=""
mpath=""
vnc="yes"
@@ -1092,13 +1092,13 @@ for opt do
# configure to be used by RPM and similar macros that set
# lots of directory switches by default.
;;
- --disable-sdl) sdl="no"
+ --disable-sdl) sdl="disabled"
;;
- --enable-sdl) sdl="yes"
+ --enable-sdl) sdl="enabled"
;;
- --disable-sdl-image) sdl_image="no"
+ --disable-sdl-image) sdl_image="disabled"
;;
- --enable-sdl-image) sdl_image="yes"
+ --enable-sdl-image) sdl_image="enabled"
;;
--disable-qom-cast-debug) qom_cast_debug="no"
;;
@@ -2368,7 +2368,7 @@ if test "$cocoa" = "yes"; then
error_exit "Cocoa and GTK UIs cannot both be enabled at once"
fi
gtk=no
- sdl=no
+ sdl=disabled
fi
# Some versions of Mac OS X incorrectly define SIZE_MAX
@@ -3274,125 +3274,6 @@ if test "$vte" != "no"; then
fi
##########################################
-# SDL probe
-
-# Look for sdl configuration program (pkg-config or sdl2-config). Try
-# sdl2-config even without cross prefix, and favour pkg-config over sdl2-config.
-
-sdl_probe ()
-{
- if $pkg_config sdl2 --exists; then
- sdlconfig="$pkg_config sdl2"
- sdlversion=$($sdlconfig --modversion 2>/dev/null)
- elif has "$sdl2_config"; then
- sdlconfig="$sdl2_config"
- sdlversion=$($sdlconfig --version)
- else
- if test "$sdl" = "yes" ; then
- feature_not_found "sdl" "Install SDL2-devel"
- fi
- sdl=no
- # no need to do the rest
- return
- fi
- if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl2-config; then
- echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2
- fi
-
- cat > $TMPC << EOF
-#include <SDL.h>
-#undef main /* We don't want SDL to override our main() */
-int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
-EOF
- sdl_cflags=$($sdlconfig --cflags 2>/dev/null)
- sdl_cflags="$sdl_cflags -Wno-undef" # workaround 2.0.8 bug
- if test "$static" = "yes" ; then
- if $pkg_config sdl2 --exists; then
- sdl_libs=$($pkg_config sdl2 --static --libs 2>/dev/null)
- else
- sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
- fi
- else
- sdl_libs=$($sdlconfig --libs 2>/dev/null)
- fi
- if compile_prog "$sdl_cflags" "$sdl_libs" ; then
- sdl=yes
-
- # static link with sdl ? (note: sdl.pc's --static --libs is broken)
- if test "$sdl" = "yes" && test "$static" = "yes" ; then
- if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
- sdl_libs="$sdl_libs $(aalib-config --static-libs 2>/dev/null)"
- sdl_cflags="$sdl_cflags $(aalib-config --cflags 2>/dev/null)"
- fi
- if compile_prog "$sdl_cflags" "$sdl_libs" ; then
- :
- else
- sdl=no
- fi
- fi # static link
- else # sdl not found
- if test "$sdl" = "yes" ; then
- feature_not_found "sdl" "Install SDL2 devel"
- fi
- sdl=no
- fi # sdl compile test
-}
-
-sdl_image_probe ()
-{
- if test "$sdl_image" != "no" ; then
- if $pkg_config SDL2_image --exists; then
- if test "$static" = "yes"; then
- sdl_image_libs=$($pkg_config SDL2_image --libs --static 2>/dev/null)
- else
- sdl_image_libs=$($pkg_config SDL2_image --libs 2>/dev/null)
- fi
- sdl_image_cflags=$($pkg_config SDL2_image --cflags 2>/dev/null)
- sdl_image=yes
-
- sdl_cflags="$sdl_cflags $sdl_image_cflags"
- sdl_libs="$sdl_libs $sdl_image_libs"
- else
- if test "$sdl_image" = "yes" ; then
- feature_not_found "sdl_image" "Install SDL Image devel"
- else
- sdl_image=no
- fi
- fi
- fi
-}
-
-if test "$sdl" != "no" ; then
- sdl_probe
-fi
-
-if test "$sdl" = "yes" ; then
- sdl_image_probe
-else
- if test "$sdl_image" = "yes"; then
- echo "warning: SDL Image requested, but SDL is not available, disabling"
- fi
- sdl_image=no
-fi
-
-if test "$sdl" = "yes" ; then
- cat > $TMPC <<EOF
-#include <SDL.h>
-#if defined(SDL_VIDEO_DRIVER_X11)
-#include <X11/XKBlib.h>
-#else
-#error No x11 support
-#endif
-int main(void) { return 0; }
-EOF
- if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then
- need_x11=yes
- sdl_cflags="$sdl_cflags $x11_cflags"
- sdl_libs="$sdl_libs $x11_libs"
- fi
-fi
-
-##########################################
# RDMA needs OpenFabrics libraries
if test "$rdma" != "no" ; then
cat > $TMPC <<EOF
@@ -7000,14 +6881,6 @@ if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then
echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak
echo "X11_LIBS=$x11_libs" >> $config_host_mak
fi
-if test "$sdl" = "yes" ; then
- echo "CONFIG_SDL=m" >> $config_host_mak
- echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
- echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
- if test "$sdl_image" = "yes" ; then
- echo "CONFIG_SDL_IMAGE=y" >> $config_host_mak
- fi
-fi
if test "$cocoa" = "yes" ; then
echo "CONFIG_COCOA=y" >> $config_host_mak
fi
@@ -8424,6 +8297,7 @@ NINJA=$PWD/ninjatool $python $meson setup \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
+ -Dsdl=$sdl -Dsdl_image=$sdl_image \
$cross_arg \
"$PWD" "$source_path"
diff --git a/meson.build b/meson.build
index cb2ffd6..8bb0c69 100644
--- a/meson.build
+++ b/meson.build
@@ -201,13 +201,21 @@ brlapi = not_found
if 'CONFIG_BRLAPI' in config_host
brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
endif
+
+sdl = dependency('sdl2', method: 'config-tool', required: get_option('sdl'))
+sdl_image = not_found
sdlwindows = false
-sdl = not_found
-if 'CONFIG_SDL' in config_host
- sdl = declare_dependency(compile_args: config_host['SDL_CFLAGS'].split(),
- link_args: config_host['SDL_LIBS'].split())
- sdlwindows = config_host['SDL_LIBS'].contains('-mwindows')
+if sdl.found()
+ sdlwindows = sdl.get_configtool_variable('libs').split().contains('-mwindows')
+ sdl_image = dependency('sdl-image', required: get_option('sdl_image'))
+else
+ if get_option('sdl_image').enabled()
+ error('sdl-image required, but SDL was @0@',
+ get_option('sdl').disabled() ? 'disabled' : 'not found')
+ endif
+ sdl_image = not_found
endif
+
rbd = not_found
if 'CONFIG_RBD' in config_host
rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split())
@@ -346,6 +354,8 @@ endif
# Create config-host.h
+config_host_data.set('CONFIG_SDL', sdl.found())
+config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
@@ -1219,8 +1229,8 @@ if targetos == 'darwin'
summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
endif
# TODO: add back version
-summary_info += {'SDL support': config_host.has_key('CONFIG_SDL')}
-summary_info += {'SDL image support': config_host.has_key('CONFIG_SDL_IMAGE')}
+summary_info += {'SDL support': sdl.found()}
+summary_info += {'SDL image support': sdl_image.found()}
# TODO: add back version
summary_info += {'GTK support': config_host.has_key('CONFIG_GTK')}
summary_info += {'GTK GL support': config_host.has_key('CONFIG_GTK_GL')}
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..e548211
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,2 @@
+option('sdl', type : 'feature', value : 'auto')
+option('sdl_image', type : 'feature', value : 'auto')
diff --git a/ui/meson.build b/ui/meson.build
index 36a70c3..2822ad9 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -54,11 +54,11 @@ if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE')
ui_modules += [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]]
endif
-if config_host.has_key('CONFIG_SDL')
+if sdl.found()
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
sdl_ss = ss.source_set()
- sdl_ss.add(pixman, glib, files(
+ sdl_ss.add(sdl, sdl_image, pixman, glib, files(
'sdl2-2d.c',
'sdl2-input.c',
'sdl2.c',
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 141/143] meson: convert VNC and dependent libraries to meson
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (139 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 140/143] meson: move SDL and SDL-image detection to meson Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 142/143] meson: convert po/ Paolo Bonzini
` (6 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 122 ++++++------------------------------------------------
meson.build | 42 ++++++++++---------
meson_options.txt | 4 ++
ui/meson.build | 10 ++---
4 files changed, 44 insertions(+), 134 deletions(-)
diff --git a/configure b/configure
index 288a75f..cd1ab0c 100755
--- a/configure
+++ b/configure
@@ -381,12 +381,12 @@ sdl="auto"
sdl_image="auto"
virtfs=""
mpath=""
-vnc="yes"
+vnc="enabled"
sparse="no"
vde=""
-vnc_sasl=""
-vnc_jpeg=""
-vnc_png=""
+vnc_sasl="auto"
+vnc_jpeg="auto"
+vnc_png="auto"
xkbcommon=""
xen=""
xen_ctrl_version=""
@@ -1112,9 +1112,9 @@ for opt do
;;
--enable-mpath) mpath="yes"
;;
- --disable-vnc) vnc="no"
+ --disable-vnc) vnc="disabled"
;;
- --enable-vnc) vnc="yes"
+ --enable-vnc) vnc="enabled"
;;
--oss-lib=*) oss_lib="$optarg"
;;
@@ -1150,17 +1150,17 @@ for opt do
;;
--disable-strip) strip_opt="no"
;;
- --disable-vnc-sasl) vnc_sasl="no"
+ --disable-vnc-sasl) vnc_sasl="disabled"
;;
- --enable-vnc-sasl) vnc_sasl="yes"
+ --enable-vnc-sasl) vnc_sasl="enabled"
;;
- --disable-vnc-jpeg) vnc_jpeg="no"
+ --disable-vnc-jpeg) vnc_jpeg="disabled"
;;
- --enable-vnc-jpeg) vnc_jpeg="yes"
+ --enable-vnc-jpeg) vnc_jpeg="enabled"
;;
- --disable-vnc-png) vnc_png="no"
+ --disable-vnc-png) vnc_png="disabled"
;;
- --enable-vnc-png) vnc_png="yes"
+ --enable-vnc-png) vnc_png="enabled"
;;
--disable-slirp) slirp="no"
;;
@@ -3369,85 +3369,6 @@ EOF
fi
##########################################
-# VNC SASL detection
-if test "$vnc" = "yes" && test "$vnc_sasl" != "no" ; then
- cat > $TMPC <<EOF
-#include <sasl/sasl.h>
-#include <stdio.h>
-int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
-EOF
- # Assuming Cyrus-SASL installed in /usr prefix
- # QEMU defines struct iovec in "qemu/osdep.h",
- # we don't want libsasl to redefine it in <sasl/sasl.h>.
- vnc_sasl_cflags="-DSTRUCT_IOVEC_DEFINED"
- vnc_sasl_libs="-lsasl2"
- if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
- vnc_sasl=yes
- libs_softmmu="$vnc_sasl_libs $libs_softmmu"
- QEMU_CFLAGS="$QEMU_CFLAGS $vnc_sasl_cflags"
- else
- if test "$vnc_sasl" = "yes" ; then
- feature_not_found "vnc-sasl" "Install Cyrus SASL devel"
- fi
- vnc_sasl=no
- fi
-fi
-
-##########################################
-# VNC JPEG detection
-if test "$vnc" = "yes" && test "$vnc_jpeg" != "no" ; then
-cat > $TMPC <<EOF
-#include <stdio.h>
-#include <jpeglib.h>
-int main(void) { struct jpeg_compress_struct s; jpeg_create_compress(&s); return 0; }
-EOF
- vnc_jpeg_cflags=""
- vnc_jpeg_libs="-ljpeg"
- if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then
- vnc_jpeg=yes
- libs_softmmu="$vnc_jpeg_libs $libs_softmmu"
- QEMU_CFLAGS="$QEMU_CFLAGS $vnc_jpeg_cflags"
- else
- if test "$vnc_jpeg" = "yes" ; then
- feature_not_found "vnc-jpeg" "Install libjpeg-turbo devel"
- fi
- vnc_jpeg=no
- fi
-fi
-
-##########################################
-# VNC PNG detection
-if test "$vnc" = "yes" && test "$vnc_png" != "no" ; then
-cat > $TMPC <<EOF
-//#include <stdio.h>
-#include <png.h>
-#include <stddef.h>
-int main(void) {
- png_structp png_ptr;
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- return png_ptr != 0;
-}
-EOF
- if $pkg_config libpng --exists; then
- vnc_png_cflags=$($pkg_config libpng --cflags)
- vnc_png_libs=$($pkg_config libpng --libs)
- else
- vnc_png_cflags=""
- vnc_png_libs="-lpng"
- fi
- if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
- vnc_png=yes
- libs_softmmu="$vnc_png_libs $libs_softmmu"
- QEMU_CFLAGS="$QEMU_CFLAGS $vnc_png_cflags"
- else
- if test "$vnc_png" = "yes" ; then
- feature_not_found "vnc-png" "Install libpng devel"
- fi
- vnc_png=no
- fi
-fi
-
-##########################################
# xkbcommon probe
if test "$xkbcommon" != "no" ; then
if $pkg_config xkbcommon --exists; then
@@ -6834,24 +6755,6 @@ if test "$audio_win_int" = "yes" ; then
fi
echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
-if test "$vnc" = "yes" ; then
- echo "CONFIG_VNC=y" >> $config_host_mak
-fi
-if test "$vnc_sasl" = "yes" ; then
- echo "CONFIG_VNC_SASL=y" >> $config_host_mak
-fi
-echo "SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
-echo "SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
-if test "$vnc_jpeg" = "yes" ; then
- echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
-fi
-echo "JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
-echo "JPEG_LIBS=$vnc_jpeg_libs" >> $config_host_mak
-if test "$vnc_png" = "yes" ; then
- echo "CONFIG_VNC_PNG=y" >> $config_host_mak
-fi
-echo "PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
-echo "PNG_LIBS=$vnc_png_libs" >> $config_host_mak
if test "$xkbcommon" = "yes" ; then
echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
@@ -8298,6 +8201,7 @@ NINJA=$PWD/ninjatool $python $meson setup \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
-Dsdl=$sdl -Dsdl_image=$sdl_image \
+ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
$cross_arg \
"$PWD" "$source_path"
diff --git a/meson.build b/meson.build
index 8bb0c69..913f22d 100644
--- a/meson.build
+++ b/meson.build
@@ -285,20 +285,20 @@ if 'CONFIG_GIO' in config_host
gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),
link_args: config_host['GIO_LIBS'].split())
endif
-png = not_found
-if 'CONFIG_VNC_PNG' in config_host
- png = declare_dependency(compile_args: config_host['PNG_CFLAGS'].split(),
- link_args: config_host['PNG_LIBS'].split())
-endif
-jpeg = not_found
-if 'CONFIG_VNC_JPEG' in config_host
- jpeg = declare_dependency(compile_args: config_host['JPEG_CFLAGS'].split(),
- link_args: config_host['JPEG_LIBS'].split())
-endif
-sasl = not_found
-if 'CONFIG_VNC_SASL' in config_host
- sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(),
- link_args: config_host['SASL_LIBS'].split())
+if get_option('vnc').enabled()
+ vnc = declare_dependency() # dummy dependency
+ png = dependency('libpng', required: get_option('vnc_png'))
+ jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'],
+ required: get_option('vnc_jpeg'))
+ sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
+ required: get_option('vnc_sasl'))
+ sasl = declare_dependency(dependencies: sasl,
+ compile_args: '-DSTRUCT_IOVEC_DEFINED')
+else
+ vnc = not_found
+ png = not_found
+ jpeg = not_found
+ sasl = not_found
endif
fdt = not_found
if 'CONFIG_FDT' in config_host
@@ -356,6 +356,10 @@ endif
config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
+config_host_data.set('CONFIG_VNC', vnc.found())
+config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
+config_host_data.set('CONFIG_VNC_PNG', png.found())
+config_host_data.set('CONFIG_VNC_SASL', sasl.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
@@ -1262,11 +1266,11 @@ summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']
summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
summary_info += {'VirtFS support': config_host.has_key('CONFIG_VIRTFS')}
summary_info += {'Multipath support': config_host.has_key('CONFIG_MPATH')}
-summary_info += {'VNC support': config_host.has_key('CONFIG_VNC')}
-if config_host.has_key('CONFIG_VNC')
- summary_info += {'VNC SASL support': config_host.has_key('CONFIG_VNC_SASL')}
- summary_info += {'VNC JPEG support': config_host.has_key('CONFIG_VNC_JPEG')}
- summary_info += {'VNC PNG support': config_host.has_key('CONFIG_VNC_PNG')}
+summary_info += {'VNC support': vnc.found()}
+if vnc.found()
+ summary_info += {'VNC SASL support': sasl.found()}
+ summary_info += {'VNC JPEG support': jpeg.found()}
+ summary_info += {'VNC PNG support': png.found()}
endif
summary_info += {'xen support': config_host.has_key('CONFIG_XEN_BACKEND')}
if config_host.has_key('CONFIG_XEN_BACKEND')
diff --git a/meson_options.txt b/meson_options.txt
index e548211..67455c5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,6 @@
option('sdl', type : 'feature', value : 'auto')
option('sdl_image', type : 'feature', value : 'auto')
+option('vnc', type : 'feature', value : 'enabled')
+option('vnc_jpeg', type : 'feature', value : 'auto')
+option('vnc_png', type : 'feature', value : 'auto')
+option('vnc_sasl', type : 'feature', value : 'auto')
diff --git a/ui/meson.build b/ui/meson.build
index 2822ad9..1504338 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -27,14 +27,12 @@ vnc_ss.add(files(
'vnc-ws.c',
'vnc-jobs.c',
))
-vnc_ss.add(zlib)
-vnc_ss.add(when: 'CONFIG_VNC_SASL', if_true: [files('vnc-auth-sasl.c'), sasl])
-softmmu_ss.add_all(when: 'CONFIG_VNC', if_true: vnc_ss)
-softmmu_ss.add(when: 'CONFIG_VNC', if_false: files('vnc-stubs.c'))
+vnc_ss.add(zlib, png, jpeg)
+vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
+softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
+softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c', 'egl-context.c'))
softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL_DMABUF'], if_true: files('egl-headless.c'))
-softmmu_ss.add(when: 'CONFIG_VNC_PNG', if_true: png)
-softmmu_ss.add(when: 'CONFIG_VNC_JPEG', if_true: jpeg)
ui_modules = []
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 142/143] meson: convert po/
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (140 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 141/143] meson: convert VNC and dependent libraries " Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 143/143] meson: update build-system documentation Paolo Bonzini
` (5 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 +---
configure | 2 +-
meson.build | 3 +++
po/LINGUAS | 7 ++++++
po/Makefile | 52 -----------------------------------------
po/POTFILES | 1 +
po/meson.build | 5 ++++
po/messages.po | 74 ----------------------------------------------------------
8 files changed, 18 insertions(+), 131 deletions(-)
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
diff --git a/Makefile b/Makefile
index bab1021..a0867c5 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ distclean: clean
rm -f config-host.mak config-host.h*
rm -f tests/tcg/config-*.mak
rm -f config-all-disas.mak config.status
- rm -f po/*.mo tests/qemu-iotests/common.env
+ rm -f tests/qemu-iotests/common.env
rm -f roms/seabios/config.mak roms/vgabios/config.mak
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
rm -f config.log
@@ -297,9 +297,6 @@ endif
mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
$(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
"$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
-ifdef CONFIG_GTK
- $(MAKE) -C po $@
-endif
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
diff --git a/configure b/configure
index cd1ab0c..5ad0f4c 100755
--- a/configure
+++ b/configure
@@ -8081,7 +8081,7 @@ DIRS="$DIRS docs docs/interop fsdev scsi"
DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios"
LINKS="Makefile"
-LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile"
+LINKS="$LINKS tests/tcg/lm32/Makefile"
LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
diff --git a/meson.build b/meson.build
index 913f22d..e9fd237 100644
--- a/meson.build
+++ b/meson.build
@@ -1091,6 +1091,9 @@ subdir('tools')
subdir('pc-bios')
subdir('tests')
subdir('docs')
+if 'CONFIG_GTK' in config_host
+ subdir('po')
+endif
if build_docs
makeinfo = find_program('makeinfo', required: build_docs)
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..054930d
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,7 @@
+bg
+de_DE
+fr_FR
+hu
+it
+tr
+zh_CN
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index c041f4c..0000000
--- a/po/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# This makefile is very special as it's meant to build as part of the build
-# process and also within the source tree to update the translation files.
-
-# Set SRC_PATH for in-tree builds without configuration.
-SRC_PATH=..
-
-# The default target must come before any include statements.
-all:
-
-.PHONY: all build clean install update
-
-%.mo: %.po
- $(call quiet-command, msgfmt -o $@ $<,"GEN","$@")
-
--include ../config-host.mak
-include $(SRC_PATH)/rules.mak
-
-PO_PATH=$(SRC_PATH)/po
-
-VERSION=$(shell cat $(SRC_PATH)/VERSION)
-SRCS=$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po))
-OBJS=$(patsubst $(PO_PATH)/%.po,%.mo,$(SRCS))
-
-vpath %.po $(PO_PATH)
-
-all:
- @echo "Use 'make update' to update translation files or use 'make build'"
- @echo "or 'make install' to build and install the translation files."
-
-update: $(SRCS)
-
-build: $(OBJS)
-
-clean:
- rm -f $(OBJS)
-
-install: $(OBJS)
- for obj in $(OBJS); do \
- base=$$(basename $$obj .mo); \
- $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \
- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
- done
-
-$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
- $(call quiet-command, ( cd $(SRC_PATH) && \
- xgettext -o - --from-code=UTF-8 --foreign-user --no-location \
- --package-name=QEMU --package-version=$(VERSION) \
- --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
- sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@")
-
-$(PO_PATH)/%.po: $(PO_PATH)/messages.po
- $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@")
diff --git a/po/POTFILES b/po/POTFILES
new file mode 100644
index 0000000..d34d5ed
--- /dev/null
+++ b/po/POTFILES
@@ -0,0 +1 @@
+ui/gtk.c
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..b99d8e2
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,5 @@
+i18n = import('i18n')
+
+i18n.gettext(meson.project_name(),
+ args: '--msgid-bugs-address=qemu-devel@nongnu.org',
+ preset: 'glib')
diff --git a/po/messages.po b/po/messages.po
deleted file mode 100644
index 065bd45..0000000
--- a/po/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: QEMU 2.12.91\n"
-"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2018-07-18 07:56+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid " - Press Ctrl+Alt+G to release grab"
-msgstr ""
-
-msgid " [Paused]"
-msgstr ""
-
-msgid "_Pause"
-msgstr ""
-
-msgid "_Reset"
-msgstr ""
-
-msgid "Power _Down"
-msgstr ""
-
-msgid "_Quit"
-msgstr ""
-
-msgid "_Fullscreen"
-msgstr ""
-
-msgid "_Copy"
-msgstr ""
-
-msgid "Zoom _In"
-msgstr ""
-
-msgid "Zoom _Out"
-msgstr ""
-
-msgid "Best _Fit"
-msgstr ""
-
-msgid "Zoom To _Fit"
-msgstr ""
-
-msgid "Grab On _Hover"
-msgstr ""
-
-msgid "_Grab Input"
-msgstr ""
-
-msgid "Show _Tabs"
-msgstr ""
-
-msgid "Detach Tab"
-msgstr ""
-
-msgid "Show Menubar"
-msgstr ""
-
-msgid "_Machine"
-msgstr ""
-
-msgid "_View"
-msgstr ""
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* [PATCH 143/143] meson: update build-system documentation
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (141 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 142/143] meson: convert po/ Paolo Bonzini
@ 2020-08-06 19:16 ` Paolo Bonzini
2020-08-07 6:53 ` [DRAFT PATCH 000/143] Meson integration for 5.2 Cornelia Huck
` (4 subsequent siblings)
147 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 19:16 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
docs/devel/build-system.txt | 373 ++++++++++++++++++++++----------------------
1 file changed, 185 insertions(+), 188 deletions(-)
diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt
index fea67b2..fb62cb2 100644
--- a/docs/devel/build-system.txt
+++ b/docs/devel/build-system.txt
@@ -22,6 +22,30 @@ silent while it is checking for features. It will only display output
when an error occurs, or to show the final feature enablement summary
on completion.
+Because QEMU uses the Meson build system under the hood, only VPATH
+builds are supported. There are two general ways to invoke configure &
+perform a build:
+
+ - VPATH, build artifacts outside of QEMU source tree entirely
+
+ cd ../
+ mkdir build
+ cd build
+ ../qemu/configure
+ make
+
+ - VPATH, build artifacts in a subdir of QEMU source tree
+
+ mkdir build
+ cd build
+ ../configure
+ make
+
+For now, checks on the compilation environment are found in configure
+rather than meson.build, though this is expected to change. The command
+line is parsed in the configure script and, whenever needed, converted
+into the appropriate options to Meson.
+
Adding new checks to the configure script usually comprises the
following tasks:
@@ -164,145 +188,161 @@ developers in checking for system features:
then --static will be automatically added to $ARGS
-Stage 2: makefiles
-==================
-
-The use of GNU make is required with the QEMU build system.
-
-Although the source code is spread across multiple subdirectories, the
-build system should be considered largely non-recursive in nature, in
-contrast to common practices seen with automake. There is some recursive
-invocation of make, but this is related to the things being built,
-rather than the source directory structure.
-
-QEMU currently supports both VPATH and non-VPATH builds, so there are
-three general ways to invoke configure & perform a build.
+Stage 2: Meson
+==============
- - VPATH, build artifacts outside of QEMU source tree entirely
+The Meson build system is currently used to describe the build
+process for:
- cd ../
- mkdir build
- cd build
- ../qemu/configure
- make
-
- - VPATH, build artifacts in a subdir of QEMU source tree
+1) executables, which include:
+ - Tools - qemu-img, qemu-nbd, qga (guest agent), etc
+ - System emulators - qemu-system-$ARCH
+ - Userspace emulators - qemu-$ARCH
+ - Some (but not all) unit tests
- mkdir build
- cd build
- ../configure
- make
+2) documentation
- - non-VPATH, build artifacts everywhere
+3) ROMs, which can be either installed as binary blobs or compiled
- ./configure
- make
+4) other data files, such as icons or desktop files
-The QEMU maintainers generally recommend that a VPATH build is used by
-developers. Patches to QEMU are expected to ensure VPATH build still
-works.
+The source code is highly modularized, split across many files to
+facilitate building of all of these components with as little duplicated
+compilation as possible. The Meson "sourceset" functionality is used
+to list the files and their dependency on various configuration
+symbols.
+Various subsystems that are common to both tools and emulators have
+their own sourceset, for example block_ss for the block device subsystem,
+chardev_ss for the character device subsystem, etc. These sourcesets
+are then turned into static libraries as follows:
-Module structure
-----------------
+ libchardev = static_library('chardev', chardev_ss.sources(),
+ name_suffix: 'fa',
+ build_by_default: false)
-There are a number of key outputs of the QEMU build system:
+ chardev = declare_dependency(link_whole: libchardev)
- - Tools - qemu-img, qemu-nbd, qga (guest agent), etc
- - System emulators - qemu-system-$ARCH
- - Userspace emulators - qemu-$ARCH
- - Unit tests
+The special ".fa" suffix is needed as long as unit tests are built with
+the older Makefile infrastructure, and will go away later.
-The source code is highly modularized, split across many files to
-facilitate building of all of these components with as little duplicated
-compilation as possible. There can be considered to be two distinct
-groups of files, those which are independent of the QEMU emulation
-target and those which are dependent on the QEMU emulation target.
+Files linked into emulator targets there can be split into two distinct groups
+of files, those which are independent of the QEMU emulation target and
+those which are dependent on the QEMU emulation target.
In the target-independent set lives various general purpose helper code,
such as error handling infrastructure, standard data structures,
platform portability wrapper functions, etc. This code can be compiled
once only and the .o files linked into all output binaries.
+Target-independent code lives in the common_ss, softmmu_ss and user_ss
+sourcesets. common_ss is linked into all emulators, softmmu_ss only
+in system emulators, user_ss only in user-mode emulators.
In the target-dependent set lives CPU emulation, device emulation and
much glue code. This sometimes also has to be compiled multiple times,
once for each target being built.
-The utility code that is used by all binaries is built into a
-static archive called libqemuutil.a, which is then linked to all the
-binaries. In order to provide hooks that are only needed by some of the
-binaries, code in libqemuutil.a may depend on other functions that are
-not fully implemented by all QEMU binaries. Dummy stubs for all these
-functions are also provided by this library, and will only be linked
+All binaries link with a static library libqemuutil.a, which is then
+linked to all the binaries. libqemuutil.a is built from several
+sourcesets; most of them however host generated code, and the only two
+of general interest are util_ss and stub_ss.
+
+The separation between these two is purely for documentation purposes.
+util_ss contains generic utility files. Even though this code is only
+linked in some binaries, sometimes it requires hooks only in some of
+these and depend on other functions that are not fully implemented by
+all QEMU binaries. stub_ss links dummy stubs that will only be linked
into the binary if the real implementation is not present. In a way,
the stubs can be thought of as a portable implementation of the weak
symbols concept.
-All binaries should link to libqemuutil.a, e.g.:
+The following files concur in the definition of which files are linked
+into each emulator:
- qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a
+- default-configs/*.mak
+
+The files under default-configs/ control what emulated hardware is built
+into each QEMU system and userspace emulator targets. They merely contain
+a list of config variable definitions like the machines that should be
+included. For example, default-configs/aarch64-softmmu.mak has:
+ include arm-softmmu.mak
+ CONFIG_XLNX_ZYNQMP_ARM=y
+ CONFIG_XLNX_VERSAL=y
-Windows platform portability
-----------------------------
+These files rarely need changing unless new devices / hardware need to
+be enabled for a particular system/userspace emulation target
-On Windows, all binaries have the suffix '.exe', so all Makefile rules
-which create binaries must include the $(EXESUF) variable on the binary
-name. e.g.
+- */Kconfig
- qemu-img$(EXESUF): qemu-img.o ..snip..
+These files are processed together with default-configs/*.mak and
+describe the dependencies between various features, subsystems and
+device models. They are described in kconfig.rst.
-This expands to '.exe' on Windows, or '' on other platforms.
-A further complication for the system emulator binaries is that
-two separate binaries need to be generated.
+Stage 3: makefiles
+==================
-The main binary (e.g. qemu-system-x86_64.exe) is linked against the
-Windows console runtime subsystem. These are expected to be run from a
-command prompt window, and so will print stderr to the console that
-launched them.
+The use of GNU make is required with the QEMU build system.
-The second binary generated has a 'w' on the end of its name (e.g.
-qemu-system-x86_64w.exe) and is linked against the Windows graphical
-runtime subsystem. These are expected to be run directly from the
-desktop and will open up a dedicated console window for stderr output.
+The output of Meson is a build.ninja file, which is used with the Ninja
+build system. QEMU uses a different approach, where Makefile rules are
+synthesized from the build.ninja file. The main Makefile includes these
+rules and wraps them so that e.g. submodules are built before QEMU.
+The resulting build system is largely non-recursive in nature, in
+contrast to common practices seen with automake.
-The Makefile.target will generate the binary for the graphical subsystem
-first, and then use objcopy to relink it against the console subsystem
-to generate the second binary.
+Tests are also ran by the Makefile with the traditional "make check"
+phony target. Meson test suites such as "unit" can be ran with "make
+check-unit" too. It is also possible to run tests defined in meson.build
+with "meson test".
+The following text is only relevant for unit tests which still have to
+be converted to Meson.
-Object variable naming
-----------------------
+All binaries should link to libqemuutil.a, e.g.:
+
+ qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a
+
+On Windows, all binaries have the suffix '.exe', so all Makefile rules
+which create binaries must include the $(EXESUF) variable on the binary
+name. e.g.
+
+ qemu-img$(EXESUF): qemu-img.o ..snip..
+
+This expands to '.exe' on Windows, or '' on other platforms.
+
+Variable naming
+---------------
The QEMU convention is to define variables to list different groups of
-object files. These are named with the convention $PREFIX-obj-y. For
-example the libqemuutil.a file will be linked with all objects listed
-in a variable 'util-obj-y'. So, for example, util/Makefile.obj will
-contain a set of definitions looking like
+object files. These are named with the convention $PREFIX-obj-y. The
+Meson "chardev" variable in the previous example corresponds to a
+variable 'chardev-obj-y'.
+
+Likewise, tests that are executed by "make check-unit" are grouped into
+a variable check-unit-y, like this:
- util-obj-y += bitmap.o bitops.o hbitmap.o
- util-obj-y += fifo8.o
- util-obj-y += acl.o
- util-obj-y += error.o qemu-error.o
+ check-unit-y += tests/test-visitor-serialization$(EXESUF)
+ check-unit-y += tests/test-iov$(EXESUF)
+ check-unit-y += tests/test-bitmap$(EXESUF)
-When there is an object file which needs to be conditionally built based
+When a test or object file which needs to be conditionally built based
on some characteristic of the host system, the configure script will
define a variable for the conditional. For example, on Windows it will
define $(CONFIG_POSIX) with a value of 'n' and $(CONFIG_WIN32) with a
value of 'y'. It is now possible to use the config variables when
listing object files. For example,
- util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
- util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
+ check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF)
On Windows this expands to
- util-obj-y += oslib-win32.o qemu-thread-win32.o
- util-obj-n += oslib-posix.o qemu-thread-posix.o
+ check-unit-n += tests/vmstate.exe
-Since libqemutil.a links in $(util-obj-y), the POSIX specific files
-listed against $(util-obj-n) are ignored on the Windows platform builds.
+Since the "check-unit" target only runs tests included in "$(check-unit-y)",
+POSIX specific tests listed in $(util-obj-n) are ignored on the Windows
+platform builds.
CFLAGS / LDFLAGS / LIBS handling
@@ -316,27 +356,25 @@ avoided in QEMU, since it would apply to too many build targets.
Flags that are needed by any QEMU code (i.e. everything *except* GIT
submodule projects) are put in $(QEMU_CFLAGS) variable. For linker
flags the $(LIBS) variable is sometimes used, but a couple of more
-targeted variables are preferred. $(libs_softmmu) is used for
-libraries that must be linked to system emulator targets, $(LIBS_TOOLS)
-is used for tools like qemu-img, qemu-nbd, etc and $(LIBS_QGA) is used
-for the QEMU guest agent. There is currently no specific variable for
-the userspace emulator targets as the global $(LIBS), or more targeted
-variables shown below, are sufficient.
+targeted variables are preferred.
In addition to these variables, it is possible to provide cflags and
libs against individual source code files, by defining variables of the
-form $FILENAME-cflags and $FILENAME-libs. For example, the curl block
-driver needs to link to the libcurl library, so block/Makefile defines
-some variables:
+form $FILENAME-cflags and $FILENAME-libs. For example, the test
+test-crypto-tlscredsx509 needs to link to the libtasn1 library,
+so tests/Makefile.include defines some variables:
- curl.o-cflags := $(CURL_CFLAGS)
- curl.o-libs := $(CURL_LIBS)
+ tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS)
+ tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS)
The scope is a little different between the two variables. The libs get
used when linking any target binary that includes the curl.o object
file, while the cflags get used when compiling the curl.c file only.
+Important files for the build system
+====================================
+
Statically defined files
------------------------
@@ -348,81 +386,26 @@ number of dynamically created files listed later.
The main entry point used when invoking make to build all the components
of QEMU. The default 'all' target will naturally result in the build of
-every component. The various tools and helper binaries are built
+every component. Makefile takes care of recursively building submodules
directly via a non-recursive set of rules.
-Each system/userspace emulation target needs to have a slightly
-different set of make rules / variables. Thus, make will be recursively
-invoked for each of the emulation targets.
-
-The recursive invocation will end up processing the toplevel
-Makefile.target file (more on that later).
-
-
-- */Makefile.objs
-
-Since the source code is spread across multiple directories, the rules
-for each file are similarly modularized. Thus each subdirectory
-containing .c files will usually also contain a Makefile.objs file.
-These files are not directly invoked by a recursive make, but instead
-they are imported by the top level Makefile and/or Makefile.target
+- Makefile.objs
-Each Makefile.objs usually just declares a set of variables listing the
-.o files that need building from the source files in the directory. They
-will also define any custom linker or compiler flags. For example in
-block/Makefile.objs
+Defines *-obj-y files corresponding to
- block-obj-$(CONFIG_LIBISCSI) += iscsi.o
- block-obj-$(CONFIG_CURL) += curl.o
-
- ..snip...
-
- iscsi.o-cflags := $(LIBISCSI_CFLAGS)
- iscsi.o-libs := $(LIBISCSI_LIBS)
- curl.o-cflags := $(CURL_CFLAGS)
- curl.o-libs := $(CURL_LIBS)
-
-If there are any rules defined in the Makefile.objs file, they should
-all use $(obj) as a prefix to the target, e.g.
-
- $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
-
-
-- Makefile.target
-
-This file provides the entry point used to build each individual system
-or userspace emulator target. Each enabled target has its own
-subdirectory. For example if configure is run with the argument
-'--target-list=x86_64-softmmu', then a sub-directory 'x86_64-softmmu'
-will be created, containing a 'Makefile' which symlinks back to
-Makefile.target
-
-So when the recursive '$(MAKE) -C x86_64-softmmu' is invoked, it ends up
-using Makefile.target for the build rules.
+- */meson.build
+The meson.build file in the root directory is the main entry point for the
+Meson build system, and it coordinates the configuration and build of all
+executables. Build rules for various subdirectories are included in
+other meson.build files spread throughout the QEMU source tree.
- rules.mak
This file provides the generic helper rules for invoking build tools, in
particular the compiler and linker.
-
-- default-configs/*.mak
-
-The files under default-configs/ control what emulated hardware is built
-into each QEMU system and userspace emulator targets. They merely contain
-a list of config variable definitions like the machines that should be
-included. For example, default-configs/aarch64-softmmu.mak has:
-
- include arm-softmmu.mak
- CONFIG_XLNX_ZYNQMP_ARM=y
- CONFIG_XLNX_VERSAL=y
-
-These files rarely need changing unless new devices / hardware need to
-be enabled for a particular system/userspace emulation target
-
-
-- tests/Makefile
+- tests/Makefile.include
Rules for building the unit tests. This file is included directly by the
top level Makefile, so anything defined in this file will influence the
@@ -435,11 +418,11 @@ Rules for Docker tests. Like tests/Makefile, this file is included
directly by the top level Makefile, anything defined in this file will
influence the entire build system.
-- po/Makefile
-
-Rules for building and installing the binary message catalogs from the
-text .po file sources. This almost never needs changing for any reason.
+- tests/vm/Makefile.include
+Rules for VM-based tests. Like tests/Makefile, this file is included
+directly by the top level Makefile, anything defined in this file will
+influence the entire build system.
Dynamically created files
-------------------------
@@ -450,6 +433,7 @@ the need for QEMU makefiles to go through any pre-processing as seen
with autotools, where Makefile.am generates Makefile.in which generates
Makefile.
+Built by configure:
- config-host.mak
@@ -457,27 +441,17 @@ When configure has determined the characteristics of the build host it
will write a long list of variables to config-host.mak file. This
provides the various install directories, compiler / linker flags and a
variety of CONFIG_* variables related to optionally enabled features.
-This is imported by the top level Makefile in order to tailor the build
-output.
+This is imported by the top level Makefile and meson.build in order to
+tailor the build output.
+
+config-host.mak is also used as a dependency checking mechanism. If make
+sees that the modification timestamp on configure is newer than that on
+config-host.mak, then configure will be re-run.
The variables defined here are those which are applicable to all QEMU
build outputs. Variables which are potentially different for each
emulator target are defined by the next file...
-It is also used as a dependency checking mechanism. If make sees that
-the modification timestamp on configure is newer than that on
-config-host.mak, then configure will be re-run.
-
-
-- config-host.h
-
-The config-host.h file is used by source code to determine what features
-are enabled. It is generated from the contents of config-host.mak using
-the scripts/create_config program. This extracts all the CONFIG_* variables,
-most of the HOST_* variables and a few other misc variables from
-config-host.mak, formatting them as C preprocessor macros.
-
-
- $TARGET-NAME/config-target.mak
TARGET-NAME is the name of a system or userspace emulator, for example,
@@ -488,19 +462,42 @@ the target and any other potential custom libraries needed for linking
the target.
-- $TARGET-NAME/config-devices.mak
+Built by Meson:
+
+- ${TARGET-NAME}-config-devices.mak
TARGET-NAME is again the name of a system or userspace emulator. The
config-devices.mak file is automatically generated by make using the
scripts/make_device_config.sh program, feeding it the
default-configs/$TARGET-NAME file as input.
+- config-host.h
+- $TARGET-NAME/config-target.h
+- $TARGET-NAME/config-devices.h
+
+These files are used by source code to determine what features
+are enabled. They are generated from the contents of the corresponding
+*.h files using the scripts/create_config program. This extracts
+relevant variables and formats them as C preprocessor macros.
+
+- build.ninja
+
+
+Built by Makefile:
+
+- Makefile.ninja:
+
+A Makefile conversion of the build rules in build.ninja. The conversion
+is straightforward and, were it necessary to debug the rules produced
+by Meson, it should be enough to look at build.ninja. The conversion
+is performed by scripts/ninjatool.py.
-- $TARGET-NAME/Makefile
+- Makefile.mtest:
-This is the entrypoint used when make recurses to build a single system
-or userspace emulator target. It is merely a symlink back to the
-Makefile.target in the top level.
+The Makefile definitions that let "make check" run tests defined in
+meson.build. The rules are produced from Meson's JSON description of
+tests (obtained with "meson introspect --tests") through the script
+scripts/mtest2make.py.
Useful make targets
--
1.8.3.1
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [PATCH 108/143] meson: convert hw/intc
2020-08-06 19:15 ` [PATCH 108/143] meson: convert hw/intc Paolo Bonzini
@ 2020-08-06 21:02 ` Peter Maydell
2020-08-06 21:20 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-06 21:02 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, QEMU Developers
On Thu, 6 Aug 2020 at 21:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Compared to:
> -common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
> +softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
this feels pretty clunky. Doesn't Meson have a nicer
way of expressing this kind of thing? It's really
common and I'd hope that a build system language
would provide less long-winded ways to write common
operations...
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 108/143] meson: convert hw/intc
2020-08-06 21:02 ` Peter Maydell
@ 2020-08-06 21:20 ` Paolo Bonzini
2020-08-06 21:42 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-06 21:20 UTC (permalink / raw)
To: Peter Maydell; +Cc: Marc-André Lureau, QEMU Developers
[-- Attachment #1: Type: text/plain, Size: 2022 bytes --]
Il gio 6 ago 2020, 23:02 Peter Maydell <peter.maydell@linaro.org> ha
scritto:
> On Thu, 6 Aug 2020 at 21:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Compared to:
>
> > -common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
>
> > +softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true:
> files('heathrow_pic.c'))
>
> this feels pretty clunky. Doesn't Meson have a nicer
> way of expressing this kind of thing?
Nope, in fact it turns out we had to implement it ourselves because there
was no way to express it at all in the way that QEMU build multiple
binaries. My initial version didn't have the when/if_true part but the
maintainer was quite adamant on requiring them instead of just relying on
positional arguments.
Unfortunately, while common in QEMU, and in Linux too, it doesn't seem to
be a very common idiom in general; Makefiles do express it in a very
readable and concise way.
I cannot deny it looks clunky. While Meson does have a huge advantage in
terms of predictability and lack of surprises when doing harder things, the
imperative syntax is heavier when dealing with the simplest. They do remain
simple (it's still one line of coffee), but the quotes and commas seem to
be enough to "switch" our brain to a different mode.
My opinion is that you don't really look at these things very much, so it
doesn't really matter, but I can see people disagreeing.
(You had already pointed this out during the very first discussions, if I
remember correctly. I can't add much except that with extra experience the
balance does tilt in favor of Meson despite the heavier syntax for simple
cases).
Paolo
It's really
> common and I'd hope that a build system language
> would provide less long-winded ways to write common
> operations...
>
> thanks
> -- PMM
>
>
[-- Attachment #2: Type: text/html, Size: 3204 bytes --]
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 108/143] meson: convert hw/intc
2020-08-06 21:20 ` Paolo Bonzini
@ 2020-08-06 21:42 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-06 21:42 UTC (permalink / raw)
To: Paolo Bonzini, Peter Maydell; +Cc: Marc-André Lureau, QEMU Developers
On 8/6/20 11:20 PM, Paolo Bonzini wrote:
>
>
> Il gio 6 ago 2020, 23:02 Peter Maydell <peter.maydell@linaro.org
> <mailto:peter.maydell@linaro.org>> ha scritto:
>
> On Thu, 6 Aug 2020 at 21:10, Paolo Bonzini <pbonzini@redhat.com
> <mailto:pbonzini@redhat.com>> wrote:
> >
> > From: Marc-André Lureau <marcandre.lureau@redhat.com
> <mailto:marcandre.lureau@redhat.com>>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com
> <mailto:marcandre.lureau@redhat.com>>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com
> <mailto:pbonzini@redhat.com>>
>
> Compared to:
>
> > -common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
>
> > +softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true:
> files('heathrow_pic.c'))
>
> this feels pretty clunky. Doesn't Meson have a nicer
> way of expressing this kind of thing?
Don't forget we also use:
HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) +=
qemu-bridge-helper$(EXESUF)
ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif
>
>
> Nope, in fact it turns out we had to implement it ourselves because
> there was no way to express it at all in the way that QEMU build
> multiple binaries. My initial version didn't have the when/if_true part
> but the maintainer was quite adamant on requiring them instead of just
> relying on positional arguments.
>
> Unfortunately, while common in QEMU, and in Linux too, it doesn't seem
> to be a very common idiom in general; Makefiles do express it in a very
> readable and concise way.
>
> I cannot deny it looks clunky. While Meson does have a huge advantage in
> terms of predictability and lack of surprises when doing harder things,
> the imperative syntax is heavier when dealing with the simplest. They do
> remain simple (it's still one line of coffee), but the quotes and commas
> seem to be enough to "switch" our brain to a different mode.
>
> My opinion is that you don't really look at these things very much, so
> it doesn't really matter, but I can see people disagreeing.
>
> (You had already pointed this out during the very first discussions, if
> I remember correctly. I can't add much except that with extra experience
> the balance does tilt in favor of Meson despite the heavier syntax for
> simple cases).
>
> Paolo
>
> It's really
> common and I'd hope that a build system language
> would provide less long-winded ways to write common
> operations...
>
> thanks
> -- PMM
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 095/143] meson: convert hw/sd
2020-08-06 19:15 ` [PATCH 095/143] meson: convert hw/sd Paolo Bonzini
@ 2020-08-06 21:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-06 21:43 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:15 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hw/Makefile.objs | 1 -
> hw/meson.build | 1 +
> hw/sd/Makefile.objs | 12 ------------
> hw/sd/meson.build | 12 ++++++++++++
> 4 files changed, 13 insertions(+), 13 deletions(-)
> delete mode 100644 hw/sd/Makefile.objs
> create mode 100644 hw/sd/meson.build
>
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index e50eb04..6f9c0b7 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -25,7 +25,6 @@ devices-dirs-y += pci/
> devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
> devices-dirs-y += pcmcia/
> devices-dirs-$(CONFIG_SCSI) += scsi/
> -devices-dirs-y += sd/
> endif
>
> common-obj-y += $(devices-dirs-y)
> diff --git a/hw/meson.build b/hw/meson.build
> index 7564426..a73f4ae 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -2,6 +2,7 @@ subdir('core')
> subdir('mem')
> subdir('nubus')
> subdir('rtc')
> +subdir('sd')
> subdir('semihosting')
> subdir('smbios')
> subdir('ssi')
> diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs
> deleted file mode 100644
> index 0d1df17..0000000
> --- a/hw/sd/Makefile.objs
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -common-obj-$(CONFIG_PL181) += pl181.o
> -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
> -common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o
> -common-obj-$(CONFIG_SDHCI) += sdhci.o
> -common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o
> -
> -common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sdhost.o
> -common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
> -common-obj-$(CONFIG_OMAP) += omap_mmc.o
> -common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
> -common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
> -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
> diff --git a/hw/sd/meson.build b/hw/sd/meson.build
> new file mode 100644
> index 0000000..b43e59b
> --- /dev/null
> +++ b/hw/sd/meson.build
> @@ -0,0 +1,12 @@
> +softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
> +softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
> +softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
> +softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
> +softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
> +
> +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard.c'))
> +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
> +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
> +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
> +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
> +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 001/143] tests: move socket_scm_helper back to tests/
2020-08-06 19:13 ` [PATCH 001/143] tests: move socket_scm_helper back to tests/ Paolo Bonzini
@ 2020-08-06 21:50 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-06 21:50 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 8/6/20 9:13 PM, Paolo Bonzini wrote:
> This file is unrelated to qemu-iotests and was moved incorrectly
> to tests/qtest/Makefile.include.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> tests/Makefile.include | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index c7e4646..985cd14 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -879,6 +879,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
>
> QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
>
> +tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
Already done in 6e1da96b94 ("tests/qemu-iotests: Fix socket_scm_helper
build path"). Should we move it back to tests/?
> +
> .PHONY: check-tests/check-block.sh
> check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
> qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (142 preceding siblings ...)
2020-08-06 19:16 ` [PATCH 143/143] meson: update build-system documentation Paolo Bonzini
@ 2020-08-07 6:53 ` Cornelia Huck
2020-08-07 7:59 ` Paolo Bonzini
2020-08-07 8:01 ` 罗勇刚(Yonggang Luo)
2020-08-07 7:56 ` Markus Armbruster
` (3 subsequent siblings)
147 siblings, 2 replies; 250+ messages in thread
From: Cornelia Huck @ 2020-08-07 6:53 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Thu, 6 Aug 2020 21:13:56 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:
> This the more or less final version of the Meson conversion. Due to
> the sheer size of the series you have been CCed only on the cover
> letter.
>
> The series reaches the point where Makefile.target and unnest-vars
> can be removed, and all builds become non-recursive. I have also
> converted parts of the testsuite, notably qtest since it is needed
> for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> 2) moving the rest of installation to meson (for which I have patches);
> 3) moving feature detection from configure to meson.
>
> Things I still haven't tested:
> - fuzzing
> - non-x86/Linux builds
So, I was planning to give it a go on s390, but I cannot even build it
on x86 (fails configure):
Build started at 2020-08-07T08:43:43.873638
Main binary: /usr/bin/python3
Build Options: -Doptimization=2 -Ddebug=true -Dwerror=true -Dstrip=true -Db_pie=true -Db_coverage=false -Dsdl=auto -Dsdl_image=auto -Dvnc=enabled -Dvnc_sasl=auto -Dvnc_jpeg=auto -Dvnc_png=auto -Dprefix=/usr/local -Dbindir=/usr/local/bin -Ddatadir=/usr/local/share -Dincludedir=/usr/local/include -Dlibdir=/usr/local/lib -Dlibexecdir=/usr/local/libexec -Dlocalstatedir=/usr/local/var -Dmandir=/usr/local/share/man -Dsysconfdir=/usr/local/etc
Python system: Linux
The Meson build system
Version: 0.52.0
Source dir: /home/cohuck/git/qemu
Build dir: /home/cohuck/git/qemu/build
Build type: native build
meson.build:438:22: ERROR: Key must be a string.
config_target_h += {target: configure_file(output: target + '-config-target.h',
^
(Fedora 31, version from your github branch)
Is there anything special I need to install beyond meson?
> - static builds
> - Docker and VM builds
>
> Things I have checked:
> - x86 builds
> - modules
> - "make install"
> - internal slirp/dtc/capstone.
>
> It should be more or less bisectable. I have not tried building
> _all_ steps, but I have tried both before and after each major one.
>
> Build system rebuild rules seem to work reliably.
>
> After a week or quite intense rebasing, my impression is more or less
> the same as last December: Meson looks more daunting, but it is actually
> much nicer to work with.
>
> The diffstat so far is not very favorable, but remember that:
>
> 1) the series leaves quite a few nearly-obsolete bits in configure,
> Makefile and rules.mak (over 200 lines only in the makefiles).
>
> 2) configure test conversion will be where meson really shines. I
> included a couple examples just to show
>
> meson: convert VNC and dependent libraries to meson
> 4 files changed, 44 insertions(+), 134 deletions(-)
>
> meson: move SDL and SDL-image detection to meson
> 5 files changed, 30 insertions(+), 144 deletions(-)
>
> meson: replace create-config with meson configure_file
> 6 files changed, 80 insertions(+), 168 deletions(-)
>
> 3) the idea behind using Makefile generators is to have stable
> code written in a high-level language instead of Makefile magic
> that tends to grow by accretion. So even though ninjatool is
> large at 1000 lines of Python, it can already be considered mature
> or even "done". It had only ~15 lines changed since the last post,
> and whenever debugging meson.build issues looking at build.ninja has
> always (literally!) been enough.
>
> Available on git://github.com/bonzini/qemu branch meson-poc-next.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (143 preceding siblings ...)
2020-08-07 6:53 ` [DRAFT PATCH 000/143] Meson integration for 5.2 Cornelia Huck
@ 2020-08-07 7:56 ` Markus Armbruster
2020-08-07 8:22 ` Daniel P. Berrangé
2020-08-07 8:39 ` Paolo Bonzini
2020-08-07 8:49 ` Peter Maydell
` (2 subsequent siblings)
147 siblings, 2 replies; 250+ messages in thread
From: Markus Armbruster @ 2020-08-07 7:56 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
Paolo Bonzini <pbonzini@redhat.com> writes:
> This the more or less final version of the Meson conversion. Due to
> the sheer size of the series you have been CCed only on the cover
> letter.
Perfect timing: right before I drop off for two weeks of vacation. I'm
excused! *Maniacal laughter*
> The series reaches the point where Makefile.target and unnest-vars
> can be removed, and all builds become non-recursive. I have also
> converted parts of the testsuite, notably qtest since it is needed
> for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> 2) moving the rest of installation to meson (for which I have patches);
> 3) moving feature detection from configure to meson.
>
> Things I still haven't tested:
> - fuzzing
> - non-x86/Linux builds
> - static builds
> - Docker and VM builds
>
> Things I have checked:
> - x86 builds
> - modules
> - "make install"
> - internal slirp/dtc/capstone.
Have you run it through our CI?
> It should be more or less bisectable. I have not tried building
> _all_ steps, but I have tried both before and after each major one.
>
> Build system rebuild rules seem to work reliably.
Is it faster in common build scenarios?
> After a week or quite intense rebasing, my impression is more or less
> the same as last December: Meson looks more daunting, but it is actually
> much nicer to work with.
Not a particularly high bar to cross: our Makefiles are full of the kind
of black magic that keeps simple things simple (which is quite an
achievement; kudos!), and makes not-so-simple things really hard.
I think it's now time to plan the end game, preferably without even more
weeks of intense rebasing.
Do we have consensus to move forward with Meson? If yes, I'd like to
propose to aim for merging as early as practical in the 5.2 cycle.
Rationale: rebasing build system changes on top of the Meson work is
probably easier than rebasing the Meson work, and avoids turning Paolo
into an overworked bottleneck.
In more detail:
1. Pick a tentative deadline.
2. Cover the testing gaps and get as much review as we can until then.
Fix defects as we go.
3. If the known defects are expected to disrupt others too much, goto 1.
Do not worry about unknown defects at this point.
4. Merge.
5. Deal with the fallout.
Opinions?
> The diffstat so far is not very favorable, but remember that:
>
> 1) the series leaves quite a few nearly-obsolete bits in configure,
> Makefile and rules.mak (over 200 lines only in the makefiles).
>
> 2) configure test conversion will be where meson really shines. I
> included a couple examples just to show
>
> meson: convert VNC and dependent libraries to meson
> 4 files changed, 44 insertions(+), 134 deletions(-)
>
> meson: move SDL and SDL-image detection to meson
> 5 files changed, 30 insertions(+), 144 deletions(-)
>
> meson: replace create-config with meson configure_file
> 6 files changed, 80 insertions(+), 168 deletions(-)
>
> 3) the idea behind using Makefile generators is to have stable
> code written in a high-level language instead of Makefile magic
> that tends to grow by accretion. So even though ninjatool is
> large at 1000 lines of Python, it can already be considered mature
> or even "done". It had only ~15 lines changed since the last post,
> and whenever debugging meson.build issues looking at build.ninja has
> always (literally!) been enough.
The major drawback with generating code is usually having to debug the
generated code. Your experience of not having to do that is
encouraging.
> Available on git://github.com/bonzini/qemu branch meson-poc-next.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 6:53 ` [DRAFT PATCH 000/143] Meson integration for 5.2 Cornelia Huck
@ 2020-08-07 7:59 ` Paolo Bonzini
2020-08-07 9:35 ` Cornelia Huck
2020-08-07 8:01 ` 罗勇刚(Yonggang Luo)
1 sibling, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 7:59 UTC (permalink / raw)
To: Cornelia Huck
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On 07/08/20 08:53, Cornelia Huck wrote:
> So, I was planning to give it a go on s390, but I cannot even build it
> on x86 (fails configure):
>
> Build started at 2020-08-07T08:43:43.873638
> Main binary: /usr/bin/python3
> Build Options: -Doptimization=2 -Ddebug=true -Dwerror=true -Dstrip=true -Db_pie=true -Db_coverage=false -Dsdl=auto -Dsdl_image=auto -Dvnc=enabled -Dvnc_sasl=auto -Dvnc_jpeg=auto -Dvnc_png=auto -Dprefix=/usr/local -Dbindir=/usr/local/bin -Ddatadir=/usr/local/share -Dincludedir=/usr/local/include -Dlibdir=/usr/local/lib -Dlibexecdir=/usr/local/libexec -Dlocalstatedir=/usr/local/var -Dmandir=/usr/local/share/man -Dsysconfdir=/usr/local/etc
> Python system: Linux
> The Meson build system
> Version: 0.52.0
> Source dir: /home/cohuck/git/qemu
> Build dir: /home/cohuck/git/qemu/build
> Build type: native build
>
> meson.build:438:22: ERROR: Key must be a string.
> config_target_h += {target: configure_file(output: target + '-config-target.h',
> ^
> (Fedora 31, version from your github branch)
>
> Is there anything special I need to install beyond meson?
You probably need to do "git submodule init"/"git submodule update" so
that it picks up the in-tree meson (0.55.0).
If you want to test on s390, just testing the boot ROM would be great
(patch 3). That one does not need Meson at all; the purpose of the
patch is just to decouple the boot ROM makefile from rules.mak, which
allows to drop some of the contents of rules.mak.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 6:53 ` [DRAFT PATCH 000/143] Meson integration for 5.2 Cornelia Huck
2020-08-07 7:59 ` Paolo Bonzini
@ 2020-08-07 8:01 ` 罗勇刚(Yonggang Luo)
2020-08-07 8:11 ` Paolo Bonzini
1 sibling, 1 reply; 250+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-08-07 8:01 UTC (permalink / raw)
To: Cornelia Huck
Cc: Peter Maydell, Daniel P. Berrangé,
Alex Bennée, qemu-level, armbru, jsnow, stefanha,
Paolo Bonzini, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 3972 bytes --]
Could meson can generate CMake file or directly using CMake?
cause Cmake have better IDE support.
On Fri, Aug 7, 2020 at 2:54 PM Cornelia Huck <cohuck@redhat.com> wrote:
> On Thu, 6 Aug 2020 21:13:56 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> > This the more or less final version of the Meson conversion. Due to
> > the sheer size of the series you have been CCed only on the cover
> > letter.
> >
> > The series reaches the point where Makefile.target and unnest-vars
> > can be removed, and all builds become non-recursive. I have also
> > converted parts of the testsuite, notably qtest since it is needed
> > for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> > 2) moving the rest of installation to meson (for which I have patches);
> > 3) moving feature detection from configure to meson.
> >
> > Things I still haven't tested:
> > - fuzzing
> > - non-x86/Linux builds
>
> So, I was planning to give it a go on s390, but I cannot even build it
> on x86 (fails configure):
>
> Build started at 2020-08-07T08:43:43.873638
> Main binary: /usr/bin/python3
> Build Options: -Doptimization=2 -Ddebug=true -Dwerror=true -Dstrip=true
> -Db_pie=true -Db_coverage=false -Dsdl=auto -Dsdl_image=auto -Dvnc=enabled
> -Dvnc_sasl=auto -Dvnc_jpeg=auto -Dvnc_png=auto -Dprefix=/usr/local
> -Dbindir=/usr/local/bin -Ddatadir=/usr/local/share
> -Dincludedir=/usr/local/include -Dlibdir=/usr/local/lib
> -Dlibexecdir=/usr/local/libexec -Dlocalstatedir=/usr/local/var
> -Dmandir=/usr/local/share/man -Dsysconfdir=/usr/local/etc
> Python system: Linux
> The Meson build system
> Version: 0.52.0
> Source dir: /home/cohuck/git/qemu
> Build dir: /home/cohuck/git/qemu/build
> Build type: native build
>
> meson.build:438:22: ERROR: Key must be a string.
> config_target_h += {target: configure_file(output: target +
> '-config-target.h',
> ^
> (Fedora 31, version from your github branch)
>
> Is there anything special I need to install beyond meson?
>
> > - static builds
> > - Docker and VM builds
> >
> > Things I have checked:
> > - x86 builds
> > - modules
> > - "make install"
> > - internal slirp/dtc/capstone.
> >
> > It should be more or less bisectable. I have not tried building
> > _all_ steps, but I have tried both before and after each major one.
> >
> > Build system rebuild rules seem to work reliably.
> >
> > After a week or quite intense rebasing, my impression is more or less
> > the same as last December: Meson looks more daunting, but it is actually
> > much nicer to work with.
> >
> > The diffstat so far is not very favorable, but remember that:
> >
> > 1) the series leaves quite a few nearly-obsolete bits in configure,
> > Makefile and rules.mak (over 200 lines only in the makefiles).
> >
> > 2) configure test conversion will be where meson really shines. I
> > included a couple examples just to show
> >
> > meson: convert VNC and dependent libraries to meson
> > 4 files changed, 44 insertions(+), 134 deletions(-)
> >
> > meson: move SDL and SDL-image detection to meson
> > 5 files changed, 30 insertions(+), 144 deletions(-)
> >
> > meson: replace create-config with meson configure_file
> > 6 files changed, 80 insertions(+), 168 deletions(-)
> >
> > 3) the idea behind using Makefile generators is to have stable
> > code written in a high-level language instead of Makefile magic
> > that tends to grow by accretion. So even though ninjatool is
> > large at 1000 lines of Python, it can already be considered mature
> > or even "done". It had only ~15 lines changed since the last post,
> > and whenever debugging meson.build issues looking at build.ninja has
> > always (literally!) been enough.
> >
> > Available on git://github.com/bonzini/qemu branch meson-poc-next.
>
>
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 4907 bytes --]
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:01 ` 罗勇刚(Yonggang Luo)
@ 2020-08-07 8:11 ` Paolo Bonzini
2020-08-07 8:31 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 8:11 UTC (permalink / raw)
To: luoyonggang, Cornelia Huck
Cc: Peter Maydell, Daniel P. Berrangé,
Philippe Mathieu-Daudé,
qemu-level, armbru, jsnow, stefanha, Alex Bennée
On 07/08/20 10:01, 罗勇刚(Yonggang Luo) wrote:
> Could meson can generate CMake file or directly using CMake?
> cause Cmake have better IDE support.
No, Meson generates ninja files. In QEMU I am translating them to
Makefile to aid in bisectability.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 7:56 ` Markus Armbruster
@ 2020-08-07 8:22 ` Daniel P. Berrangé
2020-08-07 8:42 ` Philippe Mathieu-Daudé
` (2 more replies)
2020-08-07 8:39 ` Paolo Bonzini
1 sibling, 3 replies; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 8:22 UTC (permalink / raw)
To: Markus Armbruster
Cc: peter.maydell, jsnow, qemu-devel, alex.bennee, stefanha,
Paolo Bonzini, philmd
On Fri, Aug 07, 2020 at 09:56:42AM +0200, Markus Armbruster wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
> > This the more or less final version of the Meson conversion. Due to
> > the sheer size of the series you have been CCed only on the cover
> > letter.
>
> Perfect timing: right before I drop off for two weeks of vacation. I'm
> excused! *Maniacal laughter*
>
> > The series reaches the point where Makefile.target and unnest-vars
> > can be removed, and all builds become non-recursive. I have also
> > converted parts of the testsuite, notably qtest since it is needed
> > for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> > 2) moving the rest of installation to meson (for which I have patches);
> > 3) moving feature detection from configure to meson.
> >
> > Things I still haven't tested:
> > - fuzzing
> > - non-x86/Linux builds
> > - static builds
> > - Docker and VM builds
> >
> > Things I have checked:
> > - x86 builds
> > - modules
> > - "make install"
> > - internal slirp/dtc/capstone.
>
> Have you run it through our CI?
>
> > It should be more or less bisectable. I have not tried building
> > _all_ steps, but I have tried both before and after each major one.
> >
> > Build system rebuild rules seem to work reliably.
>
> Is it faster in common build scenarios?
>
> > After a week or quite intense rebasing, my impression is more or less
> > the same as last December: Meson looks more daunting, but it is actually
> > much nicer to work with.
>
> Not a particularly high bar to cross: our Makefiles are full of the kind
> of black magic that keeps simple things simple (which is quite an
> achievement; kudos!), and makes not-so-simple things really hard.
>
> I think it's now time to plan the end game, preferably without even more
> weeks of intense rebasing.
>
> Do we have consensus to move forward with Meson? If yes, I'd like to
> propose to aim for merging as early as practical in the 5.2 cycle.
> Rationale: rebasing build system changes on top of the Meson work is
> probably easier than rebasing the Meson work, and avoids turning Paolo
> into an overworked bottleneck.
>
> In more detail:
>
> 1. Pick a tentative deadline.
I'd suggest we need a bare minimum of half a development cycle to.
So if we want it tin 5.2, we need to make a strong push now and over
next month to review it and iron out any obvious blocking testing
problems.
> 2. Cover the testing gaps and get as much review as we can until then.
> Fix defects as we go.
In terms of testing I'd suggest the minimium bar is likely the GitLab CI
and Peter's merge scripts.
Anything beyond that is just nice to have.
> 3. If the known defects are expected to disrupt others too much, goto 1.
> Do not worry about unknown defects at this point.
>
> 4. Merge.
>
> 5. Deal with the fallout.
Yep, there's no substitute for getting it used for real by a wide
range of people, which is why we we need leave ourselves at min
1/2 a dev cycle for this.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:11 ` Paolo Bonzini
@ 2020-08-07 8:31 ` 罗勇刚(Yonggang Luo)
2020-08-07 8:40 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-08-07 8:31 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Peter Maydell, Daniel P. Berrangé,
Alex Bennée, Cornelia Huck, qemu-level, armbru, jsnow,
stefanha, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Any IDE works with meson properly? Does meson have vs code plugin?
On Fri, Aug 7, 2020 at 4:11 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/08/20 10:01, 罗勇刚(Yonggang Luo) wrote:
> > Could meson can generate CMake file or directly using CMake?
> > cause Cmake have better IDE support.
>
> No, Meson generates ninja files. In QEMU I am translating them to
> Makefile to aid in bisectability.
>
> Paolo
>
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 908 bytes --]
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 7:56 ` Markus Armbruster
2020-08-07 8:22 ` Daniel P. Berrangé
@ 2020-08-07 8:39 ` Paolo Bonzini
2020-08-07 13:55 ` Markus Armbruster
1 sibling, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 8:39 UTC (permalink / raw)
To: Markus Armbruster
Cc: peter.maydell, berrange, philmd, qemu-devel, alex.bennee,
stefanha, jsnow
On 07/08/20 09:56, Markus Armbruster wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> This the more or less final version of the Meson conversion. Due to
>> the sheer size of the series you have been CCed only on the cover
>> letter.
>
> Perfect timing: right before I drop off for two weeks of vacation. I'm
> excused! *Maniacal laughter*
>
> Have you run it through our CI?
Of course not. O:-)
> without even more weeks of intense rebasing.
FWIW there were only three hard rebases from 5.0 to 5.2:
qemu-storage-daemon (by far the hardest), linux-user's syscall_nr.h
generation, and fuzzing (easiest except it required conversion of qtest). S
I would like to merge this on August 21st. I hope to post a
"definitive" verion on August 14th, and hope to work with Peter the next
week on getting it to pass his tests. Perhaps that's optimistic though.
Depending on when it's ready, I can pick up the series that gets rid of
Texinfo, if Peter and yourself don't want to learn Meson just for that.
Anyway, I think this is the no-return point: if people say no, I'm not
going to push it any further. If people say yes, we'd better merge it
quickly and be done with it.
I do understand resistance. It's a new tool replacing a 40-year-old
standard; build systems are not fancy; and there is a substantial sunken
cost. All I can answer is that the line between sunken cost and
Stockholm syndrome is a fine one. I cannot say this stuff has been
*fun*, but at least the debugging was refreshing compared to Makefiles.
Again not a very high bar, but it's something.
>> It should be more or less bisectable. I have not tried building
>> _all_ steps, but I have tried both before and after each major one.
>>
>> Build system rebuild rules seem to work reliably.
>
> Is it faster in common build scenarios?
Some oldish numbers:
before after
----------------------------------------------------
../configure 18s 43s
../configure && make -j18 169s 172s
make -j18 (do nothing) 4s 4s
make -j4 (do nothing) 6.5s 4s
touch ../configure && make -j18 52s 62s (does nothing in make)
touch ../configure && make -j4 71s 62s (does nothing in make)
make clean 19s 2s
make -j18 clean 3.5s 2s
----------------------------------------------------
ninja -j18 (do nothing) 1s
ninja -t clean 2s
ninja -j18 96s (43s+96s=139s)
../configure becomes slower because minikconf.py moved from Make to
configure time, and because it has to generate the massive Makefile
which it didn't do before. In fact it generates the build rules twice:
Meson first generates build.ninja, and then ninjatool turns it into
Makefile.ninja.
Most of the time is recouped during Make though, and a do nothing "make"
become faster, especially at lower -j. This is expected because the
massive Makefile (while producing essentially the same rules as before)
is parsed directly by Make, without having to execute complex Make
macros. It is more visible at lower -j because parsing the
non-recursive Makefile is serial, while the current build system uses
recursive Makefiles for which the work can be parallelized.
ninja is quite a bit faster than Make. It also stores a binary
representation of build.ninja, so its do-nothing times are better. We
can think of switching to it for the main build, once all tests are
converted to Meson. Advantage: it lets us kill large swaths of
ninjatool; disadvantage: it introduces an extra dependency. Even before
that, developers will be free to alternate between make and ninja. I
haven't bothered so far, but then my machine does -j18 and not everyone
has that luxury.
tl;dr: for now, not much, but it can only improve. This is consistent
with this series reaching the "worst mergeable state". My objective was
only maintainability and not performance (without regressing on that front)
Another useful feature, that can be used more in the future, is
integration with external tools such as sparse (now) and clang's static
analyzer (later). This is because ninja (and ninjatool) are able to
produce a compile_commands.json file that summarizes how to produce the
object files for the whole build.
> Not a particularly high bar to cross: our Makefiles are full of the kind
> of black magic that keeps simple things simple (which is quite an
> achievement; kudos!), and makes not-so-simple things really hard.
Looking back at the goals:
- "it should remain trivial to do things that used to be trivial":
achieved though the syntax is more complicated.
- it should be "easy to do things that are a matter of cut-and-paste
from something that already exist": that would be for example adding a
new target, or new tools to contrib. I added AVR and RX for this rebase
and it was the least of the problems, so I'd say achieved.
- "it should be possible to modify meson.build without knowing [details
of the QEMU build system such as ninjatool]": achieved.
- it should be "possible to do everything else". Of course some parts
of meson.build (QAPI, tracetool, modules and the building the emulator
binaries) are complex. The only part that is worse than before is the
forwarding "trace.h" headers (patch 4). I have actually thought of a
way to fix that, but I am not 100% sure it works so I don't plan on
doing it before the merge.
- "drop Makefile magic in favor of build rule generators written in
high-level languages": achieved
>> 3) the idea behind using Makefile generators is to have stable
>> code written in a high-level language instead of Makefile magic
>> that tends to grow by accretion. So even though ninjatool is
>> large at 1000 lines of Python, it can already be considered mature
>> or even "done". It had only ~15 lines changed since the last post,
>> and whenever debugging meson.build issues looking at build.ninja has
>> always (literally!) been enough.
>
> The major drawback with generating code is usually having to debug the
> generated code. Your experience of not having to do that is
> encouraging.
Yes, that's my point expressed in a succinct way.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:31 ` 罗勇刚(Yonggang Luo)
@ 2020-08-07 8:40 ` Paolo Bonzini
2020-08-07 10:05 ` Alex Bennée
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 8:40 UTC (permalink / raw)
To: luoyonggang
Cc: Peter Maydell, Daniel P. Berrangé,
Alex Bennée, Cornelia Huck, qemu-level, armbru, jsnow,
stefanha, Philippe Mathieu-Daudé
On 07/08/20 10:31, 罗勇刚(Yonggang Luo) wrote:
> Any IDE works with meson properly? Does meson have vs code plugin?
I'm not sure what the plugin would do. However note that even with
Meson, QEMU would be built with "./configure && make".
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:22 ` Daniel P. Berrangé
@ 2020-08-07 8:42 ` Philippe Mathieu-Daudé
2020-08-07 9:02 ` Markus Armbruster
2020-08-07 9:20 ` Peter Maydell
2 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 8:42 UTC (permalink / raw)
To: Daniel P. Berrangé, Markus Armbruster
Cc: peter.maydell, jsnow, qemu-devel, stefanha, Paolo Bonzini, alex.bennee
On 8/7/20 10:22 AM, Daniel P. Berrangé wrote:
> On Fri, Aug 07, 2020 at 09:56:42AM +0200, Markus Armbruster wrote:
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>>
>>> This the more or less final version of the Meson conversion. Due to
>>> the sheer size of the series you have been CCed only on the cover
>>> letter.
>>
>> Perfect timing: right before I drop off for two weeks of vacation. I'm
>> excused! *Maniacal laughter*
>>
>>> The series reaches the point where Makefile.target and unnest-vars
>>> can be removed, and all builds become non-recursive. I have also
>>> converted parts of the testsuite, notably qtest since it is needed
>>> for fuzzing. What's left for _after_ the merge is: 1) unit tests;
>>> 2) moving the rest of installation to meson (for which I have patches);
>>> 3) moving feature detection from configure to meson.
>>>
>>> Things I still haven't tested:
>>> - fuzzing
>>> - non-x86/Linux builds
>>> - static builds
>>> - Docker and VM builds
>>>
>>> Things I have checked:
>>> - x86 builds
>>> - modules
>>> - "make install"
>>> - internal slirp/dtc/capstone.
>>
>> Have you run it through our CI?
>>
>>> It should be more or less bisectable. I have not tried building
>>> _all_ steps, but I have tried both before and after each major one.
>>>
>>> Build system rebuild rules seem to work reliably.
>>
>> Is it faster in common build scenarios?
>>
>>> After a week or quite intense rebasing, my impression is more or less
>>> the same as last December: Meson looks more daunting, but it is actually
>>> much nicer to work with.
>>
>> Not a particularly high bar to cross: our Makefiles are full of the kind
>> of black magic that keeps simple things simple (which is quite an
>> achievement; kudos!), and makes not-so-simple things really hard.
>>
>> I think it's now time to plan the end game, preferably without even more
>> weeks of intense rebasing.
>>
>> Do we have consensus to move forward with Meson? If yes, I'd like to
>> propose to aim for merging as early as practical in the 5.2 cycle.
>> Rationale: rebasing build system changes on top of the Meson work is
>> probably easier than rebasing the Meson work, and avoids turning Paolo
>> into an overworked bottleneck.
Any merge request not changing buildsys (configure/Makefile), adding new
(or moving) .c files shouldn't be a problem.
I have that feeling that Meson will have less bottleneck problem than
our Perl scripts =)
>>
>> In more detail:
>>
>> 1. Pick a tentative deadline.
>
> I'd suggest we need a bare minimum of half a development cycle to.
> So if we want it tin 5.2, we need to make a strong push now and over
> next month to review it and iron out any obvious blocking testing
> problems.
>
>> 2. Cover the testing gaps and get as much review as we can until then.
>> Fix defects as we go.
>
> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
> and Peter's merge scripts.
>
> Anything beyond that is just nice to have.
>
>> 3. If the known defects are expected to disrupt others too much, goto 1.
>> Do not worry about unknown defects at this point.
>>
>> 4. Merge.
>>
>> 5. Deal with the fallout.
>
> Yep, there's no substitute for getting it used for real by a wide
> range of people, which is why we we need leave ourselves at min
> 1/2 a dev cycle for this.
Just to clarify, does the "dev cycle" include the freeze window?
QEMU produces a release every 17 weeks, the dev cycle is usually 12
weeks then we have 4 (+1) weeks of stabilization for the release.
So the plan is to get this merged approximately 6 weeks after the
next release, right?
Regards,
Phil.
>
>
> Regards,
> Daniel
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (144 preceding siblings ...)
2020-08-07 7:56 ` Markus Armbruster
@ 2020-08-07 8:49 ` Peter Maydell
2020-08-07 9:02 ` Paolo Bonzini
2020-08-07 9:21 ` Daniel P. Berrangé
2020-08-07 8:51 ` Thomas Huth
2020-08-07 14:29 ` Daniel P. Berrangé
147 siblings, 2 replies; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 8:49 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Daniel P. Berrange, John Snow, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, Stefan Hajnoczi,
Alex Bennée
On Thu, 6 Aug 2020 at 20:16, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> This the more or less final version of the Meson conversion. Due to
> the sheer size of the series you have been CCed only on the cover
> letter.
Does this work with actually-released versions of Meson yet?
I am still not very enthusiastic about the prospect of having
to carry around an entire build system in a submodule. That
still seems to me to be living closer to the bleeding edge
than I would like...
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (145 preceding siblings ...)
2020-08-07 8:49 ` Peter Maydell
@ 2020-08-07 8:51 ` Thomas Huth
2020-08-07 8:59 ` Paolo Bonzini
2020-08-07 9:31 ` Paolo Bonzini
2020-08-07 14:29 ` Daniel P. Berrangé
147 siblings, 2 replies; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 8:51 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 06/08/2020 21.13, Paolo Bonzini wrote:
> This the more or less final version of the Meson conversion. Due to
> the sheer size of the series you have been CCed only on the cover
> letter.
>
> The series reaches the point where Makefile.target and unnest-vars
> can be removed, and all builds become non-recursive. I have also
> converted parts of the testsuite, notably qtest since it is needed
> for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> 2) moving the rest of installation to meson (for which I have patches);
> 3) moving feature detection from configure to meson.
>
> Things I still haven't tested:
> - fuzzing
> - non-x86/Linux builds
> - static builds
> - Docker and VM builds
>
> Things I have checked:
> - x86 builds
> - modules
> - "make install"
> - internal slirp/dtc/capstone.
>
> It should be more or less bisectable. I have not tried building
> _all_ steps, but I have tried both before and after each major one.
>
> Build system rebuild rules seem to work reliably.
>
> After a week or quite intense rebasing, my impression is more or less
> the same as last December: Meson looks more daunting, but it is actually
> much nicer to work with.
>
> The diffstat so far is not very favorable, but remember that:
>
> 1) the series leaves quite a few nearly-obsolete bits in configure,
> Makefile and rules.mak (over 200 lines only in the makefiles).
>
> 2) configure test conversion will be where meson really shines. I
> included a couple examples just to show
>
> meson: convert VNC and dependent libraries to meson
> 4 files changed, 44 insertions(+), 134 deletions(-)
>
> meson: move SDL and SDL-image detection to meson
> 5 files changed, 30 insertions(+), 144 deletions(-)
>
> meson: replace create-config with meson configure_file
> 6 files changed, 80 insertions(+), 168 deletions(-)
>
> 3) the idea behind using Makefile generators is to have stable
> code written in a high-level language instead of Makefile magic
> that tends to grow by accretion. So even though ninjatool is
> large at 1000 lines of Python, it can already be considered mature
> or even "done". It had only ~15 lines changed since the last post,
> and whenever debugging meson.build issues looking at build.ninja has
> always (literally!) been enough.
>
> Available on git://github.com/bonzini/qemu branch meson-poc-next.
I just threw your meson-poc-next branch at our CI systems. Observations:
1) If no meson is installed, configure quickly aborts with "ERROR: Meson
not found. Use --meson=/path/to/meson|git|internal":
https://gitlab.com/huth/qemu/-/jobs/675533520
Could you simply change it to default got git/internal instead (where is
the difference between git and internal?), so that we do not have to add
a --meson=xxx to all the CI jobs everywhere?
2) With --meson=git added, I also do not get much further:
"./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
not found"
https://gitlab.com/huth/qemu/-/jobs/675546229
Any idea what's going wrong here?
3) macOS build fails in a different way:
../meson.build:1:0: ERROR: Value "gnu++03" for combo option "C++
language standard to use" is not one of the choices. Possible choices
are: "none", "c++98", "c++03", "c++11", "c++14", "c++17", "c++1z",
"c++2a", "gnu++11", "gnu++14", "gnu++17", "gnu++1z", "gnu++2a".
A full log can be found at
/private/var/folders/3y/l0z1x3693dl_8n0qybp4dqwh0000gn/T/cirrus-ci-build/build/meson-logs/meson-log.txt
ERROR: meson setup failed
https://cirrus-ci.com/task/6514035426328576
Maybe we should use gnu++11 for C++ code nowadays? ... we still used
gnu++98 in the past since GCC 4.8 (from CentOS/RHEL 7) has only
"experimental" support for c++11 ... but since we're soon (in less than
a year) going to drop support for that anyway, maybe we could switch it
now already to gnu++11 ... ?
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:51 ` Thomas Huth
@ 2020-08-07 8:59 ` Paolo Bonzini
2020-08-07 9:31 ` Paolo Bonzini
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 8:59 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/20 10:51, Thomas Huth wrote:
> ../meson.build:1:0: ERROR: Value "gnu++03" for combo option "C++
> language standard to use" is not one of the choices. Possible choices
> are: "none", "c++98", "c++03", "c++11", "c++14", "c++17", "c++1z",
> "c++2a", "gnu++11", "gnu++14", "gnu++17", "gnu++1z", "gnu++2a".
> A full log can be found at
> /private/var/folders/3y/l0z1x3693dl_8n0qybp4dqwh0000gn/T/cirrus-ci-build/build/meson-logs/meson-log.txt
> ERROR: meson setup failed
>
> https://cirrus-ci.com/task/6514035426328576
>
> Maybe we should use gnu++11 for C++ code nowadays? ... we still used
> gnu++98 in the past since GCC 4.8 (from CentOS/RHEL 7) has only
> "experimental" support for c++11 ... but since we're soon (in less than
> a year) going to drop support for that anyway, maybe we could switch it
> now already to gnu++11 ... ?
Yes, I can. And I'll look at the others, thanks!!!
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-06 19:14 ` [PATCH 005/143] meson: rename .inc.c files to .inc Paolo Bonzini
@ 2020-08-07 8:59 ` Peter Maydell
2020-08-07 9:23 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 8:59 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 6 Aug 2020 at 20:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
What's the rationale for this ? ".inc.c" is the project's
standard naming convention for files which aren't headers
but which are lumps of C code #included into a top level .c
file. The .inc.c deliberately ends '.c' because that way
editors will use the right syntax highlighting for the file.
It would be much better if Meson could cope with our
standard naming convention rather than forcing us to change it.
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:22 ` Daniel P. Berrangé
2020-08-07 8:42 ` Philippe Mathieu-Daudé
@ 2020-08-07 9:02 ` Markus Armbruster
2020-08-07 9:06 ` Daniel P. Berrangé
2020-08-07 9:15 ` Philippe Mathieu-Daudé
2020-08-07 9:20 ` Peter Maydell
2 siblings, 2 replies; 250+ messages in thread
From: Markus Armbruster @ 2020-08-07 9:02 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: peter.maydell, jsnow, qemu-devel, philmd, stefanha,
Paolo Bonzini, alex.bennee
Daniel P. Berrangé <berrange@redhat.com> writes:
> On Fri, Aug 07, 2020 at 09:56:42AM +0200, Markus Armbruster wrote:
[...]
>> I think it's now time to plan the end game, preferably without even more
>> weeks of intense rebasing.
>>
>> Do we have consensus to move forward with Meson? If yes, I'd like to
>> propose to aim for merging as early as practical in the 5.2 cycle.
>> Rationale: rebasing build system changes on top of the Meson work is
>> probably easier than rebasing the Meson work, and avoids turning Paolo
>> into an overworked bottleneck.
>>
>> In more detail:
>>
>> 1. Pick a tentative deadline.
>
> I'd suggest we need a bare minimum of half a development cycle to.
> So if we want it tin 5.2, we need to make a strong push now and over
> next month to review it and iron out any obvious blocking testing
> problems.
I had less than a "now and over next month" (>7 weeks!) in mind.
The choice of deadline is really about how much of Paolo's time we are
(and he is!) willing to spend on rebasing vs. how much risk of toothing
problems in master we are willing to accept.
"First thing after 5.2 opens" would be ideal from a "avoid more
rebasing" point of view, but it may not be practical.
Once the flood gates are open, we can probably just as well wait for the
initial flood to subside.
>> 2. Cover the testing gaps and get as much review as we can until then.
>> Fix defects as we go.
>
> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
> and Peter's merge scripts.
>
> Anything beyond that is just nice to have.
Yup. If you want it not to break in master, get it tested in our gating
CI.
>> 3. If the known defects are expected to disrupt others too much, goto 1.
>> Do not worry about unknown defects at this point.
>>
>> 4. Merge.
>>
>> 5. Deal with the fallout.
>
> Yep, there's no substitute for getting it used for real by a wide
> range of people, which is why we we need leave ourselves at min
> 1/2 a dev cycle for this.
>
>
> Regards,
> Daniel
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:49 ` Peter Maydell
@ 2020-08-07 9:02 ` Paolo Bonzini
2020-08-07 9:06 ` Thomas Huth
2020-08-07 9:21 ` Daniel P. Berrangé
1 sibling, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:02 UTC (permalink / raw)
To: Peter Maydell
Cc: Daniel P. Berrange, John Snow, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, Stefan Hajnoczi,
Alex Bennée
On 07/08/20 10:49, Peter Maydell wrote:
>> This the more or less final version of the Meson conversion. Due to
>> the sheer size of the series you have been CCed only on the cover
>> letter.
>
> Does this work with actually-released versions of Meson yet?
> I am still not very enthusiastic about the prospect of having
> to carry around an entire build system in a submodule. That
> still seems to me to be living closer to the bleeding edge
> than I would like...
Yes it works with 0.55.0, with only a few warnings about possible future
incompatibility. Those will be fixed in 0.56.0, where the feature was
stabilized without introducing any incompatibility.
Carrying around Meson in a submodule was mostly done to let QEMU build
transparently on older distros. Removing it is easy (though it would
involve modifying the docker files to install the latest meson, so
whatever you throw out of the door comes back through the window).
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 124/143] meson: target
2020-08-06 19:16 ` [PATCH 124/143] meson: target Paolo Bonzini
@ 2020-08-07 9:04 ` Peter Maydell
2020-08-07 9:11 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 9:04 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, QEMU Developers
On Thu, 6 Aug 2020 at 21:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> diff --git a/scripts/decodetree.py b/scripts/decodetree.py
> index 694757b..4cd1e10 100755
> --- a/scripts/decodetree.py
> +++ b/scripts/decodetree.py
> @@ -1257,7 +1257,7 @@ def main():
> long_opts = ['decode=', 'translate=', 'output=', 'insnwidth=',
> 'static-decode=', 'varinsnwidth=']
> try:
> - (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts)
> + (opts, args) = getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opts)
> except getopt.GetoptError as err:
> error(0, err)
> for o, a in opts:
This change to the decodetree script doesn't seem like it
belongs in this patch ?
> --- /dev/null
> +++ b/target/arm/meson.build
> @@ -0,0 +1,62 @@
> +gen = [
> + decodetree.process('sve.decode', extra_args: '--decode=disas_sve'),
> + decodetree.process('neon-shared.decode', extra_args: '--static-decode=disas_neon_shared'),
> + decodetree.process('neon-dp.decode', extra_args: '--static-decode=disas_neon_dp'),
> + decodetree.process('neon-ls.decode', extra_args: '--static-decode=disas_neon_ls'),
> + decodetree.process('vfp.decode', extra_args: '--static-decode=disas_vfp'),
> + decodetree.process('vfp-uncond.decode', extra_args: '--static-decode=disas_vfp_uncond'),
> + decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'),
> + decodetree.process('a32-uncond.decode', extra_args: '--static-decode=disas_a32_uncond'),
> + decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'),
> + decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-decode=disas_t16']),
> +]
> +
> +arm_ss = ss.source_set()
> +arm_ss.add(gen)
> +arm_ss.add(files(
> + 'cpu.c',
> + 'crypto_helper.c',
> + 'debug_helper.c',
> + 'gdbstub.c',
> + 'helper.c',
> + 'iwmmxt_helper.c',
> + 'm_helper.c',
> + 'neon_helper.c',
> + 'op_helper.c',
> + 'tlb_helper.c',
> + 'translate.c',
> + 'vec_helper.c',
> + 'vfp_helper.c',
> + 'cpu_tcg.c',
> +))
> +arm_ss.add(zlib)
Just to check, does this get the underlying dependencies right?
ie translate.o depends on translate.c and also eg translate-vfp.inc.c,
which in turn depends on vfp.decode ?
It's not clear to me why all the decodetree lines ended up in a
single "gen = []" block -- they're independent of each other.
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:02 ` Markus Armbruster
@ 2020-08-07 9:06 ` Daniel P. Berrangé
2020-08-07 9:15 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 9:06 UTC (permalink / raw)
To: Markus Armbruster
Cc: peter.maydell, philmd, qemu-devel, alex.bennee, stefanha,
Paolo Bonzini, jsnow
On Fri, Aug 07, 2020 at 11:02:34AM +0200, Markus Armbruster wrote:
> Daniel P. Berrangé <berrange@redhat.com> writes:
>
> > On Fri, Aug 07, 2020 at 09:56:42AM +0200, Markus Armbruster wrote:
> [...]
> >> I think it's now time to plan the end game, preferably without even more
> >> weeks of intense rebasing.
> >>
> >> Do we have consensus to move forward with Meson? If yes, I'd like to
> >> propose to aim for merging as early as practical in the 5.2 cycle.
> >> Rationale: rebasing build system changes on top of the Meson work is
> >> probably easier than rebasing the Meson work, and avoids turning Paolo
> >> into an overworked bottleneck.
> >>
> >> In more detail:
> >>
> >> 1. Pick a tentative deadline.
> >
> > I'd suggest we need a bare minimum of half a development cycle to.
> > So if we want it tin 5.2, we need to make a strong push now and over
> > next month to review it and iron out any obvious blocking testing
> > problems.
>
> I had less than a "now and over next month" (>7 weeks!) in mind.
To be clear, I'm not recommending we wait that long - I'm just
suggesting that is an upper bound after which we'd really need
to wait for the dev cycle after.
Ideally we would make a strong push to get it merged just 2 weeks
after this release, ie by early september.
> The choice of deadline is really about how much of Paolo's time we are
> (and he is!) willing to spend on rebasing vs. how much risk of toothing
> problems in master we are willing to accept.
>
> "First thing after 5.2 opens" would be ideal from a "avoid more
> rebasing" point of view, but it may not be practical.
>
> Once the flood gates are open, we can probably just as well wait for the
> initial flood to subside.
All depends how quickly Paolo thinks it get to mergeable state....
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:02 ` Paolo Bonzini
@ 2020-08-07 9:06 ` Thomas Huth
2020-08-07 9:18 ` Daniel P. Berrangé
0 siblings, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 9:06 UTC (permalink / raw)
To: Paolo Bonzini, Peter Maydell
Cc: Daniel P. Berrange, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, Alex Bennée,
Stefan Hajnoczi, John Snow
On 07/08/2020 11.02, Paolo Bonzini wrote:
> On 07/08/20 10:49, Peter Maydell wrote:
>>> This the more or less final version of the Meson conversion. Due to
>>> the sheer size of the series you have been CCed only on the cover
>>> letter.
>>
>> Does this work with actually-released versions of Meson yet?
>> I am still not very enthusiastic about the prospect of having
>> to carry around an entire build system in a submodule. That
>> still seems to me to be living closer to the bleeding edge
>> than I would like...
>
> Yes it works with 0.55.0, with only a few warnings about possible future
> incompatibility. Those will be fixed in 0.56.0, where the feature was
> stabilized without introducing any incompatibility.
>
> Carrying around Meson in a submodule was mostly done to let QEMU build
> transparently on older distros. Removing it is easy (though it would
> involve modifying the docker files to install the latest meson, so
> whatever you throw out of the door comes back through the window).
From my point of view, we should keep the meson submodule at least 'till
spring next year - then we'll remove support for RHEL7 according to our
support policy. Hopefully the other distros will have a recent version
of Meson at that point in time.
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 124/143] meson: target
2020-08-07 9:04 ` Peter Maydell
@ 2020-08-07 9:11 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:11 UTC (permalink / raw)
To: Peter Maydell; +Cc: Marc-André Lureau, QEMU Developers
On 07/08/20 11:04, Peter Maydell wrote:
> On Thu, 6 Aug 2020 at 21:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
>
>
>> diff --git a/scripts/decodetree.py b/scripts/decodetree.py
>> index 694757b..4cd1e10 100755
>> --- a/scripts/decodetree.py
>> +++ b/scripts/decodetree.py
>> @@ -1257,7 +1257,7 @@ def main():
>> long_opts = ['decode=', 'translate=', 'output=', 'insnwidth=',
>> 'static-decode=', 'varinsnwidth=']
>> try:
>> - (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts)
>> + (opts, args) = getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opts)
>> except getopt.GetoptError as err:
>> error(0, err)
>> for o, a in opts:
>
> This change to the decodetree script doesn't seem like it
> belongs in this patch ?
Marc-André did this, I'll check how/why it ended up here and document it
in the commit message.
>
>> --- /dev/null
>> +++ b/target/arm/meson.build
>> @@ -0,0 +1,62 @@
>> +gen = [
>> + decodetree.process('sve.decode', extra_args: '--decode=disas_sve'),
>> + decodetree.process('neon-shared.decode', extra_args: '--static-decode=disas_neon_shared'),
>> + decodetree.process('neon-dp.decode', extra_args: '--static-decode=disas_neon_dp'),
>> + decodetree.process('neon-ls.decode', extra_args: '--static-decode=disas_neon_ls'),
>> + decodetree.process('vfp.decode', extra_args: '--static-decode=disas_vfp'),
>> + decodetree.process('vfp-uncond.decode', extra_args: '--static-decode=disas_vfp_uncond'),
>> + decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'),
>> + decodetree.process('a32-uncond.decode', extra_args: '--static-decode=disas_a32_uncond'),
>> + decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'),
>> + decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-decode=disas_t16']),
>> +]
>> +
>> +arm_ss = ss.source_set()
>> +arm_ss.add(gen)
>> +arm_ss.add(files(
>> + 'cpu.c',
>> + 'crypto_helper.c',
>> + 'debug_helper.c',
>> + 'gdbstub.c',
>> + 'helper.c',
>> + 'iwmmxt_helper.c',
>> + 'm_helper.c',
>> + 'neon_helper.c',
>> + 'op_helper.c',
>> + 'tlb_helper.c',
>> + 'translate.c',
>> + 'vec_helper.c',
>> + 'vfp_helper.c',
>> + 'cpu_tcg.c',
>> +))
>> +arm_ss.add(zlib)
>
> Just to check, does this get the underlying dependencies right?
> ie translate.o depends on translate.c and also eg translate-vfp.inc.c,
> which in turn depends on vfp.decode ?
Yes...
> It's not clear to me why all the decodetree lines ended up in a
> single "gen = []" block -- they're independent of each other.
... and I'll answer to this in the .inc.c patch because it's related.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:02 ` Markus Armbruster
2020-08-07 9:06 ` Daniel P. Berrangé
@ 2020-08-07 9:15 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 9:15 UTC (permalink / raw)
To: Markus Armbruster, Daniel P. Berrangé
Cc: peter.maydell, jsnow, qemu-devel, stefanha, Paolo Bonzini, alex.bennee
On 8/7/20 11:02 AM, Markus Armbruster wrote:
> Daniel P. Berrangé <berrange@redhat.com> writes:
>
>> On Fri, Aug 07, 2020 at 09:56:42AM +0200, Markus Armbruster wrote:
> [...]
>>> 2. Cover the testing gaps and get as much review as we can until then.
>>> Fix defects as we go.
>>
>> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
>> and Peter's merge scripts.
>>
>> Anything beyond that is just nice to have.
>
> Yup. If you want it not to break in master, get it tested in our gating
> CI.
Excellent to catch all the uses not covered by CI!
So if something break but CI didn't catch it, we should add a CI job
first.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:06 ` Thomas Huth
@ 2020-08-07 9:18 ` Daniel P. Berrangé
2020-08-07 9:22 ` Peter Maydell
2020-08-07 9:28 ` Paolo Bonzini
0 siblings, 2 replies; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 9:18 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, John Snow, Stefan Hajnoczi,
Paolo Bonzini, Alex Bennée
On Fri, Aug 07, 2020 at 11:06:55AM +0200, Thomas Huth wrote:
> On 07/08/2020 11.02, Paolo Bonzini wrote:
> > On 07/08/20 10:49, Peter Maydell wrote:
> >>> This the more or less final version of the Meson conversion. Due to
> >>> the sheer size of the series you have been CCed only on the cover
> >>> letter.
> >>
> >> Does this work with actually-released versions of Meson yet?
> >> I am still not very enthusiastic about the prospect of having
> >> to carry around an entire build system in a submodule. That
> >> still seems to me to be living closer to the bleeding edge
> >> than I would like...
> >
> > Yes it works with 0.55.0, with only a few warnings about possible future
> > incompatibility. Those will be fixed in 0.56.0, where the feature was
> > stabilized without introducing any incompatibility.
> >
> > Carrying around Meson in a submodule was mostly done to let QEMU build
> > transparently on older distros. Removing it is easy (though it would
> > involve modifying the docker files to install the latest meson, so
> > whatever you throw out of the door comes back through the window).
>
> From my point of view, we should keep the meson submodule at least 'till
> spring next year - then we'll remove support for RHEL7 according to our
> support policy. Hopefully the other distros will have a recent version
> of Meson at that point in time.
I very much doubt that will be the case. None of the distros rebase
meson in their stable streams. Given our targetted platforms, it is
going to be many years (3-4 years) before Meson is present in all the
platforms we target.
This is not the end of the world, as even 3-4 years is short term in
the overall lifetime of QEMU going into the future. Also not exactly
worse than bundling all the other stuff we bundle for years. If itis
a problem, then perhaps we can finally start shipping a 'qemu.tar.gz'
with no bundling at all, and a 'qemu-bundled.tar.gz' with all the
3rd party stuff added.
We can, however, expect the distros to have new enough ninja.
If we bundle Meson, there's a risk that we see a new shiny feature
in next meson, and bump our sub-module to the next release. And
again. And again. And again. If we do that we'll never get to a
place where we can rely on distro Meson. That will be bad.
So I think we need to be very mindful of this and strongly resist
the urge to further increase our min meson version in future.
FWIW, for libvirt we decided that despite lack of distro support,
there was not a compelling reason to bundle meson, because it is
really trivial for users to update. e.g. just "pip install".
pip install meson --user
meson build
ninja -C build
(possibly need to set $PATH if you don't already have $HOME/.local/bin
in your $PATH).
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:22 ` Daniel P. Berrangé
2020-08-07 8:42 ` Philippe Mathieu-Daudé
2020-08-07 9:02 ` Markus Armbruster
@ 2020-08-07 9:20 ` Peter Maydell
2020-08-07 9:25 ` Paolo Bonzini
2020-08-07 10:53 ` Alex Bennée
2 siblings, 2 replies; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 9:20 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: John Snow, Markus Armbruster, QEMU Developers, Alex Bennée,
Stefan Hajnoczi, Paolo Bonzini, Philippe Mathieu-Daudé
On Fri, 7 Aug 2020 at 09:22, Daniel P. Berrangé <berrange@redhat.com> wrote:
> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
> and Peter's merge scripts.
I tried running it through a build test. Fails to build, all hosts:
make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
config-host.mak is out-of-date, running configure
ERROR: Meson not found. Use --meson=/path/to/meson|git|internal
make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
make: *** No rule to make target 'config-host.mak', needed by
'meson-private/coredata.dat'. Stop.
Can we make this Just Work ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:49 ` Peter Maydell
2020-08-07 9:02 ` Paolo Bonzini
@ 2020-08-07 9:21 ` Daniel P. Berrangé
1 sibling, 0 replies; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 9:21 UTC (permalink / raw)
To: Peter Maydell
Cc: John Snow, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, Stefan Hajnoczi,
Paolo Bonzini, Alex Bennée
On Fri, Aug 07, 2020 at 09:49:23AM +0100, Peter Maydell wrote:
> On Thu, 6 Aug 2020 at 20:16, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > This the more or less final version of the Meson conversion. Due to
> > the sheer size of the series you have been CCed only on the cover
> > letter.
>
> Does this work with actually-released versions of Meson yet?
> I am still not very enthusiastic about the prospect of having
> to carry around an entire build system in a submodule. That
> still seems to me to be living closer to the bleeding edge
> than I would like...
Being on the edge is unavoidable if we actually want to use meson any
time soon. If we wait for it to be in even 1/2 of the distros we target,
then we will be delaying conversion by 1-2 years. I don't think that's
desirable, when updating to new enough meson is not much more than runing
"pip install meson --user"
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:18 ` Daniel P. Berrangé
@ 2020-08-07 9:22 ` Peter Maydell
2020-08-07 11:04 ` Alex Bennée
2020-08-07 9:28 ` Paolo Bonzini
1 sibling, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 9:22 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: Thomas Huth, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, John Snow, Stefan Hajnoczi,
Paolo Bonzini, Alex Bennée
On Fri, 7 Aug 2020 at 10:19, Daniel P. Berrangé <berrange@redhat.com> wrote:
> FWIW, for libvirt we decided that despite lack of distro support,
> there was not a compelling reason to bundle meson, because it is
> really trivial for users to update. e.g. just "pip install".
>
> pip install meson --user
> meson build
> ninja -C build
I really hate software build instructions that want me to
"just pip install" something. I know nothing about the
python out-of-distro packaging process and I don't want
the python thing I had to install to build software X
to be lurking around on my system forever being picked
up and used by random other stuff...
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-07 8:59 ` Peter Maydell
@ 2020-08-07 9:23 ` Paolo Bonzini
2020-08-07 9:30 ` Peter Maydell
2020-08-07 10:00 ` Alex Bennée
0 siblings, 2 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:23 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/08/20 10:59, Peter Maydell wrote:
> On Thu, 6 Aug 2020 at 20:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
> What's the rationale for this ? ".inc.c" is the project's
> standard naming convention for files which aren't headers
> but which are lumps of C code #included into a top level .c
> file. The .inc.c deliberately ends '.c' because that way
> editors will use the right syntax highlighting for the file.
Good point. It can be changed to .inc.h too, if that's preferrable for you.
> It would be much better if Meson could cope with our
> standard naming convention rather than forcing us to change it.
First of all I need to describe why this is needed; it is because of the
way Meson handles dependencies on generated headers.
With Makefiles that have automatically generated dependencies, you
typically make generated includes depend on the Makefile so that they
are built before everything else and they are available when first
building the .c files.
Meson is similar, however the way it works is that you list those
generated includes in the sources. The dependencies are still
automatically generated, but the build rules will ensure that the
includes are generated before attempting to build the toplevel C sources.
The problem is that Meson decides if something is a source vs. a
generated include by looking at the extension: '.c', '.cc', '.m', '.C'
are sources, while everything else is considered an include---including
'.inc.c'.
Going back to patch 124, I can now answer your question:
>> It's not clear to me why all the decodetree lines ended up in a
>> single "gen = []" block -- they're independent of each other.
The files are added to the source list with "arm_ss.add(gen)". All that
line does is ensuring they are built before other target-specific files
for ARM targets.
The question then is if Meson could be changed to cope with our naming
convention, and unfortunately the answer is no. The root cause is that
Makefiles list .o files (and uses implicit patterns to connect .o files
to the corresponding sources), while Meson lists .c files.
There is a silver lining, in that you do get something out of this: if
you have a typo in the name of a .c file, it is detected it at
"configure" time rather than having to wait until "make" tries to find
the source code for that ".o" file.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:20 ` Peter Maydell
@ 2020-08-07 9:25 ` Paolo Bonzini
2020-08-07 10:53 ` Alex Bennée
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:25 UTC (permalink / raw)
To: Peter Maydell, Daniel P. Berrangé
Cc: Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, John Snow, Stefan Hajnoczi,
Alex Bennée
On 07/08/20 11:20, Peter Maydell wrote:
>> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
>> and Peter's merge scripts.
> I tried running it through a build test. Fails to build, all hosts:
>
> make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
> config-host.mak is out-of-date, running configure
>
> ERROR: Meson not found. Use --meson=/path/to/meson|git|internal
>
> make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
> make: *** No rule to make target 'config-host.mak', needed by
> 'meson-private/coredata.dat'. Stop.
>
>
> Can we make this Just Work ?
Yes, looks like configure is not doing "git submodule update" the right
way. I'll debug it.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:18 ` Daniel P. Berrangé
2020-08-07 9:22 ` Peter Maydell
@ 2020-08-07 9:28 ` Paolo Bonzini
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:28 UTC (permalink / raw)
To: Daniel P. Berrangé, Thomas Huth
Cc: Peter Maydell, Philippe Mathieu-Daudé,
QEMU Developers, Markus Armbruster, John Snow, Stefan Hajnoczi,
Alex Bennée
On 07/08/20 11:18, Daniel P. Berrangé wrote:
> If we bundle Meson, there's a risk that we see a new shiny feature
> in next meson, and bump our sub-module to the next release. And
> again. And again. And again. If we do that we'll never get to a
> place where we can rely on distro Meson. That will be bad.
>
> So I think we need to be very mindful of this and strongly resist
> the urge to further increase our min meson version in future.
Agreed. Marc-André has a couple patches left, but they're just nice to
have. Another possibility could be adding first-class Sphinx support to
Meson (e.g. parsing the conf.py file to figure out the manpages directly).
Otherwise, 0.55.0 (or 0.56.0 if we want to avoid the warnings) should
have all that we need, and we're already doing some pretty complicated
things.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-07 9:23 ` Paolo Bonzini
@ 2020-08-07 9:30 ` Peter Maydell
2020-08-07 9:49 ` Paolo Bonzini
2020-08-07 10:00 ` Alex Bennée
1 sibling, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 9:30 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Fri, 7 Aug 2020 at 10:23, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 07/08/20 10:59, Peter Maydell wrote:
> > On Thu, 6 Aug 2020 at 20:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> >> ---
> > What's the rationale for this ? ".inc.c" is the project's
> > standard naming convention for files which aren't headers
> > but which are lumps of C code #included into a top level .c
> > file. The .inc.c deliberately ends '.c' because that way
> > editors will use the right syntax highlighting for the file.
>
> Good point. It can be changed to .inc.h too, if that's preferrable for you.
Not really, though I guess it's slightly better than plain .inc.
They're not header files...
> > It would be much better if Meson could cope with our
> > standard naming convention rather than forcing us to change it.
>
> First of all I need to describe why this is needed; it is because of the
> way Meson handles dependencies on generated headers.
>
> With Makefiles that have automatically generated dependencies, you
> typically make generated includes depend on the Makefile so that they
> are built before everything else and they are available when first
> building the .c files.
>
> Meson is similar, however the way it works is that you list those
> generated includes in the sources. The dependencies are still
> automatically generated, but the build rules will ensure that the
> includes are generated before attempting to build the toplevel C sources.
But we don't really want to build all these files before building
all C sources. We just want to say "this .c file depends on these
.inc.c files" and then let the build tool figure it out, surely?
> The problem is that Meson decides if something is a source vs. a
> generated include by looking at the extension: '.c', '.cc', '.m', '.C'
> are sources, while everything else is considered an include---including
> '.inc.c'.
Is this hardcoded in Meson? That seems pretty suboptimal.
> Going back to patch 124, I can now answer your question:
>
> >> It's not clear to me why all the decodetree lines ended up in a
> >> single "gen = []" block -- they're independent of each other.
>
> The files are added to the source list with "arm_ss.add(gen)". All that
> line does is ensuring they are built before other target-specific files
> for ARM targets.
Do you mean that it just adds an extra implicit ordering constraint,
such that if we need to rebuild both files not in 'gen' and files
that are in 'gen' the 'gen' ones go first, or that Meson really
builds all the 'gen' files first? What happens when you edit a
.decode file? How much stuff gets rebuilt?
> The question then is if Meson could be changed to cope with our naming
> convention, and unfortunately the answer is no. The root cause is that
> Makefiles list .o files (and uses implicit patterns to connect .o files
> to the corresponding sources), while Meson lists .c files.
Can Meson handle "this .c file needs to be built from something else?".
Presumably so, that's a common pattern for flex/yacc type tools.
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:51 ` Thomas Huth
2020-08-07 8:59 ` Paolo Bonzini
@ 2020-08-07 9:31 ` Paolo Bonzini
2020-08-07 9:45 ` Thomas Huth
1 sibling, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:31 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/20 10:51, Thomas Huth wrote:
> 2) With --meson=git added, I also do not get much further:
> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
> not found"
>
> https://gitlab.com/huth/qemu/-/jobs/675546229
>
> Any idea what's going wrong here?
This is also a submodule not being initialized,
ui/keycodemapdb/tools/keymap-gen comes from a submodule.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 7:59 ` Paolo Bonzini
@ 2020-08-07 9:35 ` Cornelia Huck
2020-08-07 12:20 ` Cornelia Huck
0 siblings, 1 reply; 250+ messages in thread
From: Cornelia Huck @ 2020-08-07 9:35 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Fri, 7 Aug 2020 09:59:57 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/08/20 08:53, Cornelia Huck wrote:
> > So, I was planning to give it a go on s390, but I cannot even build it
> > on x86 (fails configure):
> >
> > Build started at 2020-08-07T08:43:43.873638
> > Main binary: /usr/bin/python3
> > Build Options: -Doptimization=2 -Ddebug=true -Dwerror=true -Dstrip=true -Db_pie=true -Db_coverage=false -Dsdl=auto -Dsdl_image=auto -Dvnc=enabled -Dvnc_sasl=auto -Dvnc_jpeg=auto -Dvnc_png=auto -Dprefix=/usr/local -Dbindir=/usr/local/bin -Ddatadir=/usr/local/share -Dincludedir=/usr/local/include -Dlibdir=/usr/local/lib -Dlibexecdir=/usr/local/libexec -Dlocalstatedir=/usr/local/var -Dmandir=/usr/local/share/man -Dsysconfdir=/usr/local/etc
> > Python system: Linux
> > The Meson build system
> > Version: 0.52.0
> > Source dir: /home/cohuck/git/qemu
> > Build dir: /home/cohuck/git/qemu/build
> > Build type: native build
> >
> > meson.build:438:22: ERROR: Key must be a string.
> > config_target_h += {target: configure_file(output: target + '-config-target.h',
> > ^
> > (Fedora 31, version from your github branch)
> >
> > Is there anything special I need to install beyond meson?
>
> You probably need to do "git submodule init"/"git submodule update" so
> that it picks up the in-tree meson (0.55.0).
Thanks, that is getting me further. I still seem to be holding it wrong
in different places, though...
- on an x86 system, configure fails with:
../meson.build:1257:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
- on an s390x system, it mostly builds, but I end up with a bunch of
link errors for libblock.fa, where it fails to find various ZSTD_
symbols
>
> If you want to test on s390, just testing the boot ROM would be great
> (patch 3). That one does not need Meson at all; the purpose of the
> patch is just to decouple the boot ROM makefile from rules.mak, which
> allows to drop some of the contents of rules.mak.
I gave it a try; no errors, but then I realized that the image does not
seem to get rebuilt? I'll double check later.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:31 ` Paolo Bonzini
@ 2020-08-07 9:45 ` Thomas Huth
2020-08-07 9:49 ` Thomas Huth
2020-08-07 9:51 ` Paolo Bonzini
0 siblings, 2 replies; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 9:45 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/2020 11.31, Paolo Bonzini wrote:
> On 07/08/20 10:51, Thomas Huth wrote:
>> 2) With --meson=git added, I also do not get much further:
>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>> not found"
>>
>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>
>> Any idea what's going wrong here?
>
> This is also a submodule not being initialized,
> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
Ok. I've added a hack to my configure script to checkout the submodules,
but still, it does not compile yet:
../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
"libvhost_user".
https://gitlab.com/huth/qemu/-/jobs/675665455
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-07 9:30 ` Peter Maydell
@ 2020-08-07 9:49 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:49 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/08/20 11:30, Peter Maydell wrote:
> On Fri, 7 Aug 2020 at 10:23, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> On 07/08/20 10:59, Peter Maydell wrote:
>>> On Thu, 6 Aug 2020 at 20:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>>> ---
>>> What's the rationale for this ? ".inc.c" is the project's
>>> standard naming convention for files which aren't headers
>>> but which are lumps of C code #included into a top level .c
>>> file. The .inc.c deliberately ends '.c' because that way
>>> editors will use the right syntax highlighting for the file.
>>
>> Good point. It can be changed to .inc.h too, if that's preferrable for you.
>
> Not really, though I guess it's slightly better than plain .inc.
> They're not header files...
Ok for the lack of a better option I'll switch.
> But we don't really want to build all these files before building
> all C sources. We just want to say "this .c file depends on these
> .inc.c files" and then let the build tool figure it out, surely?
With Makefiles we have two options:
1) build before everything, e.g.
linux-user/x86_64/Makefile.objs
generated-files-y += linux-user/x86_64/syscall_nr.h
The way it works is that, by building the generated files first, we can
then rely on automated dependency tracking. It is most useful for files
that are included widely, such as header files.
2) fine-grained dependency, e.g.
target/arm/translate.o: target/arm/decode-neon-shared.inc.c
This needs no explanation. It is most useful for files that are
included only once or twice, such as .inc.c files.
With Meson you have only one choice and it is a third option, namely
"build at the beginning of the corresponding target"; the way you
express it is to list the includes in the sources of that target.
The rationale is the same as (1); in terms of what is rebuilt when it is
the same as (2). It may remove a bit of parallelism: if you edit
helper.c and insns.decode, however, helper.c won't be built until after
decode-insns.inc is created.
>> The problem is that Meson decides if something is a source vs. a
>> generated include by looking at the extension: '.c', '.cc', '.m', '.C'
>> are sources, while everything else is considered an include---including
>> '.inc.c'.
>
> Is this hardcoded in Meson? That seems pretty suboptimal.
Yes, it is. It is certainly a different mindset not being able to
control every aspect of the build. On the other hand surprises are rare.
>> The files are added to the source list with "arm_ss.add(gen)". [...]
>> they are built before other target-specific files for ARM targets.
>
> Do you mean that it just adds an extra implicit ordering constraint,
> such that if we need to rebuild both files not in 'gen' and files
> that are in 'gen' the 'gen' ones go first, or that Meson really
> builds all the 'gen' files first? What happens when you edit a
> .decode file? How much stuff gets rebuilt?
Only what's needed.
>> The question then is if Meson could be changed to cope with our naming
>> convention, and unfortunately the answer is no. The root cause is that
>> Makefiles list .o files (and uses implicit patterns to connect .o files
>> to the corresponding sources), while Meson lists .c files.
>
> Can Meson handle "this .c file needs to be built from something else?".
> Presumably so, that's a common pattern for flex/yacc type tools.
Yes, of course (we have cases of that, for example with QAPI sources).
Generated sources that are top-level (not includes) also don't hamper
parallelism of the build in any way.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:45 ` Thomas Huth
@ 2020-08-07 9:49 ` Thomas Huth
2020-08-07 9:52 ` Thomas Huth
2020-08-07 9:51 ` Paolo Bonzini
1 sibling, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 9:49 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/2020 11.45, Thomas Huth wrote:
> On 07/08/2020 11.31, Paolo Bonzini wrote:
>> On 07/08/20 10:51, Thomas Huth wrote:
>>> 2) With --meson=git added, I also do not get much further:
>>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>> not found"
>>>
>>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>>
>>> Any idea what's going wrong here?
>>
>> This is also a submodule not being initialized,
>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
>
> Ok. I've added a hack to my configure script to checkout the submodules,
> but still, it does not compile yet:
>
> ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
> "libvhost_user".
> https://gitlab.com/huth/qemu/-/jobs/675665455
At least the Debian container started to compile, but then fails here:
../hw/display/virtio-gpu.c:43:10: fatal error: virglrenderer.h: No such
file or directory
https://gitlab.com/huth/qemu/-/jobs/675665451
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:45 ` Thomas Huth
2020-08-07 9:49 ` Thomas Huth
@ 2020-08-07 9:51 ` Paolo Bonzini
2020-08-07 10:02 ` Thomas Huth
1 sibling, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 9:51 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/20 11:45, Thomas Huth wrote:
> On 07/08/2020 11.31, Paolo Bonzini wrote:
>> On 07/08/20 10:51, Thomas Huth wrote:
>>> 2) With --meson=git added, I also do not get much further:
>>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>> not found"
>>>
>>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>>
>>> Any idea what's going wrong here?
>>
>> This is also a submodule not being initialized,
>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
>
> Ok. I've added a hack to my configure script to checkout the submodules,
> but still, it does not compile yet:
>
> ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
> "libvhost_user".
> https://gitlab.com/huth/qemu/-/jobs/675665455
Fixed, thanks:
diff --git a/meson.build b/meson.build
index 38f1f40..cc96d07 100644
--- a/meson.build
+++ b/meson.build
@@ -1091,9 +1091,10 @@ if have_tools
subdir('contrib/ivshmem-client')
subdir('contrib/ivshmem-server')
endif
+
+ subdir('tools')
endif
-subdir('tools')
subdir('scripts')
subdir('pc-bios')
subdir('tests')
(This is an example of Meson doing a much stronger check on the validity
of the build).
Paolo
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:49 ` Thomas Huth
@ 2020-08-07 9:52 ` Thomas Huth
2020-08-07 10:00 ` Thomas Huth
2020-08-07 10:03 ` Paolo Bonzini
0 siblings, 2 replies; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 9:52 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/2020 11.49, Thomas Huth wrote:
> On 07/08/2020 11.45, Thomas Huth wrote:
>> On 07/08/2020 11.31, Paolo Bonzini wrote:
>>> On 07/08/20 10:51, Thomas Huth wrote:
>>>> 2) With --meson=git added, I also do not get much further:
>>>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>>> not found"
>>>>
>>>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>>>
>>>> Any idea what's going wrong here?
>>>
>>> This is also a submodule not being initialized,
>>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
>>
>> Ok. I've added a hack to my configure script to checkout the submodules,
>> but still, it does not compile yet:
>>
>> ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
>> "libvhost_user".
>> https://gitlab.com/huth/qemu/-/jobs/675665455
>
> At least the Debian container started to compile, but then fails here:
>
> ../hw/display/virtio-gpu.c:43:10: fatal error: virglrenderer.h: No such
> file or directory
> https://gitlab.com/huth/qemu/-/jobs/675665451
And yet another error, this time on Travis with --disable-system :
../hw/display/meson.build:42:22: ERROR: Unknown variable
"config_all_devices".
https://travis-ci.com/github/huth/qemu/jobs/369657010#L1035
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:52 ` Thomas Huth
@ 2020-08-07 10:00 ` Thomas Huth
2020-08-07 10:20 ` Paolo Bonzini
2020-08-07 10:03 ` Paolo Bonzini
1 sibling, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 10:00 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/2020 11.52, Thomas Huth wrote:
> On 07/08/2020 11.49, Thomas Huth wrote:
>> On 07/08/2020 11.45, Thomas Huth wrote:
>>> On 07/08/2020 11.31, Paolo Bonzini wrote:
>>>> On 07/08/20 10:51, Thomas Huth wrote:
>>>>> 2) With --meson=git added, I also do not get much further:
>>>>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>>>> not found"
>>>>>
>>>>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>>>>
>>>>> Any idea what's going wrong here?
>>>>
>>>> This is also a submodule not being initialized,
>>>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
>>>
>>> Ok. I've added a hack to my configure script to checkout the submodules,
>>> but still, it does not compile yet:
>>>
>>> ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
>>> "libvhost_user".
>>> https://gitlab.com/huth/qemu/-/jobs/675665455
>>
>> At least the Debian container started to compile, but then fails here:
>>
>> ../hw/display/virtio-gpu.c:43:10: fatal error: virglrenderer.h: No such
>> file or directory
>> https://gitlab.com/huth/qemu/-/jobs/675665451
>
> And yet another error, this time on Travis with --disable-system :
>
> ../hw/display/meson.build:42:22: ERROR: Unknown variable
> "config_all_devices".
> https://travis-ci.com/github/huth/qemu/jobs/369657010#L1035
FreeBSD fails since dbus-daemon is not found:
https://cirrus-ci.com/task/6446150314098688?command=main#L203
macOS now stops because the qemu_nbd variable is not set:
https://cirrus-ci.com/task/5038775430545408?command=main#L207
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-07 9:23 ` Paolo Bonzini
2020-08-07 9:30 ` Peter Maydell
@ 2020-08-07 10:00 ` Alex Bennée
2020-08-07 10:06 ` Paolo Bonzini
1 sibling, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Peter Maydell, qemu-devel
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 07/08/20 10:59, Peter Maydell wrote:
>> On Thu, 6 Aug 2020 at 20:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>> ---
>> What's the rationale for this ? ".inc.c" is the project's
>> standard naming convention for files which aren't headers
>> but which are lumps of C code #included into a top level .c
>> file. The .inc.c deliberately ends '.c' because that way
>> editors will use the right syntax highlighting for the file.
>
> Good point. It can be changed to .inc.h too, if that's preferrable
> for you.
We have two types of inc files - the inline C sections but also .inc.h
files. I'm not sure they should be lumped together. I think most of the
header based ones are essentially templates which get expanded multiple
times with #undef/#define blocks before each inclusion.
>
>> It would be much better if Meson could cope with our
>> standard naming convention rather than forcing us to change it.
>
> First of all I need to describe why this is needed; it is because of the
> way Meson handles dependencies on generated headers.
>
> With Makefiles that have automatically generated dependencies, you
> typically make generated includes depend on the Makefile so that they
> are built before everything else and they are available when first
> building the .c files.
>
> Meson is similar, however the way it works is that you list those
> generated includes in the sources. The dependencies are still
> automatically generated, but the build rules will ensure that the
> includes are generated before attempting to build the toplevel C sources.
>
> The problem is that Meson decides if something is a source vs. a
> generated include by looking at the extension: '.c', '.cc', '.m', '.C'
> are sources, while everything else is considered an include---including
> '.inc.c'.
>
> Going back to patch 124, I can now answer your question:
>
>>> It's not clear to me why all the decodetree lines ended up in a
>>> single "gen = []" block -- they're independent of each other.
>
> The files are added to the source list with "arm_ss.add(gen)". All that
> line does is ensuring they are built before other target-specific files
> for ARM targets.
>
> The question then is if Meson could be changed to cope with our naming
> convention, and unfortunately the answer is no. The root cause is that
> Makefiles list .o files (and uses implicit patterns to connect .o files
> to the corresponding sources), while Meson lists .c files.
>
> There is a silver lining, in that you do get something out of this: if
> you have a typo in the name of a .c file, it is detected it at
> "configure" time rather than having to wait until "make" tries to find
> the source code for that ".o" file.
Hmm - I guess one workaround is to tweak editorconfig so whatever we end
up renaming things still get identified as the right type of file for
syntax hi-lighting purposes.
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:51 ` Paolo Bonzini
@ 2020-08-07 10:02 ` Thomas Huth
2020-08-07 10:08 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 10:02 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/2020 11.51, Paolo Bonzini wrote:
> On 07/08/20 11:45, Thomas Huth wrote:
>> On 07/08/2020 11.31, Paolo Bonzini wrote:
>>> On 07/08/20 10:51, Thomas Huth wrote:
>>>> 2) With --meson=git added, I also do not get much further:
>>>> "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>>> not found"
>>>>
>>>> https://gitlab.com/huth/qemu/-/jobs/675546229
>>>>
>>>> Any idea what's going wrong here?
>>>
>>> This is also a submodule not being initialized,
>>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
>>
>> Ok. I've added a hack to my configure script to checkout the submodules,
>> but still, it does not compile yet:
>>
>> ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
>> "libvhost_user".
>> https://gitlab.com/huth/qemu/-/jobs/675665455
>
> Fixed, thanks:
>
> diff --git a/meson.build b/meson.build
> index 38f1f40..cc96d07 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1091,9 +1091,10 @@ if have_tools
> subdir('contrib/ivshmem-client')
> subdir('contrib/ivshmem-server')
> endif
> +
> + subdir('tools')
> endif
>
> -subdir('tools')
> subdir('scripts')
> subdir('pc-bios')
> subdir('tests')
Thanks! With the fix, it now gets a little bit further, but then stops with:
../meson.build:1258:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
https://gitlab.com/huth/qemu/-/jobs/675699330#L130
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:52 ` Thomas Huth
2020-08-07 10:00 ` Thomas Huth
@ 2020-08-07 10:03 ` Paolo Bonzini
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:03 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/20 11:52, Thomas Huth wrote:
>> At least the Debian container started to compile, but then fails here:
>>
>> ../hw/display/virtio-gpu.c:43:10: fatal error: virglrenderer.h: No such
>> file or directory
>> https://gitlab.com/huth/qemu/-/jobs/675665451
Likely just a rebase issue:
diff --git a/hw/display/meson.build b/hw/display/meson.build
index efe18f2..ffcccc0 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -81,13 +81,6 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
if_true: virtio_gpu_ss)
endif
-specific_ss.add(when: [pixman, 'CONFIG_VIRTIO_GPU'], if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), virgl])
-specific_ss.add(when: [pixman, 'CONFIG_VHOST_USER_GPU'], if_true: files('vhost-user-gpu.c'))
-specific_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-gpu-pci.c'))
-specific_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c'))
-specific_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c'))
-specific_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c'))
-
specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: files('milkymist-tmu2.c'))
specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
> And yet another error, this time on Travis with --disable-system :
>
> ../hw/display/meson.build:42:22: ERROR: Unknown variable
> "config_all_devices".
> https://travis-ci.com/github/huth/qemu/jobs/369657010#L1035
diff --git a/meson.build b/meson.build
index 5635f8e..ddd73d4 100644
--- a/meson.build
+++ b/meson.build
@@ -491,10 +491,10 @@ if have_system
command: [grepy, '@INPUT@'],
)
config_all_devices = keyval.load(config_all_devices_mak)
- config_all = config_all_devices
else
- config_all = {}
+ config_all_devices = {}
endif
+config_all = config_all_devices
config_all += config_host
config_all += config_all_disas
config_all += {
More type checking. I'll finish my current round of testing and push again.
Paolo
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:40 ` Paolo Bonzini
@ 2020-08-07 10:05 ` Alex Bennée
2020-08-07 10:15 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:05 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Peter Maydell, Daniel P. Berrangé,
jsnow, Cornelia Huck, qemu-level, armbru, luoyonggang, stefanha,
Philippe Mathieu-Daudé
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 07/08/20 10:31, 罗勇刚(Yonggang Luo) wrote:
>> Any IDE works with meson properly? Does meson have vs code plugin?
>
> I'm not sure what the plugin would do. However note that even with
> Meson, QEMU would be built with "./configure && make".
One the subject of IDE's my Emacs tooling (counsel-compile) uses a
mixture of "make -nqp" and "make help" to probe for potential make
targets. I assume these are still probable with the meson generated
files?
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 005/143] meson: rename .inc.c files to .inc
2020-08-07 10:00 ` Alex Bennée
@ 2020-08-07 10:06 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:06 UTC (permalink / raw)
To: Alex Bennée; +Cc: Peter Maydell, qemu-devel
On 07/08/20 12:00, Alex Bennée wrote:
> Hmm - I guess one workaround is to tweak editorconfig so whatever we end
> up renaming things still get identified as the right type of file for
> syntax hi-lighting purposes.
We can use .c.inc and .h.inc in that case. .c.inc would be for
singly-included inline C files, .h.inc is for multiply-included inline C
files.
FWIW I would also prefer .inc.c, but it's not my choice to make
unfortunately.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:02 ` Thomas Huth
@ 2020-08-07 10:08 ` Paolo Bonzini
2020-08-07 10:25 ` Cornelia Huck
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:08 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, alex.bennee, stefanha, jsnow
On 07/08/20 12:02, Thomas Huth wrote:
> Thanks! With the fix, it now gets a little bit further, but then stops with:
>
> ../meson.build:1258:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
> https://gitlab.com/huth/qemu/-/jobs/675699330#L130
diff --git a/meson.build b/meson.build
index d14d4bb..5bcfa09 100644
--- a/meson.build
+++ b/meson.build
@@ -944,12 +944,12 @@ summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
summary_info += {'libgcrypt': config_host.has_key('CONFIG_GCRYPT')}
if config_host.has_key('CONFIG_GCRYPT')
summary_info += {' hmac': config_host.has_key('CONFIG_GCRYPT_HMAC')}
- summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+ summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
endif
# TODO: add back version
summary_info += {'nettle': config_host.has_key('CONFIG_NETTLE')}
if config_host.has_key('CONFIG_NETTLE')
- summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+ summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
endif
summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
:)
Thanks very much. Sorry for the amount of breakage, at least it's all
been trivial to fix so far.
Paolo
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:05 ` Alex Bennée
@ 2020-08-07 10:15 ` Paolo Bonzini
2020-08-07 10:29 ` Alex Bennée
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:15 UTC (permalink / raw)
To: Alex Bennée
Cc: Peter Maydell, Daniel P. Berrangé,
jsnow, Cornelia Huck, qemu-level, armbru, luoyonggang, stefanha,
Philippe Mathieu-Daudé
On 07/08/20 12:05, Alex Bennée wrote:
>> On 07/08/20 10:31, 罗勇刚(Yonggang Luo) wrote:
>>> Any IDE works with meson properly? Does meson have vs code plugin?
>> I'm not sure what the plugin would do. However note that even with
>> Meson, QEMU would be built with "./configure && make".
> One the subject of IDE's my Emacs tooling (counsel-compile) uses a
> mixture of "make -nqp" and "make help" to probe for potential make
> targets. I assume these are still probable with the meson generated
> files?
With the generated files yes, I have no idea how counsel-compile would
deal with ninja.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:00 ` Thomas Huth
@ 2020-08-07 10:20 ` Paolo Bonzini
2020-08-07 10:52 ` Thomas Huth
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:20 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/20 12:00, Thomas Huth wrote:
> FreeBSD fails since dbus-daemon is not found:
>
> https://cirrus-ci.com/task/6446150314098688?command=main#L203
>
> macOS now stops because the qemu_nbd variable is not set:
>
> https://cirrus-ci.com/task/5038775430545408?command=main#L207
A little refactoring needed for the latter, while the former is a one-liner.
diff --git a/meson.build b/meson.build
index dbe1d08..0a24116 100644
--- a/meson.build
+++ b/meson.build
@@ -1051,12 +1051,14 @@ endif
if have_tools
qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
+ qemu_io = executable('qemu-io', files('qemu-io.c'),
+ dependencies: [block, qemuutil], install: true)
+ qemu_block_tools = [qemu_img, qemu_io]
if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or host_machine.system().endswith('bsd')
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [block, qemuutil], install: true)
+ qemu_block_tools += [qemu_nbd]
endif
- qemu_io = executable('qemu-io', files('qemu-io.c'),
- dependencies: [block, qemuutil], install: true)
subdir('storage-daemon')
subdir('contrib/rdmacm-mux')
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 60e81a2..3de09fb 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,8 +1,10 @@
-dep = [qemu_img, qemu_io, qemu_nbd, emulators]
if 'CONFIG_LINUX' in config_host
- dep += executable('socket_scm_helper', 'socket_scm_helper.c',
- build_by_default: false)
+ socket_scm_helper = executable('socket_scm_helper', 'socket_scm_helper.c',
+ build_by_default: false)
+else
+ socket_scm_helper = []
endif
-test('qemu-iotests', sh, args: [files('../check-block.sh')], depends: dep,
+test('qemu-iotests', sh, args: [files('../check-block.sh')],
+ depends: [qemu_block_tools, emulators, socket_scm_helper],
suite: 'block', timeout: 10000)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index c2601d9..507ee12 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -66,7 +66,7 @@ qtests_i386 = \
'test-x86-cpuid-compat',
'numa-test']
-dbus_daemon = find_program('dbus-daemon')
+dbus_daemon = find_program('dbus-daemon', required: false)
if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
# Temporarily disabled due to Patchew failures:
#qtests_i386 += ['dbus-vmstate-test']
I pushed again to meson-poc-next, diffstat is
configure | 2 +-
hw/display/meson.build | 7 -------
meson.build | 19 +++++++++++--------
tests/qemu-iotests/meson.build | 10 ++++++----
tests/qtest/meson.build | 2 +-
5 files changed, 19 insertions(+), 21 deletions(-)
Git submodules still not fixed
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:08 ` Paolo Bonzini
@ 2020-08-07 10:25 ` Cornelia Huck
2020-08-07 10:50 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Cornelia Huck @ 2020-08-07 10:25 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, Thomas Huth, berrange, alex.bennee, qemu-devel,
armbru, jsnow, stefanha, philmd
On Fri, 7 Aug 2020 12:08:17 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/08/20 12:02, Thomas Huth wrote:
> > Thanks! With the fix, it now gets a little bit further, but then stops with:
> >
> > ../meson.build:1258:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
> > https://gitlab.com/huth/qemu/-/jobs/675699330#L130
>
> diff --git a/meson.build b/meson.build
> index d14d4bb..5bcfa09 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -944,12 +944,12 @@ summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
> summary_info += {'libgcrypt': config_host.has_key('CONFIG_GCRYPT')}
> if config_host.has_key('CONFIG_GCRYPT')
> summary_info += {' hmac': config_host.has_key('CONFIG_GCRYPT_HMAC')}
> - summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
> + summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
> endif
> # TODO: add back version
> summary_info += {'nettle': config_host.has_key('CONFIG_NETTLE')}
> if config_host.has_key('CONFIG_NETTLE')
> - summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
> + summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
> endif
> summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
> summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
That one also seems to have fixed my x86 build woes.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:15 ` Paolo Bonzini
@ 2020-08-07 10:29 ` Alex Bennée
2020-08-07 10:53 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:29 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Peter Maydell, Daniel P. Berrangé,
jsnow, Cornelia Huck, qemu-level, armbru, luoyonggang, stefanha,
Philippe Mathieu-Daudé
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 07/08/20 12:05, Alex Bennée wrote:
>>> On 07/08/20 10:31, 罗勇刚(Yonggang Luo) wrote:
>>>> Any IDE works with meson properly? Does meson have vs code plugin?
>>> I'm not sure what the plugin would do. However note that even with
>>> Meson, QEMU would be built with "./configure && make".
>> One the subject of IDE's my Emacs tooling (counsel-compile) uses a
>> mixture of "make -nqp" and "make help" to probe for potential make
>> targets. I assume these are still probable with the meson generated
>> files?
>
> With the generated files yes, I have no idea how counsel-compile would
> deal with ninja.
It's probing for top-level targets. So if there is a way to query ninja
for that it's easy enough to write a probe to collect them. The make
-nqp stuff is a little janky but basically greps for .PHONY patterns and
assumes a .PHONY target is a top level target. The help parsing is pure
regexery:
(defvar counsel-compile-phony-pattern "^\\.PHONY:[\t ]+\\(.+\\)$"
"Regexp for extracting phony targets from Makefiles.")
(defvar counsel-compile-help-pattern
"\\(?:^\\(\\*\\)?[[:space:]]+\\([^[:space:]]+\\)[[:space:]]+-\\)"
"Regexp for extracting help targets from a make help call.")
I guess I'll have to see what:
ninja -t targets all
lists.
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 015/143] build-sys: add meson submodule
2020-08-06 19:14 ` [PATCH 015/143] build-sys: add meson submodule Paolo Bonzini
@ 2020-08-07 10:37 ` Alex Bennée
2020-08-07 10:47 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:37 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
Paolo Bonzini <pbonzini@redhat.com> writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> .gitmodules | 3 +++
> configure | 44 +++++++++++++++++++++++++++++++++++++++++---
> meson | 1 +
> scripts/archive-source.sh | 3 ++-
> 4 files changed, 47 insertions(+), 4 deletions(-)
> create mode 160000 meson
>
> diff --git a/.gitmodules b/.gitmodules
> index 9c0501a..ce97939 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -58,3 +58,6 @@
> [submodule "roms/qboot"]
> path = roms/qboot
> url = https://github.com/bonzini/qboot
> +[submodule "meson"]
> + path = meson
> + url = https://github.com/mesonbuild/meson/
> diff --git a/configure b/configure
> index 13db149..d87d544 100755
> --- a/configure
> +++ b/configure
> @@ -174,6 +174,25 @@ path_of() {
> return 1
> }
>
> +version_ge () {
> + local_ver1=`echo $1 | tr . ' '`
> + local_ver2=`echo $2 | tr . ' '`
> + while true; do
> + set x $local_ver1
> + local_first=${2-0}
> + # shift 2 does nothing if there are less than 2 arguments
> + shift; shift
> + local_ver1=$*
> + set x $local_ver2
> + # the second argument finished, the first must be greater or equal
> + test $# = 1 && return 0
> + test $local_first -lt $2 && return 1
> + test $local_first -gt $2 && return 0
> + shift; shift
> + local_ver2=$*
> + done
> +}
> +
> have_backend () {
> echo "$trace_backends" | grep "$1" >/dev/null
> }
> @@ -1965,9 +1984,28 @@ then
> error_exit "Python not found. Use --python=/path/to/python"
> fi
>
> -if ! has "$meson"
> -then
> - error_exit "Meson not found. Use --meson=/path/to/meson"
> +if test -z "$meson" ; then
> + if has meson && version_ge "$(meson --version)" 0.55.0; then
> + meson=meson
> + elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
> + meson=git
> + elif test -e "${source_path}/meson/meson.py" ; then
> + meson=internal
> + fi
> +fi
> +
> +case "$meson" in
> + git | internal)
Is "internal" meant to be synonymous with "git"? AFAICT we don't
actually do anything with --meson=internal which is why it failed later.
> + if test "$meson" = git; then
> + git_submodules="${git_submodules} meson"
> + (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update meson)
> + fi
> + meson="${source_path}/meson/meson.py"
> + ;;
> +esac
> +
> +if ! has "$meson" ; then
> + error_exit "Meson not found. Use --meson=/path/to/meson|git|internal"
> fi
<snip>
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 015/143] build-sys: add meson submodule
2020-08-07 10:37 ` Alex Bennée
@ 2020-08-07 10:47 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:47 UTC (permalink / raw)
To: Alex Bennée; +Cc: Marc-André Lureau, qemu-devel
On 07/08/20 12:37, Alex Bennée wrote:
>
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> .gitmodules | 3 +++
>> configure | 44 +++++++++++++++++++++++++++++++++++++++++---
>> meson | 1 +
>> scripts/archive-source.sh | 3 ++-
>> 4 files changed, 47 insertions(+), 4 deletions(-)
>> create mode 160000 meson
>>
>> diff --git a/.gitmodules b/.gitmodules
>> index 9c0501a..ce97939 100644
>> --- a/.gitmodules
>> +++ b/.gitmodules
>> @@ -58,3 +58,6 @@
>> [submodule "roms/qboot"]
>> path = roms/qboot
>> url = https://github.com/bonzini/qboot
>> +[submodule "meson"]
>> + path = meson
>> + url = https://github.com/mesonbuild/meson/
>> diff --git a/configure b/configure
>> index 13db149..d87d544 100755
>> --- a/configure
>> +++ b/configure
>> @@ -174,6 +174,25 @@ path_of() {
>> return 1
>> }
>>
>> +version_ge () {
>> + local_ver1=`echo $1 | tr . ' '`
>> + local_ver2=`echo $2 | tr . ' '`
>> + while true; do
>> + set x $local_ver1
>> + local_first=${2-0}
>> + # shift 2 does nothing if there are less than 2 arguments
>> + shift; shift
>> + local_ver1=$*
>> + set x $local_ver2
>> + # the second argument finished, the first must be greater or equal
>> + test $# = 1 && return 0
>> + test $local_first -lt $2 && return 1
>> + test $local_first -gt $2 && return 0
>> + shift; shift
>> + local_ver2=$*
>> + done
>> +}
>> +
>> have_backend () {
>> echo "$trace_backends" | grep "$1" >/dev/null
>> }
>> @@ -1965,9 +1984,28 @@ then
>> error_exit "Python not found. Use --python=/path/to/python"
>> fi
>>
>> -if ! has "$meson"
>> -then
>> - error_exit "Meson not found. Use --meson=/path/to/meson"
>> +if test -z "$meson" ; then
>> + if has meson && version_ge "$(meson --version)" 0.55.0; then
>> + meson=meson
>> + elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
>> + meson=git
>> + elif test -e "${source_path}/meson/meson.py" ; then
>> + meson=internal
>> + fi
>> +fi
>> +
>> +case "$meson" in
>> + git | internal)
>
> Is "internal" meant to be synonymous with "git"? AFAICT we don't
> actually do anything with --meson=internal which is why it failed later.
"git" only works on checkouts, "internal" works on release builds as
well. So the problem is that git_update is not set to "yes" for
whatever reason.
Paolo
>
>> + if test "$meson" = git; then
>> + git_submodules="${git_submodules} meson"
>> + (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update meson)
>> + fi
>> + meson="${source_path}/meson/meson.py"
>> + ;;
>> +esac
>> +
>> +if ! has "$meson" ; then
>> + error_exit "Meson not found. Use --meson=/path/to/meson|git|internal"
>> fi
> <snip>
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 020/143] meson: add testsuite Makefile generator
2020-08-06 19:14 ` [PATCH 020/143] meson: add testsuite Makefile generator Paolo Bonzini
@ 2020-08-07 10:48 ` Alex Bennée
2020-08-07 10:49 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:48 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
Paolo Bonzini <pbonzini@redhat.com> writes:
> Rules to execute tests are generated by a simple Python program
> that integrates into the existing "make check" mechanism. This
> provides familiarity for developers, and also allows piecewise
> conversion of the testsuite Makefiles to meson.
Hmm not sure why check-tcg has broken then:
11:44:37 [alex.bennee@hackbox2:~/l/q/b/all] review/meson-for-5.2|✔ + make check-tcg
make[1]: Entering directory '/home/alex.bennee/lsrc/qemu.git/slirp'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/home/alex.bennee/lsrc/qemu.git/slirp'
make: *** No rule to make target 'run-tcg-tests-aarch64-softmmu', needed by 'check-tcg'. Stop.
>
> The generated rules are based on QEMU's existing test harness
> Makefile and TAP parser.
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile | 4 ++
> scripts/mtest2make.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
> tests/Makefile.include | 1 -
> 3 files changed, 106 insertions(+), 1 deletion(-)
> create mode 100644 scripts/mtest2make.py
>
> diff --git a/Makefile b/Makefile
> index 9a75047..6248fd0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -58,6 +58,10 @@ ninjatool: ninjatool.stamp
> ninjatool.stamp: $(SRC_PATH)/scripts/ninjatool.py config-host.mak
> $(MESON) setup --reconfigure . $(SRC_PATH) && touch $@
>
> +Makefile.mtest: build.ninja scripts/mtest2make.py
> + $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@
> +-include Makefile.mtest
> +
> .git-submodule-status: git-submodule-update config-host.mak
>
> # Check that we're not trying to do an out-of-tree build from
> diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
> new file mode 100644
> index 0000000..e978303
> --- /dev/null
> +++ b/scripts/mtest2make.py
> @@ -0,0 +1,102 @@
> +#! /usr/bin/env python3
> +
> +# Create Makefile targets to run tests, from Meson's test introspection data.
> +#
> +# Author: Paolo Bonzini <pbonzini@redhat.com>
> +
> +from collections import defaultdict
> +import json
> +import os
> +import shlex
> +import sys
> +
> +class Suite(object):
> + def __init__(self):
> + self.tests = list()
> + self.slow_tests = list()
> + self.executables = set()
> +
> +print('''
> +SPEED = quick
> +
> +# $1 = test command, $2 = test name
> +.test-human-tap = $1 < /dev/null | ./scripts/tap-driver.pl --test-name="$2" $(if $(V),, --show-failures-only)
> +.test-human-exitcode = $1 < /dev/null
> +.test-tap-tap = $1 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $2/" || true
> +.test-tap-exitcode = printf "%s\\n" 1..1 "`$1 < /dev/null > /dev/null || echo "not "`ok 1 $2"
> +.test.print = echo $(if $(V),'$1','Running test $2') >&3
> +.test.env = MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))}
> +
> +# $1 = test name, $2 = test target (human or tap)
> +.test.run = $(call .test.print,$(.test.cmd.$1),$(.test.name.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.cmd.$1),$(.test.name.$1))
> +
> +define .test.human_k
> + @exec 3>&1; rc=0; $(foreach TEST, $1, $(call .test.run,$(TEST),human) || rc=$$?;) \\
> + exit $$rc
> +endef
> +define .test.human_no_k
> + $(foreach TEST, $1, @exec 3>&1; $(call .test.run,$(TEST),human)
> +)
> +endef
> +.test.human = \\
> + $(if $(findstring k, $(MAKEFLAGS)), $(.test.human_k), $(.test.human_no_k))
> +
> +define .test.tap
> + @exec 3>&1; { $(foreach TEST, $1, $(call .test.run,$(TEST),tap); ) } \\
> + | ./scripts/tap-merge.pl | tee "$@" \\
> + | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only)
> +endef
> +''')
> +
> +suites = defaultdict(Suite)
> +i = 0
> +for test in json.load(sys.stdin):
> + env = ' '.join(('%s=%s' % (shlex.quote(k), shlex.quote(v))
> + for k, v in test['env'].items()))
> + executable = os.path.relpath(test['cmd'][0])
> + if test['workdir'] is not None:
> + test['cmd'][0] = os.path.relpath(test['cmd'][0], test['workdir'])
> + else:
> + test['cmd'][0] = executable
> + cmd = '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in test['cmd'])))
> + if test['workdir'] is not None:
> + cmd = '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd)
> + driver = test['protocol'] if 'protocol' in test else 'exitcode'
> +
> + i += 1
> + print('.test.name.%d := %s' % (i, test['name']))
> + print('.test.driver.%d := %s' % (i, driver))
> + print('.test.cmd.%d := %s' % (i, cmd))
> +
> + test_suites = test['suite'] or ['default']
> + is_slow = any(s.endswith('-slow') for s in test_suites)
> + for s in test_suites:
> + # The suite name in the introspection info is "PROJECT:SUITE"
> + s = s.split(':')[1]
> + if s.endswith('-slow'):
> + s = s[:-5]
> + if is_slow:
> + suites[s].slow_tests.append(i)
> + else:
> + suites[s].tests.append(i)
> + suites[s].executables.add(executable)
> +
> +print('.PHONY: check check-report.tap')
> +print('check:')
> +print('check-report.tap:')
> +print('\t@cat $^ | scripts/tap-merge.pl >$@')
> +for name, suite in suites.items():
> + executables = ' '.join(suite.executables)
> + slow_test_numbers = ' '.join((str(x) for x in suite.slow_tests))
> + test_numbers = ' '.join((str(x) for x in suite.tests))
> + print('.test.suite-quick.%s := %s' % (name, test_numbers))
> + print('.test.suite-slow.%s := $(.test.suite-quick.%s) %s' % (name, name, slow_test_numbers))
> + print('check-build: %s' % executables)
> + print('.PHONY: check-%s' % name)
> + print('.PHONY: check-report-%s.tap' % name)
> + print('check: check-%s' % name)
> + print('check-%s: %s' % (name, executables))
> + print('\t$(call .test.human, $(.test.suite-$(SPEED).%s))' % (name, ))
> + print('check-report.tap: check-report-%s.tap' % name)
> + print('check-report-%s.tap: %s' % (name, executables))
> + print('\t$(call .test.tap, $(.test.suite-$(SPEED).%s))' % (name, ))
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 985cd14..5e9dff9 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -674,7 +674,6 @@ check-report-unit.tap: $(check-unit-y)
> # Reports and overall runs
>
> check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
> - $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
>
> # FPU Emulation tests (aka softfloat)
> #
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 020/143] meson: add testsuite Makefile generator
2020-08-07 10:48 ` Alex Bennée
@ 2020-08-07 10:49 ` Paolo Bonzini
2020-08-07 11:18 ` Alex Bennée
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:49 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel
On 07/08/20 12:48, Alex Bennée wrote:
>> Rules to execute tests are generated by a simple Python program
>> that integrates into the existing "make check" mechanism. This
>> provides familiarity for developers, and also allows piecewise
>> conversion of the testsuite Makefiles to meson.
> Hmm not sure why check-tcg has broken then:
>
> 11:44:37 [alex.bennee@hackbox2:~/l/q/b/all] review/meson-for-5.2|✔ + make check-tcg
> make[1]: Entering directory '/home/alex.bennee/lsrc/qemu.git/slirp'
> make[1]: Nothing to be done for 'all'.
> make[1]: Leaving directory '/home/alex.bennee/lsrc/qemu.git/slirp'
> make: *** No rule to make target 'run-tcg-tests-aarch64-softmmu', needed by 'check-tcg'. Stop.
>
>
Probably unrelated unless you bisected it to this patch. I'll check.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:25 ` Cornelia Huck
@ 2020-08-07 10:50 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:50 UTC (permalink / raw)
To: Cornelia Huck
Cc: peter.maydell, Thomas Huth, berrange, alex.bennee, qemu-devel,
armbru, jsnow, stefanha, philmd
On 07/08/20 12:25, Cornelia Huck wrote:
> On Fri, 7 Aug 2020 12:08:17 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> On 07/08/20 12:02, Thomas Huth wrote:
>>> Thanks! With the fix, it now gets a little bit further, but then stops with:
>>>
>>> ../meson.build:1258:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
>>> https://gitlab.com/huth/qemu/-/jobs/675699330#L130
>>
>> diff --git a/meson.build b/meson.build
>> index d14d4bb..5bcfa09 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -944,12 +944,12 @@ summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
>> summary_info += {'libgcrypt': config_host.has_key('CONFIG_GCRYPT')}
>> if config_host.has_key('CONFIG_GCRYPT')
>> summary_info += {' hmac': config_host.has_key('CONFIG_GCRYPT_HMAC')}
>> - summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
>> + summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
>> endif
>> # TODO: add back version
>> summary_info += {'nettle': config_host.has_key('CONFIG_NETTLE')}
>> if config_host.has_key('CONFIG_NETTLE')
>> - summary_info += {' XTS': config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
>> + summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
>> endif
>> summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
>> summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
>
> That one also seems to have fixed my x86 build woes.
Great. That was an unusual case of things breaking with *newer* distros
(that do have XTS in the system library). Please just pull again as
that has many fixes for other things that Thomas reported.
FWIW, impressions on reviewing these mini patches are very welcome.
After all reviewing small patches is more common than reviewing the
whole 140 patch thing, so it's important that people can quickly get an
idea of what's going on in a small patch.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:20 ` Paolo Bonzini
@ 2020-08-07 10:52 ` Thomas Huth
2020-08-07 11:04 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 10:52 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/2020 12.20, Paolo Bonzini wrote:
> On 07/08/20 12:00, Thomas Huth wrote:
>> FreeBSD fails since dbus-daemon is not found:
>>
>> https://cirrus-ci.com/task/6446150314098688?command=main#L203
>>
>> macOS now stops because the qemu_nbd variable is not set:
>>
>> https://cirrus-ci.com/task/5038775430545408?command=main#L207
>
> A little refactoring needed for the latter, while the former is a one-liner.
Thanks! Now, both, macOS and FreeBSD builds stop with:
../tests/qtest/meson.build:204:0: ERROR: Unknown variable "dbus_vmstate1".
https://cirrus-ci.com/task/6220295902068736?command=main#L210
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:20 ` Peter Maydell
2020-08-07 9:25 ` Paolo Bonzini
@ 2020-08-07 10:53 ` Alex Bennée
2020-08-07 10:56 ` Peter Maydell
1 sibling, 1 reply; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 10:53 UTC (permalink / raw)
To: Peter Maydell
Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, Stefan Hajnoczi,
Paolo Bonzini, John Snow
Peter Maydell <peter.maydell@linaro.org> writes:
> On Fri, 7 Aug 2020 at 09:22, Daniel P. Berrangé <berrange@redhat.com> wrote:
>> In terms of testing I'd suggest the minimium bar is likely the GitLab CI
>> and Peter's merge scripts.
>
> I tried running it through a build test. Fails to build, all hosts:
>
> make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
> config-host.mak is out-of-date, running configure
>
> ERROR: Meson not found. Use --meson=/path/to/meson|git|internal
>
> make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
> make: *** No rule to make target 'config-host.mak', needed by
> 'meson-private/coredata.dat'. Stop.
I note all the CI jobs have failed on building as well. I think maybe we
should auto-default to --meson=git unless the user makes an explicit
choice.
>
>
> Can we make this Just Work ?
>
> thanks
> -- PMM
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:29 ` Alex Bennée
@ 2020-08-07 10:53 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 10:53 UTC (permalink / raw)
To: Alex Bennée
Cc: Peter Maydell, Daniel P. Berrangé,
jsnow, Cornelia Huck, qemu-level, armbru, luoyonggang, stefanha,
Philippe Mathieu-Daudé
On 07/08/20 12:29, Alex Bennée wrote:
> It's probing for top-level targets. So if there is a way to query ninja
> for that it's easy enough to write a probe to collect them. The make
> -nqp stuff is a little janky but basically greps for .PHONY patterns and
> assumes a .PHONY target is a top level target. The help parsing is pure
> regexery:
>
> (defvar counsel-compile-phony-pattern "^\\.PHONY:[\t ]+\\(.+\\)$"
> "Regexp for extracting phony targets from Makefiles.")
>
> (defvar counsel-compile-help-pattern
> "\\(?:^\\(\\*\\)?[[:space:]]+\\([^[:space:]]+\\)[[:space:]]+-\\)"
> "Regexp for extracting help targets from a make help call.")
>
> I guess I'll have to see what:
>
> ninja -t targets all
It would have to grep for "^(.+): phony$".
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:53 ` Alex Bennée
@ 2020-08-07 10:56 ` Peter Maydell
0 siblings, 0 replies; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 10:56 UTC (permalink / raw)
To: Alex Bennée
Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, Stefan Hajnoczi,
Paolo Bonzini, John Snow
On Fri, 7 Aug 2020 at 11:53, Alex Bennée <alex.bennee@linaro.org> wrote:
> I note all the CI jobs have failed on building as well. I think maybe we
> should auto-default to --meson=git unless the user makes an explicit
> choice.
Our usual approach with other submodules is "system version if
it's good enough, otherwise use the submodule copy".
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 10:52 ` Thomas Huth
@ 2020-08-07 11:04 ` Paolo Bonzini
2020-08-07 12:20 ` Thomas Huth
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 11:04 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/20 12:52, Thomas Huth wrote:
> Thanks! Now, both, macOS and FreeBSD builds stop with:
>
> ../tests/qtest/meson.build:204:0: ERROR: Unknown variable "dbus_vmstate1".
> https://cirrus-ci.com/task/6220295902068736?command=main#L210
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 507ee126e7..9a7daad59d 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -76,7 +76,9 @@ if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
command: [config_host['GDBUS_CODEGEN'],
'@INPUT@',
'--interface-prefix', 'org.qemu',
- '--generate-c-code', '@BASENAME@'])
+ '--generate-c-code', '@BASENAME@']).to_list()
+else
+ dbus_vmstate1 = []
endif
qtests_x86_64 = qtests_i386
@@ -207,7 +209,7 @@ extra_qtest_srcs = {
'cdrom-test': files('boot-sector.c'),
'migration-test': files('migration-helpers.c'),
'ivshmem-test': files('../../contrib/ivshmem-server/ivshmem-server.c'),
- 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1.to_list(),
+ 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
'tpm-crb-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
'tpm-crb-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
Easy peasy lemon squeezy! :)
Paolo
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:22 ` Peter Maydell
@ 2020-08-07 11:04 ` Alex Bennée
0 siblings, 0 replies; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 11:04 UTC (permalink / raw)
To: Peter Maydell
Cc: Thomas Huth, Daniel P. Berrangé,
John Snow, QEMU Developers, Markus Armbruster, Stefan Hajnoczi,
Paolo Bonzini, Philippe Mathieu-Daudé
Peter Maydell <peter.maydell@linaro.org> writes:
> On Fri, 7 Aug 2020 at 10:19, Daniel P. Berrangé <berrange@redhat.com> wrote:
>> FWIW, for libvirt we decided that despite lack of distro support,
>> there was not a compelling reason to bundle meson, because it is
>> really trivial for users to update. e.g. just "pip install".
>>
>> pip install meson --user
>> meson build
>> ninja -C build
>
> I really hate software build instructions that want me to
> "just pip install" something. I know nothing about the
> python out-of-distro packaging process and I don't want
> the python thing I had to install to build software X
> to be lurking around on my system forever being picked
> up and used by random other stuff...
I have the same feeling (although I'm a bit of hypocrite given the 7
binaries in .local/bin I have). This was the reason we pushed to have
avocado build itself in a venv as part of the build system. I don't see
meson can't do something similar if it has to (although the git
submodule probably works just as well).
>
> thanks
> -- PMM
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 020/143] meson: add testsuite Makefile generator
2020-08-07 10:49 ` Paolo Bonzini
@ 2020-08-07 11:18 ` Alex Bennée
0 siblings, 0 replies; 250+ messages in thread
From: Alex Bennée @ 2020-08-07 11:18 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 07/08/20 12:48, Alex Bennée wrote:
>>> Rules to execute tests are generated by a simple Python program
>>> that integrates into the existing "make check" mechanism. This
>>> provides familiarity for developers, and also allows piecewise
>>> conversion of the testsuite Makefiles to meson.
>> Hmm not sure why check-tcg has broken then:
>>
>> 11:44:37 [alex.bennee@hackbox2:~/l/q/b/all] review/meson-for-5.2|✔ + make check-tcg
>> make[1]: Entering directory '/home/alex.bennee/lsrc/qemu.git/slirp'
>> make[1]: Nothing to be done for 'all'.
>> make[1]: Leaving directory '/home/alex.bennee/lsrc/qemu.git/slirp'
>> make: *** No rule to make target 'run-tcg-tests-aarch64-softmmu', needed by 'check-tcg'. Stop.
>>
>>
>
> Probably unrelated unless you bisected it to this patch. I'll check.
I tried bisecting but there was too much breakage at the other commits.
>
> Paolo
--
Alex Bennée
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 9:35 ` Cornelia Huck
@ 2020-08-07 12:20 ` Cornelia Huck
2020-08-07 15:18 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Cornelia Huck @ 2020-08-07 12:20 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Fri, 7 Aug 2020 11:35:57 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> On Fri, 7 Aug 2020 09:59:57 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
> - on an s390x system, it mostly builds, but I end up with a bunch of
> link errors for libblock.fa, where it fails to find various ZSTD_
> symbols
Still happening after switching to the latest version of your branch.
>
> >
> > If you want to test on s390, just testing the boot ROM would be great
> > (patch 3). That one does not need Meson at all; the purpose of the
> > patch is just to decouple the boot ROM makefile from rules.mak, which
> > allows to drop some of the contents of rules.mak.
>
> I gave it a try; no errors, but then I realized that the image does not
> seem to get rebuilt? I'll double check later.
I re-tried with a pristine build directory (on a different system), and
it does not look good:
BUILD pc-bios/s390-ccw/s390-ccw.elf
cc: error: start.o: No such file or directory
cc: error: main.o: No such file or directory
cc: error: bootmap.o: No such file or directory
cc: error: jump2ipl.o: No such file or directory
cc: error: sclp.o: No such file or directory
cc: error: menu.o: No such file or directory
cc: error: virtio.o: No such file or directory
cc: error: virtio-scsi.o: No such file or directory
cc: error: virtio-blkdev.o: No such file or directory
cc: error: libc.o: No such file or directory
cc: error: cio.o: No such file or directory
cc: error: dasd-ipl.o: No such file or directory
make[1]: *** [Makefile:85: s390-ccw.elf] Error 1
make: *** [Makefile:576: pc-bios/s390-ccw/all] Error 2
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 11:04 ` Paolo Bonzini
@ 2020-08-07 12:20 ` Thomas Huth
2020-08-07 12:40 ` Paolo Bonzini
2020-08-07 12:52 ` Paolo Bonzini
0 siblings, 2 replies; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 12:20 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/2020 13.04, Paolo Bonzini wrote:
> On 07/08/20 12:52, Thomas Huth wrote:
>> Thanks! Now, both, macOS and FreeBSD builds stop with:
>>
>> ../tests/qtest/meson.build:204:0: ERROR: Unknown variable "dbus_vmstate1".
>> https://cirrus-ci.com/task/6220295902068736?command=main#L210
>
> Easy peasy lemon squeezy! :)
Nice, we're getting there, now macOS starts compiling, but then fails here:
../contrib/libvhost-user/libvhost-user.c:27:10: fatal error:
'sys/eventfd.h' file not found
../contrib/libvhost-user/libvhost-user.h:21:10: fatal error:
'linux/vhost.h' file not found
https://cirrus-ci.com/task/5170197348745216?command=main#L810
(and FWIW, there are some weird "file: ... has no symbols" earlier in
the log when running AR on the capstone files)
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 12:20 ` Thomas Huth
@ 2020-08-07 12:40 ` Paolo Bonzini
2020-08-07 12:52 ` Paolo Bonzini
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 12:40 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/20 14:20, Thomas Huth wrote:
> Nice, we're getting there, now macOS starts compiling, but then fails here:
>
> ../contrib/libvhost-user/libvhost-user.c:27:10: fatal error:
> 'sys/eventfd.h' file not found
> ../contrib/libvhost-user/libvhost-user.h:21:10: fatal error:
> 'linux/vhost.h' file not found
> https://cirrus-ci.com/task/5170197348745216?command=main#L810
>
> (and FWIW, there are some weird "file: ... has no symbols" earlier in
> the log when running AR on the capstone files)
It's not supposed to build at all. I'll check the "AR" errors and
Conny's reported zstd failure.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 12:20 ` Thomas Huth
2020-08-07 12:40 ` Paolo Bonzini
@ 2020-08-07 12:52 ` Paolo Bonzini
1 sibling, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 12:52 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: peter.maydell, berrange, philmd, armbru, jsnow, stefanha, alex.bennee
On 07/08/20 14:20, Thomas Huth wrote:
> On 07/08/2020 13.04, Paolo Bonzini wrote:
>> On 07/08/20 12:52, Thomas Huth wrote:
>>> Thanks! Now, both, macOS and FreeBSD builds stop with:
>>>
>>> ../tests/qtest/meson.build:204:0: ERROR: Unknown variable "dbus_vmstate1".
>>> https://cirrus-ci.com/task/6220295902068736?command=main#L210
>> Easy peasy lemon squeezy! :)
> Nice, we're getting there, now macOS starts compiling, but then fails here:
>
> ../contrib/libvhost-user/libvhost-user.c:27:10: fatal error:
> 'sys/eventfd.h' file not found
> ../contrib/libvhost-user/libvhost-user.h:21:10: fatal error:
> 'linux/vhost.h' file not found
> https://cirrus-ci.com/task/5170197348745216?command=main#L810
>
> (and FWIW, there are some weird "file: ... has no symbols" earlier in
> the log when running AR on the capstone files)
This one is interesting, the vhost-user samples have never been built by
default so they have always been broken on macOS. So that will be a bugfix.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 003/143] pc-bios/s390-ccw: simplify Makefile
2020-08-06 19:13 ` [PATCH 003/143] pc-bios/s390-ccw: " Paolo Bonzini
@ 2020-08-07 12:58 ` Thomas Huth
2020-08-07 13:55 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Thomas Huth @ 2020-08-07 12:58 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Cornelia Huck
On 06/08/2020 21.13, Paolo Bonzini wrote:
> Make it independent from the rules.mak, and clean up to use pattern rules.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> pc-bios/s390-ccw/Makefile | 105 ++++++++++++++++++++++++++++++++++---------
> pc-bios/s390-ccw/netboot.mak | 62 -------------------------
> 2 files changed, 84 insertions(+), 83 deletions(-)
> delete mode 100644 pc-bios/s390-ccw/netboot.mak
As Cornelia already mentioned in another mail, this does not work yet.
I'd also prefer if we could keep the netbook.mak stuff in that separate
file.
Maybe you could go with this minimal patch first - this seems to work
for me:
commit 7f265ef8253613d882bdeb8a89502d55923c0077
Author: Thomas Huth <thuth@redhat.com>
Date: Fri Aug 7 14:51:52 2020 +0200
minimam pc-bios/s390-ccw/Makefile patch
diff a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -3,10 +3,26 @@ all: build-all
@true
include ../../config-host.mak
-include $(SRC_PATH)/rules.mak
+quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 &&
$1, @$1))
+cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null
>/dev/null \
+ 2>&1 && echo OK), $1, $2)
+
+VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in
+set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath
$(PATTERN) $1)))
$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
+# Flags for dependency generation
+QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d
+
+%.o: %.c
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \
+ -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+%.o: %.S
+ $(call quiet-command,$(CCAS) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \
+ -c -o $@ $<,"CCAS","$(TARGET_DIR)$@")
+
.PHONY : all clean build-all
OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
Thomas
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64
2020-08-06 19:14 ` [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64 Paolo Bonzini
@ 2020-08-07 13:06 ` Philippe Mathieu-Daudé
2020-08-07 13:21 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:06 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> Just make EFI_AARCH64 a variable in the makefile that defaults to the efi
> firmware included with QEMU. It can be redefined on the "make" command
> line.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 19 -------------------
> tests/vm/Makefile.include | 2 ++
> 2 files changed, 2 insertions(+), 19 deletions(-)
>
> diff --git a/configure b/configure
> index 2acc4d1..1c17a0f 100755
> --- a/configure
> +++ b/configure
> @@ -418,7 +418,6 @@ prefix="/usr/local"
> mandir="\${prefix}/share/man"
> datadir="\${prefix}/share"
> firmwarepath="\${prefix}/share/qemu-firmware"
> -efi_aarch64=""
> qemu_docdir="\${prefix}/share/doc/qemu"
> bindir="\${prefix}/bin"
> libdir="\${prefix}/lib"
> @@ -1109,8 +1108,6 @@ for opt do
> ;;
> --firmwarepath=*) firmwarepath="$optarg"
> ;;
> - --efi-aarch64=*) efi_aarch64="$optarg"
> - ;;
> --host=*|--build=*|\
> --disable-dependency-tracking|\
> --sbindir=*|--sharedstatedir=*|\
> @@ -3650,20 +3647,6 @@ EOF
> fi
> fi
>
> -############################################
> -# efi-aarch64 probe
> -# Check for efi files needed by aarch64 VMs.
> -# By default we will use the efi included with QEMU.
> -# Allow user to override the path for efi also.
> -if ! test -f "$efi_aarch64"; then
> - if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then
> - # valid after build
> - efi_aarch64=$PWD/pc-bios/edk2-aarch64-code.fd
> - else
> - efi_aarch64=""
> - fi
> -fi
> -
> ##########################################
> # libcap-ng library probe
> if test "$cap_ng" != "no" ; then
> @@ -6861,7 +6844,6 @@ if test "$docs" != "no"; then
> echo "sphinx-build $sphinx_build"
> fi
> echo "genisoimage $genisoimage"
> -echo "efi_aarch64 $efi_aarch64"
> echo "python_yaml $python_yaml"
> echo "slirp support $slirp $(echo_version $slirp $slirp_version)"
> if test "$slirp" != "no" ; then
> @@ -7963,7 +7945,6 @@ echo "PYTHON=$python" >> $config_host_mak
> echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
> echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
> echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
> -echo "EFI_AARCH64=$efi_aarch64" >> $config_host_mak
> echo "PYTHON_YAML=$python_yaml" >> $config_host_mak
> echo "CC=$cc" >> $config_host_mak
> if $iasl -h > /dev/null 2>&1; then
> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> index f21948c..29f5a1f 100644
> --- a/tests/vm/Makefile.include
> +++ b/tests/vm/Makefile.include
> @@ -10,6 +10,8 @@ IMAGES += ubuntu.aarch64 centos.aarch64
> endif
> endif
>
> +EFI_AARCH64 = $(wildcard $(SRC_PATH)/pc-bios/edk2-aarch64-code.fd)
I'm not sure this is correct. Shouldn't we use the '?=' operator to
allow override? I think we want to test
$(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd instead.
> +
> IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
> IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
>
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 009/143] configure: do not include $(...) variables in config-host.mak
2020-08-06 19:14 ` [PATCH 009/143] configure: do not include $(...) variables in config-host.mak Paolo Bonzini
@ 2020-08-07 13:09 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:09 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> This ensures that Meson will be able to reuse the results of
> the tests that are performed in the configure script.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile
2020-08-06 19:14 ` [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile Paolo Bonzini
@ 2020-08-07 13:11 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:11 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> No need to do it in the configure file if it is only used for a help message.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 9 ---------
> tests/vm/Makefile.include | 4 +++-
> 2 files changed, 3 insertions(+), 10 deletions(-)
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 037/143] meson: add qemu-bridge-helper
2020-08-06 19:14 ` [PATCH 037/143] meson: add qemu-bridge-helper Paolo Bonzini
@ 2020-08-07 13:20 ` Philippe Mathieu-Daudé
2020-08-07 14:26 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:20 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
Hi Paolo,
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile | 4 ----
> meson.build | 8 +++++++-
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 5df772b..0a2bbd5 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -181,8 +181,6 @@ LIBS+=-lz $(LIBS_TOOLS)
>
> HELPERS-y = $(HELPERS)
>
> -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
> -
> # Sphinx does not allow building manuals into the same directory as
> # the source files, so if we're doing an in-tree QEMU build we must
> # build the manuals into a subdirectory (and then install them from
> @@ -415,8 +413,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
> qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
> qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
>
> -qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
> -
> qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
>
> qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
> diff --git a/meson.build b/meson.build
> index a68c7b4..9eb1204 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -270,7 +270,6 @@ qemuutil = declare_dependency(link_with: libqemuutil,
> sources: genh + version_res)
>
> # Other build targets
> -
> if 'CONFIG_GUEST_AGENT' in config_host
> subdir('qga')
> endif
> @@ -289,6 +288,13 @@ if have_tools
> subdir('contrib/vhost-user-scsi')
> endif
>
> + if host_machine.system() == 'linux'
> + executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
> + dependencies: [qemuutil, libcap_ng],
Is libcap_ng still optional?
> + install: true,
> + install_dir: get_option('libexecdir'))
> + endif
> +
> if 'CONFIG_IVSHMEM' in config_host
> subdir('contrib/ivshmem-client')
> subdir('contrib/ivshmem-server')
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64
2020-08-07 13:06 ` Philippe Mathieu-Daudé
@ 2020-08-07 13:21 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 13:21 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 07/08/20 15:06, Philippe Mathieu-Daudé wrote:
>> +EFI_AARCH64 = $(wildcard $(SRC_PATH)/pc-bios/edk2-aarch64-code.fd)
> I'm not sure this is correct. Shouldn't we use the '?=' operator to
> allow override? I think we want to test
> $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd instead.
>
Command-line always override the Makefile value. But yes I'll fix the path.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 039/143] meson: add qemu-edid
2020-08-06 19:14 ` [PATCH 039/143] meson: add qemu-edid Paolo Bonzini
@ 2020-08-07 13:21 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:21 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile | 2 --
> configure | 2 +-
> meson.build | 3 +++
> 3 files changed, 4 insertions(+), 3 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 045/143] meson: uncompress edk2 bios
2020-08-06 19:14 ` [PATCH 045/143] meson: uncompress edk2 bios Paolo Bonzini
@ 2020-08-07 13:26 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:26 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile | 7 -------
> meson.build | 1 +
> pc-bios/meson.build | 23 +++++++++++++++++++++++
> 3 files changed, 24 insertions(+), 7 deletions(-)
> create mode 100644 pc-bios/meson.build
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 057/143] meson: convert chardev directory to Meson (tools part)
2020-08-06 19:14 ` [PATCH 057/143] meson: convert chardev directory to Meson (tools part) Paolo Bonzini
@ 2020-08-07 13:29 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:29 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:14 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile | 1 -
> Makefile.objs | 4 ++--
> Makefile.target | 2 +-
> chardev/Makefile.objs | 19 -------------------
> chardev/meson.build | 32 ++++++++++++++++++++++++++++++++
> meson.build | 1 +
> 6 files changed, 36 insertions(+), 23 deletions(-)
> create mode 100644 chardev/meson.build
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 068/143] meson: convert most of softmmu/
2020-08-06 19:15 ` [PATCH 068/143] " Paolo Bonzini
@ 2020-08-07 13:36 ` Philippe Mathieu-Daudé
2020-08-07 14:18 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:36 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Hi Paolo,
On 8/6/20 9:15 PM, Paolo Bonzini wrote:
> Leave out main.c, it's special due to fuzzing.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> softmmu/meson.build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/softmmu/meson.build b/softmmu/meson.build
> index d4ac51b..95d38df 100644
> --- a/softmmu/meson.build
> +++ b/softmmu/meson.build
> @@ -1,4 +1,4 @@
> -specific_ss.add(files(
> +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
> 'arch_init.c',
> 'balloon.c',
> 'cpus.c',
> @@ -6,4 +6,5 @@ specific_ss.add(files(
> 'ioport.c',
> 'memory.c',
> 'memory_mapping.c',
> - 'qtest.c'))
> + 'qtest.c',
> + 'vl.c'))
>
There is still "obj-y += vl.o" in softmmu/Makefile.objs.
Did you meant to squash this into the previous patch?
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 070/143] meson: convert block/
2020-08-06 19:15 ` [PATCH 070/143] meson: convert block/ Paolo Bonzini
@ 2020-08-07 13:37 ` Philippe Mathieu-Daudé
2020-08-07 14:21 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:37 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:15 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Makefile.objs | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index a5c919d..0f3074b 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
> # single QEMU executable should support all CPUs and machines.
>
> ifeq ($(CONFIG_SOFTMMU),y)
> -common-obj-y = block/
Left-over from 58/143 "meson: convert block"?
> -common-obj-y += dump/
> +common-obj-y = dump/
> common-obj-y += monitor/
> common-obj-y += net/
> common-obj-$(CONFIG_LINUX) += fsdev/
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 111/143] meson: convert hw/i2c
2020-08-06 19:15 ` [PATCH 111/143] meson: convert hw/i2c Paolo Bonzini
@ 2020-08-07 13:41 ` Philippe Mathieu-Daudé
2020-08-07 14:45 ` Corey Minyard
1 sibling, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 13:41 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/6/20 9:15 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hw/Makefile.objs | 1 -
> hw/i2c/Makefile.objs | 14 --------------
> hw/i2c/meson.build | 16 ++++++++++++++++
> hw/meson.build | 1 +
> 4 files changed, 17 insertions(+), 15 deletions(-)
> delete mode 100644 hw/i2c/Makefile.objs
> create mode 100644 hw/i2c/meson.build
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 003/143] pc-bios/s390-ccw: simplify Makefile
2020-08-07 12:58 ` Thomas Huth
@ 2020-08-07 13:55 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 13:55 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: Cornelia Huck
On 07/08/20 14:58, Thomas Huth wrote:
> As Cornelia already mentioned in another mail, this does not work yet.
> I'd also prefer if we could keep the netbook.mak stuff in that separate
> file.
It won't be possible to keep it separate when it's converted to Meson
(unless you add a new directory for netboot), but for now I'll surely go
for the bare minimum patch. Thanks very much!
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 8:39 ` Paolo Bonzini
@ 2020-08-07 13:55 ` Markus Armbruster
2020-08-07 14:02 ` Peter Maydell
0 siblings, 1 reply; 250+ messages in thread
From: Markus Armbruster @ 2020-08-07 13:55 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, jsnow, stefanha,
alex.bennee
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 07/08/20 09:56, Markus Armbruster wrote:
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>>
>>> This the more or less final version of the Meson conversion. Due to
>>> the sheer size of the series you have been CCed only on the cover
>>> letter.
>>
>> Perfect timing: right before I drop off for two weeks of vacation. I'm
>> excused! *Maniacal laughter*
>>
>> Have you run it through our CI?
>
> Of course not. O:-)
>
>> without even more weeks of intense rebasing.
>
> FWIW there were only three hard rebases from 5.0 to 5.2:
> qemu-storage-daemon (by far the hardest), linux-user's syscall_nr.h
> generation, and fuzzing (easiest except it required conversion of qtest). S
>
> I would like to merge this on August 21st. I hope to post a
> "definitive" verion on August 14th, and hope to work with Peter the next
> week on getting it to pass his tests.
Sounds good to me.
> Perhaps that's optimistic though.
If it's not ready then, we pick another date and try again.
> Depending on when it's ready, I can pick up the series that gets rid of
> Texinfo, if Peter and yourself don't want to learn Meson just for that.
I appreciate the offer. I figure I'll eventually have to learn some
Meson anyway. Still, having to learn it *now* to unblock that series
may be inconvenient.
> Anyway, I think this is the no-return point: if people say no, I'm not
> going to push it any further. If people say yes, we'd better merge it
> quickly and be done with it.
>
> I do understand resistance. It's a new tool replacing a 40-year-old
> standard; build systems are not fancy; and there is a substantial sunken
> cost. All I can answer is that the line between sunken cost and
> Stockholm syndrome is a fine one. I cannot say this stuff has been
> *fun*, but at least the debugging was refreshing compared to Makefiles.
> Again not a very high bar, but it's something.
I'm willing to trust your judgement on this one.
I'm notoriously conservative in my choice of tools, and GNU Make is a
much better tool than some people give it credit for, but I've long felt
we've pushed it beyond its limits.
[...]
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 13:55 ` Markus Armbruster
@ 2020-08-07 14:02 ` Peter Maydell
2020-08-07 15:14 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 14:02 UTC (permalink / raw)
To: Markus Armbruster
Cc: Daniel P. Berrange, Philippe Mathieu-Daudé,
QEMU Developers, John Snow, Stefan Hajnoczi, Paolo Bonzini,
Alex Bennée
On Fri, 7 Aug 2020 at 14:55, Markus Armbruster <armbru@redhat.com> wrote:
> I'm notoriously conservative in my choice of tools, and GNU Make is a
> much better tool than some people give it credit for, but I've long felt
> we've pushed it beyond its limits.
The thing is, it feels somewhat like we're already pushing Meson beyond
*its* limits instead... (it can't do everything we want it to, we've
already had to get at least one new feature added upstream for our benefit,
and in other places we're having to change our existing conventions
to placate Meson). This would be an easier sell if it was "this is all
straightforward and Meson has all the functionality we need".
I admit that I'm partly feeling a bit more conservative about tooling
right now because we just switched the docs to Sphinx and Sphinx has
turned out to have some annoying problems we didn't foresee. So taking
another tool from the Python universe isn't hugely appealing.
(This is not a 'nak'; I'm just expressing my unease.)
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 068/143] meson: convert most of softmmu/
2020-08-07 13:36 ` Philippe Mathieu-Daudé
@ 2020-08-07 14:18 ` Paolo Bonzini
2020-08-07 14:39 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 14:18 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 07/08/20 15:36, Philippe Mathieu-Daudé wrote:
> There is still "obj-y += vl.o" in softmmu/Makefile.objs.
>
> Did you meant to squash this into the previous patch?
This is what I meant:
diff --git a/meson.build b/meson.build
index a7ad3248cc..ef6f811c51 100644
--- a/meson.build
+++ b/meson.build
@@ -618,6 +618,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
+subdir('softmmu')
+
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
index a414a74c50..ebcfd15695 100644
--- a/softmmu/Makefile.objs
+++ b/softmmu/Makefile.objs
@@ -1,14 +1,2 @@
softmmu-main-y = softmmu/main.o
-
-obj-y += arch_init.o
-obj-y += cpus.o
-obj-y += cpu-throttle.o
-obj-y += balloon.o
-obj-y += ioport.o
-obj-y += memory.o
-obj-y += memory_mapping.o
-
-obj-y += qtest.o
-
-obj-y += vl.o
-vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
+main.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
diff --git a/softmmu/meson.build b/softmmu/meson.build
new file mode 100644
index 0000000000..95d38df259
--- /dev/null
+++ b/softmmu/meson.build
@@ -0,0 +1,10 @@
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
+ 'arch_init.c',
+ 'balloon.c',
+ 'cpus.c',
+ 'cpu-throttle.c',
+ 'ioport.c',
+ 'memory.c',
+ 'memory_mapping.c',
+ 'qtest.c',
+ 'vl.c'))
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [PATCH 070/143] meson: convert block/
2020-08-07 13:37 ` Philippe Mathieu-Daudé
@ 2020-08-07 14:21 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 14:21 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Marc-André Lureau
On 07/08/20 15:37, Philippe Mathieu-Daudé wrote:
> On 8/6/20 9:15 PM, Paolo Bonzini wrote:
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> Makefile.objs | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/Makefile.objs b/Makefile.objs
>> index a5c919d..0f3074b 100644
>> --- a/Makefile.objs
>> +++ b/Makefile.objs
>> @@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
>> # single QEMU executable should support all CPUs and machines.
>>
>> ifeq ($(CONFIG_SOFTMMU),y)
>> -common-obj-y = block/
>
> Left-over from 58/143 "meson: convert block"?
More or less. It used to be bigger but it was merged back into 58 due
to the introduction of storage-daemon.
Good catch though, it broke bisectability because block/Makefile.objs
has gone away in 58.
Paolo
>> -common-obj-y += dump/
>> +common-obj-y = dump/
>> common-obj-y += monitor/
>> common-obj-y += net/
>> common-obj-$(CONFIG_LINUX) += fsdev/
>>
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 037/143] meson: add qemu-bridge-helper
2020-08-07 13:20 ` Philippe Mathieu-Daudé
@ 2020-08-07 14:26 ` Paolo Bonzini
2020-08-07 14:40 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 14:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Marc-André Lureau
On 07/08/20 15:20, Philippe Mathieu-Daudé wrote:
>> endif
>>
>> + if host_machine.system() == 'linux'
>> + executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
>> + dependencies: [qemuutil, libcap_ng],
> Is libcap_ng still optional?
>
Yes, if a dependency is absent it is simply left out. See
contrib/vhost-user-scsi for an example where the executable is disabled.
Instead, if you want a dependency to be mandatory you have two choices:
- to break the build you use "required: true", see the SDL conversion
for an example
- to disable executables there is a thing called disabler but we're not
using it because it's confusing. I was thinking of adding an
"or_disable()" method to dependency objects, but I have never
contributed it.
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
` (146 preceding siblings ...)
2020-08-07 8:51 ` Thomas Huth
@ 2020-08-07 14:29 ` Daniel P. Berrangé
2020-08-07 15:30 ` Paolo Bonzini
147 siblings, 1 reply; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 14:29 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, jsnow, philmd, qemu-devel, armbru, stefanha, alex.bennee
On Thu, Aug 06, 2020 at 09:13:56PM +0200, Paolo Bonzini wrote:
> This the more or less final version of the Meson conversion. Due to
> the sheer size of the series you have been CCed only on the cover
> letter.
>
> The series reaches the point where Makefile.target and unnest-vars
> can be removed, and all builds become non-recursive. I have also
> converted parts of the testsuite, notably qtest since it is needed
> for fuzzing. What's left for _after_ the merge is: 1) unit tests;
> 2) moving the rest of installation to meson (for which I have patches);
> 3) moving feature detection from configure to meson.
> Available on git://github.com/bonzini/qemu branch meson-poc-next.
I built with ../configure --target-list=x86_64-softmmu on current
git master (e1d322c40524d2c544d1fcd37b267d106d16d328) and on
meson-poc-next (4877fbc31ecc2dd9705036628b0e53b1b2414045) and compared
the binaries.
I'm using Fedora 31 with Meson 0.55.0
-help output has changed in the version string
< QEMU emulator version 5.0.93 (v5.1.0-rc3)
---
> QEMU emulator version 5.0.93
New binaries have lost a bunch of libraries they previously linked
to. This isn't neccessarily a bug, if the old make code was incorrectly
adding too many libraries.
>>>>qemu-system-x86_64<<<<
< libibumad.so.3
< libxenguest.so.4.12
< libxml2.so.2
>>>>qemu-bridge-helper<<<<
< libdl.so.2
< libffi.so.6
< libgcc_s.so.1
< libgmp.so.10
< libgnutls.so.30
< libgthread-2.0.so.0
< libhogweed.so.5
< libidn2.so.0
< libm.so.6
< libnettle.so.7
< libp11-kit.so.0
< librt.so.1
< libstdc++.so.6
< libtasn1.so.6
< libunistring.so.2
< libutil.so.1
< libz.so.1
>>>>qemu-edid<<<<
< libcap-ng.so.0
< libdl.so.2
< libffi.so.6
< libgcc_s.so.1
< libgmp.so.10
< libgnutls.so.30
< libgthread-2.0.so.0
< libhogweed.so.5
< libidn2.so.0
< libnettle.so.7
< libp11-kit.so.0
< librt.so.1
< libstdc++.so.6
< libtasn1.so.6
< libunistring.so.2
< libutil.so.1
< libz.so.1
>>>>qemu-io<<<<
< libgthread-2.0.so.0
< liblzma.so.5
< libutil.so.1
< libxml2.so.2
>>>>qemu-nbd<<<<
< libgthread-2.0.so.0
< liblzma.so.5
< libutil.so.1
< libxml2.so.2
>>>>qemu-pr-helper<<<<
< libgthread-2.0.so.0
< libstdc++.so.6
< libutil.so.1
< libz.so.1
Comparing 'make install', I see some differences:
< /vroot/usr/local/bin/elf2dmp
< /vroot/usr/local/bin/qemu-edid
< /vroot/usr/local/bin/qemu-ga
< /vroot/usr/local/bin/qemu-storage-daemon
> /vroot/usr/local/bin/qemu-pr-helper
< /vroot/usr/local/libexec/qemu-pr-helper
< /vroot/usr/local/libexec/vhost-user-gpu
< /vroot/usr/local/libexec/virtfs-proxy-helper
< /vroot/usr/local/libexec/virtiofsd
< /vroot/usr/local/share/locale/sv/LC_MESSAGES/qemu.mo
Some documentation files have moved - gaining a bogus extra directory
component, and others are missing...
> /vroot/usr/local/share/doc/qemu/devel/devel/atomics.html
> /vroot/usr/local/share/doc/qemu/devel/devel/bitops.html
> /vroot/usr/local/share/doc/qemu/devel/devel/.buildinfo
> /vroot/usr/local/share/doc/qemu/devel/devel/clocks.html
> /vroot/usr/local/share/doc/qemu/devel/devel/decodetree.html
> /vroot/usr/local/share/doc/qemu/devel/devel/genindex.html
> /vroot/usr/local/share/doc/qemu/devel/devel/index.html
> /vroot/usr/local/share/doc/qemu/devel/devel/kconfig.html
> /vroot/usr/local/share/doc/qemu/devel/devel/loads-stores.html
> /vroot/usr/local/share/doc/qemu/devel/devel/memory.html
> /vroot/usr/local/share/doc/qemu/devel/devel/migration.html
> /vroot/usr/local/share/doc/qemu/devel/devel/multi-thread-tcg.html
> /vroot/usr/local/share/doc/qemu/devel/devel/objects.inv
> /vroot/usr/local/share/doc/qemu/devel/devel/reset.html
> /vroot/usr/local/share/doc/qemu/devel/devel/s390-dasd-ipl.html
> /vroot/usr/local/share/doc/qemu/devel/devel/search.html
> /vroot/usr/local/share/doc/qemu/devel/devel/searchindex.js
> /vroot/usr/local/share/doc/qemu/devel/devel/secure-coding-practices.html
> /vroot/usr/local/share/doc/qemu/devel/devel/stable-process.html
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/basic.css
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/custom.css
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/file.png
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/minus.png
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/plus.png
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/devel/devel/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/devel/devel/tcg.html
> /vroot/usr/local/share/doc/qemu/devel/devel/tcg-icount.html
> /vroot/usr/local/share/doc/qemu/devel/devel/tcg-plugins.html
> /vroot/usr/local/share/doc/qemu/devel/devel/testing.html
< /vroot/usr/local/share/doc/qemu/interop/bitmaps.html
< /vroot/usr/local/share/doc/qemu/interop/.buildinfo
< /vroot/usr/local/share/doc/qemu/interop/dbus.html
< /vroot/usr/local/share/doc/qemu/interop/dbus-vmstate.html
< /vroot/usr/local/share/doc/qemu/interop/genindex.html
< /vroot/usr/local/share/doc/qemu/interop/index.html
< /vroot/usr/local/share/doc/qemu/interop/live-block-operations.html
< /vroot/usr/local/share/doc/qemu/interop/objects.inv
< /vroot/usr/local/share/doc/qemu/interop/pr-helper.html
< /vroot/usr/local/share/doc/qemu/interop/qemu-ga.html
> /vroot/usr/local/share/doc/qemu/interop/interop/bitmaps.html
> /vroot/usr/local/share/doc/qemu/interop/interop/.buildinfo
> /vroot/usr/local/share/doc/qemu/interop/interop/dbus.html
> /vroot/usr/local/share/doc/qemu/interop/interop/dbus-vmstate.html
> /vroot/usr/local/share/doc/qemu/interop/interop/genindex.html
> /vroot/usr/local/share/doc/qemu/interop/interop/index.html
> /vroot/usr/local/share/doc/qemu/interop/interop/live-block-operations.html
> /vroot/usr/local/share/doc/qemu/interop/interop/objects.inv
> /vroot/usr/local/share/doc/qemu/interop/interop/pr-helper.html
> /vroot/usr/local/share/doc/qemu/interop/interop/qemu-ga.html
> /vroot/usr/local/share/doc/qemu/interop/interop/search.html
> /vroot/usr/local/share/doc/qemu/interop/interop/searchindex.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/basic.css
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/custom.css
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/file.png
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/minus.png
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/plus.png
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/interop/interop/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/interop/interop/vhost-user-gpu.html
> /vroot/usr/local/share/doc/qemu/interop/interop/vhost-user.html
> /vroot/usr/local/share/doc/qemu/interop/interop/vhost-vdpa.html
> /vroot/usr/local/share/doc/qemu/interop/qemu-ga-ref.info
> /vroot/usr/local/share/doc/qemu/interop/qemu-qmp-ref.info
< /vroot/usr/local/share/doc/qemu/interop/search.html
< /vroot/usr/local/share/doc/qemu/interop/searchindex.js
< /vroot/usr/local/share/doc/qemu/interop/_static/alabaster.css
< /vroot/usr/local/share/doc/qemu/interop/_static/basic.css
< /vroot/usr/local/share/doc/qemu/interop/_static/custom.css
< /vroot/usr/local/share/doc/qemu/interop/_static/doctools.js
< /vroot/usr/local/share/doc/qemu/interop/_static/documentation_options.js
< /vroot/usr/local/share/doc/qemu/interop/_static/file.png
< /vroot/usr/local/share/doc/qemu/interop/_static/jquery-3.2.1.js
< /vroot/usr/local/share/doc/qemu/interop/_static/jquery.js
< /vroot/usr/local/share/doc/qemu/interop/_static/language_data.js
< /vroot/usr/local/share/doc/qemu/interop/_static/minus.png
< /vroot/usr/local/share/doc/qemu/interop/_static/plus.png
< /vroot/usr/local/share/doc/qemu/interop/_static/pygments.css
< /vroot/usr/local/share/doc/qemu/interop/_static/searchtools.js
< /vroot/usr/local/share/doc/qemu/interop/_static/underscore-1.3.1.js
< /vroot/usr/local/share/doc/qemu/interop/_static/underscore.js
< /vroot/usr/local/share/doc/qemu/interop/vhost-user-gpu.html
< /vroot/usr/local/share/doc/qemu/interop/vhost-user.html
< /vroot/usr/local/share/doc/qemu/interop/vhost-vdpa.html
< /vroot/usr/local/share/doc/qemu/specs/acpi_hest_ghes.html
< /vroot/usr/local/share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
< /vroot/usr/local/share/doc/qemu/specs/.buildinfo
< /vroot/usr/local/share/doc/qemu/specs/genindex.html
< /vroot/usr/local/share/doc/qemu/specs/index.html
< /vroot/usr/local/share/doc/qemu/specs/objects.inv
< /vroot/usr/local/share/doc/qemu/specs/ppc-spapr-xive.html
< /vroot/usr/local/share/doc/qemu/specs/ppc-xive.html
< /vroot/usr/local/share/doc/qemu/specs/search.html
< /vroot/usr/local/share/doc/qemu/specs/searchindex.js
< /vroot/usr/local/share/doc/qemu/specs/_static/alabaster.css
< /vroot/usr/local/share/doc/qemu/specs/_static/basic.css
< /vroot/usr/local/share/doc/qemu/specs/_static/custom.css
< /vroot/usr/local/share/doc/qemu/specs/_static/doctools.js
< /vroot/usr/local/share/doc/qemu/specs/_static/documentation_options.js
< /vroot/usr/local/share/doc/qemu/specs/_static/file.png
< /vroot/usr/local/share/doc/qemu/specs/_static/jquery-3.2.1.js
< /vroot/usr/local/share/doc/qemu/specs/_static/jquery.js
< /vroot/usr/local/share/doc/qemu/specs/_static/language_data.js
< /vroot/usr/local/share/doc/qemu/specs/_static/minus.png
< /vroot/usr/local/share/doc/qemu/specs/_static/plus.png
< /vroot/usr/local/share/doc/qemu/specs/_static/pygments.css
< /vroot/usr/local/share/doc/qemu/specs/_static/searchtools.js
< /vroot/usr/local/share/doc/qemu/specs/_static/underscore-1.3.1.js
< /vroot/usr/local/share/doc/qemu/specs/_static/underscore.js
< /vroot/usr/local/share/doc/qemu/specs/tpm.html
< /vroot/usr/local/share/doc/qemu/system/arm/aspeed.html
< /vroot/usr/local/share/doc/qemu/system/arm/collie.html
< /vroot/usr/local/share/doc/qemu/system/arm/cpu-features.html
< /vroot/usr/local/share/doc/qemu/system/arm/digic.html
< /vroot/usr/local/share/doc/qemu/system/arm/gumstix.html
< /vroot/usr/local/share/doc/qemu/system/arm/integratorcp.html
< /vroot/usr/local/share/doc/qemu/system/arm/mps2.html
< /vroot/usr/local/share/doc/qemu/system/arm/musca.html
< /vroot/usr/local/share/doc/qemu/system/arm/musicpal.html
< /vroot/usr/local/share/doc/qemu/system/arm/nseries.html
< /vroot/usr/local/share/doc/qemu/system/arm/orangepi.html
< /vroot/usr/local/share/doc/qemu/system/arm/palm.html
< /vroot/usr/local/share/doc/qemu/system/arm/realview.html
< /vroot/usr/local/share/doc/qemu/system/arm/stellaris.html
< /vroot/usr/local/share/doc/qemu/system/arm/sx1.html
< /vroot/usr/local/share/doc/qemu/system/arm/versatile.html
< /vroot/usr/local/share/doc/qemu/system/arm/vexpress.html
< /vroot/usr/local/share/doc/qemu/system/arm/virt.html
< /vroot/usr/local/share/doc/qemu/system/arm/xscale.html
< /vroot/usr/local/share/doc/qemu/system/.buildinfo
< /vroot/usr/local/share/doc/qemu/system/build-platforms.html
< /vroot/usr/local/share/doc/qemu/system/deprecated.html
< /vroot/usr/local/share/doc/qemu/system/gdb.html
< /vroot/usr/local/share/doc/qemu/system/genindex.html
< /vroot/usr/local/share/doc/qemu/system/images.html
< /vroot/usr/local/share/doc/qemu/system/index.html
< /vroot/usr/local/share/doc/qemu/system/invocation.html
< /vroot/usr/local/share/doc/qemu/system/ivshmem.html
< /vroot/usr/local/share/doc/qemu/system/keys.html
< /vroot/usr/local/share/doc/qemu/system/license.html
< /vroot/usr/local/share/doc/qemu/system/linuxboot.html
< /vroot/usr/local/share/doc/qemu/system/managed-startup.html
< /vroot/usr/local/share/doc/qemu/system/monitor.html
< /vroot/usr/local/share/doc/qemu/system/mux-chardev.html
< /vroot/usr/local/share/doc/qemu/system/net.html
< /vroot/usr/local/share/doc/qemu/system/objects.inv
< /vroot/usr/local/share/doc/qemu/system/qemu-block-drivers.html
< /vroot/usr/local/share/doc/qemu/system/qemu-cpu-models.html
< /vroot/usr/local/share/doc/qemu/system/qemu-manpage.html
< /vroot/usr/local/share/doc/qemu/system/quickstart.html
< /vroot/usr/local/share/doc/qemu/system/s390x/3270.html
< /vroot/usr/local/share/doc/qemu/system/s390x/css.html
< /vroot/usr/local/share/doc/qemu/system/s390x/protvirt.html
< /vroot/usr/local/share/doc/qemu/system/s390x/vfio-ap.html
< /vroot/usr/local/share/doc/qemu/system/s390x/vfio-ccw.html
< /vroot/usr/local/share/doc/qemu/system/search.html
< /vroot/usr/local/share/doc/qemu/system/searchindex.js
< /vroot/usr/local/share/doc/qemu/system/security.html
< /vroot/usr/local/share/doc/qemu/system/_static/alabaster.css
< /vroot/usr/local/share/doc/qemu/system/_static/basic.css
< /vroot/usr/local/share/doc/qemu/system/_static/custom.css
< /vroot/usr/local/share/doc/qemu/system/_static/doctools.js
< /vroot/usr/local/share/doc/qemu/system/_static/documentation_options.js
< /vroot/usr/local/share/doc/qemu/system/_static/file.png
< /vroot/usr/local/share/doc/qemu/system/_static/jquery-3.2.1.js
< /vroot/usr/local/share/doc/qemu/system/_static/jquery.js
< /vroot/usr/local/share/doc/qemu/system/_static/language_data.js
< /vroot/usr/local/share/doc/qemu/system/_static/minus.png
< /vroot/usr/local/share/doc/qemu/system/_static/plus.png
< /vroot/usr/local/share/doc/qemu/system/_static/pygments.css
< /vroot/usr/local/share/doc/qemu/system/_static/searchtools.js
< /vroot/usr/local/share/doc/qemu/system/_static/underscore-1.3.1.js
< /vroot/usr/local/share/doc/qemu/system/_static/underscore.js
< /vroot/usr/local/share/doc/qemu/system/target-arm.html
< /vroot/usr/local/share/doc/qemu/system/target-avr.html
< /vroot/usr/local/share/doc/qemu/system/target-i386.html
< /vroot/usr/local/share/doc/qemu/system/target-m68k.html
< /vroot/usr/local/share/doc/qemu/system/target-mips.html
< /vroot/usr/local/share/doc/qemu/system/target-ppc.html
< /vroot/usr/local/share/doc/qemu/system/target-rx.html
< /vroot/usr/local/share/doc/qemu/system/target-s390x.html
< /vroot/usr/local/share/doc/qemu/system/targets.html
< /vroot/usr/local/share/doc/qemu/system/target-sparc64.html
< /vroot/usr/local/share/doc/qemu/system/target-sparc.html
< /vroot/usr/local/share/doc/qemu/system/target-xtensa.html
< /vroot/usr/local/share/doc/qemu/system/tls.html
< /vroot/usr/local/share/doc/qemu/system/usb.html
< /vroot/usr/local/share/doc/qemu/system/vnc-security.html
< /vroot/usr/local/share/doc/qemu/tools/.buildinfo
< /vroot/usr/local/share/doc/qemu/tools/genindex.html
< /vroot/usr/local/share/doc/qemu/tools/index.html
< /vroot/usr/local/share/doc/qemu/tools/objects.inv
< /vroot/usr/local/share/doc/qemu/tools/qemu-img.html
< /vroot/usr/local/share/doc/qemu/tools/qemu-nbd.html
< /vroot/usr/local/share/doc/qemu/tools/qemu-trace-stap.html
< /vroot/usr/local/share/doc/qemu/tools/search.html
< /vroot/usr/local/share/doc/qemu/tools/searchindex.js
< /vroot/usr/local/share/doc/qemu/tools/_static/alabaster.css
< /vroot/usr/local/share/doc/qemu/tools/_static/basic.css
< /vroot/usr/local/share/doc/qemu/tools/_static/custom.css
< /vroot/usr/local/share/doc/qemu/tools/_static/doctools.js
< /vroot/usr/local/share/doc/qemu/tools/_static/documentation_options.js
< /vroot/usr/local/share/doc/qemu/tools/_static/file.png
< /vroot/usr/local/share/doc/qemu/tools/_static/jquery-3.2.1.js
< /vroot/usr/local/share/doc/qemu/tools/_static/jquery.js
< /vroot/usr/local/share/doc/qemu/tools/_static/language_data.js
< /vroot/usr/local/share/doc/qemu/tools/_static/minus.png
< /vroot/usr/local/share/doc/qemu/tools/_static/plus.png
< /vroot/usr/local/share/doc/qemu/tools/_static/pygments.css
< /vroot/usr/local/share/doc/qemu/tools/_static/searchtools.js
< /vroot/usr/local/share/doc/qemu/tools/_static/underscore-1.3.1.js
< /vroot/usr/local/share/doc/qemu/tools/_static/underscore.js
< /vroot/usr/local/share/doc/qemu/tools/virtfs-proxy-helper.html
< /vroot/usr/local/share/doc/qemu/tools/virtiofsd.html
< /vroot/usr/local/share/doc/qemu/user/.buildinfo
< /vroot/usr/local/share/doc/qemu/user/genindex.html
< /vroot/usr/local/share/doc/qemu/user/index.html
< /vroot/usr/local/share/doc/qemu/user/main.html
< /vroot/usr/local/share/doc/qemu/user/objects.inv
< /vroot/usr/local/share/doc/qemu/user/search.html
< /vroot/usr/local/share/doc/qemu/user/searchindex.js
< /vroot/usr/local/share/doc/qemu/user/_static/alabaster.css
< /vroot/usr/local/share/doc/qemu/user/_static/basic.css
< /vroot/usr/local/share/doc/qemu/user/_static/custom.css
< /vroot/usr/local/share/doc/qemu/user/_static/doctools.js
< /vroot/usr/local/share/doc/qemu/user/_static/documentation_options.js
< /vroot/usr/local/share/doc/qemu/user/_static/file.png
< /vroot/usr/local/share/doc/qemu/user/_static/jquery-3.2.1.js
< /vroot/usr/local/share/doc/qemu/user/_static/jquery.js
< /vroot/usr/local/share/doc/qemu/user/_static/language_data.js
< /vroot/usr/local/share/doc/qemu/user/_static/minus.png
< /vroot/usr/local/share/doc/qemu/user/_static/plus.png
< /vroot/usr/local/share/doc/qemu/user/_static/pygments.css
< /vroot/usr/local/share/doc/qemu/user/_static/searchtools.js
< /vroot/usr/local/share/doc/qemu/user/_static/underscore-1.3.1.js
< /vroot/usr/local/share/doc/qemu/user/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/specs/specs/acpi_hest_ghes.html
> /vroot/usr/local/share/doc/qemu/specs/specs/acpi_hw_reduced_hotplug.html
> /vroot/usr/local/share/doc/qemu/specs/specs/.buildinfo
> /vroot/usr/local/share/doc/qemu/specs/specs/genindex.html
> /vroot/usr/local/share/doc/qemu/specs/specs/index.html
> /vroot/usr/local/share/doc/qemu/specs/specs/objects.inv
> /vroot/usr/local/share/doc/qemu/specs/specs/ppc-spapr-xive.html
> /vroot/usr/local/share/doc/qemu/specs/specs/ppc-xive.html
> /vroot/usr/local/share/doc/qemu/specs/specs/search.html
> /vroot/usr/local/share/doc/qemu/specs/specs/searchindex.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/basic.css
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/custom.css
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/file.png
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/minus.png
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/plus.png
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/specs/specs/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/specs/specs/tpm.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/aspeed.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/collie.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/cpu-features.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/digic.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/gumstix.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/integratorcp.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/mps2.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/musca.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/musicpal.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/nseries.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/orangepi.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/palm.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/realview.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/stellaris.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/sx1.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/versatile.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/vexpress.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/virt.html
> /vroot/usr/local/share/doc/qemu/system/system/arm/xscale.html
> /vroot/usr/local/share/doc/qemu/system/system/.buildinfo
> /vroot/usr/local/share/doc/qemu/system/system/build-platforms.html
> /vroot/usr/local/share/doc/qemu/system/system/deprecated.html
> /vroot/usr/local/share/doc/qemu/system/system/gdb.html
> /vroot/usr/local/share/doc/qemu/system/system/genindex.html
> /vroot/usr/local/share/doc/qemu/system/system/images.html
> /vroot/usr/local/share/doc/qemu/system/system/index.html
> /vroot/usr/local/share/doc/qemu/system/system/invocation.html
> /vroot/usr/local/share/doc/qemu/system/system/ivshmem.html
> /vroot/usr/local/share/doc/qemu/system/system/keys.html
> /vroot/usr/local/share/doc/qemu/system/system/license.html
> /vroot/usr/local/share/doc/qemu/system/system/linuxboot.html
> /vroot/usr/local/share/doc/qemu/system/system/managed-startup.html
> /vroot/usr/local/share/doc/qemu/system/system/monitor.html
> /vroot/usr/local/share/doc/qemu/system/system/mux-chardev.html
> /vroot/usr/local/share/doc/qemu/system/system/net.html
> /vroot/usr/local/share/doc/qemu/system/system/objects.inv
> /vroot/usr/local/share/doc/qemu/system/system/qemu-block-drivers.html
> /vroot/usr/local/share/doc/qemu/system/system/qemu-cpu-models.html
> /vroot/usr/local/share/doc/qemu/system/system/qemu-manpage.html
> /vroot/usr/local/share/doc/qemu/system/system/quickstart.html
> /vroot/usr/local/share/doc/qemu/system/system/s390x/3270.html
> /vroot/usr/local/share/doc/qemu/system/system/s390x/css.html
> /vroot/usr/local/share/doc/qemu/system/system/s390x/protvirt.html
> /vroot/usr/local/share/doc/qemu/system/system/s390x/vfio-ap.html
> /vroot/usr/local/share/doc/qemu/system/system/s390x/vfio-ccw.html
> /vroot/usr/local/share/doc/qemu/system/system/search.html
> /vroot/usr/local/share/doc/qemu/system/system/searchindex.js
> /vroot/usr/local/share/doc/qemu/system/system/security.html
> /vroot/usr/local/share/doc/qemu/system/system/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/system/system/_static/basic.css
> /vroot/usr/local/share/doc/qemu/system/system/_static/custom.css
> /vroot/usr/local/share/doc/qemu/system/system/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/file.png
> /vroot/usr/local/share/doc/qemu/system/system/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/minus.png
> /vroot/usr/local/share/doc/qemu/system/system/_static/plus.png
> /vroot/usr/local/share/doc/qemu/system/system/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/system/system/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/system/system/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/system/system/target-arm.html
> /vroot/usr/local/share/doc/qemu/system/system/target-avr.html
> /vroot/usr/local/share/doc/qemu/system/system/target-i386.html
> /vroot/usr/local/share/doc/qemu/system/system/target-m68k.html
> /vroot/usr/local/share/doc/qemu/system/system/target-mips.html
> /vroot/usr/local/share/doc/qemu/system/system/target-ppc.html
> /vroot/usr/local/share/doc/qemu/system/system/target-rx.html
> /vroot/usr/local/share/doc/qemu/system/system/target-s390x.html
> /vroot/usr/local/share/doc/qemu/system/system/targets.html
> /vroot/usr/local/share/doc/qemu/system/system/target-sparc64.html
> /vroot/usr/local/share/doc/qemu/system/system/target-sparc.html
> /vroot/usr/local/share/doc/qemu/system/system/target-xtensa.html
> /vroot/usr/local/share/doc/qemu/system/system/tls.html
> /vroot/usr/local/share/doc/qemu/system/system/usb.html
> /vroot/usr/local/share/doc/qemu/system/system/vnc-security.html
> /vroot/usr/local/share/doc/qemu/tools/tools/.buildinfo
> /vroot/usr/local/share/doc/qemu/tools/tools/genindex.html
> /vroot/usr/local/share/doc/qemu/tools/tools/index.html
> /vroot/usr/local/share/doc/qemu/tools/tools/objects.inv
> /vroot/usr/local/share/doc/qemu/tools/tools/qemu-img.html
> /vroot/usr/local/share/doc/qemu/tools/tools/qemu-nbd.html
> /vroot/usr/local/share/doc/qemu/tools/tools/qemu-trace-stap.html
> /vroot/usr/local/share/doc/qemu/tools/tools/search.html
> /vroot/usr/local/share/doc/qemu/tools/tools/searchindex.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/basic.css
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/custom.css
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/file.png
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/minus.png
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/plus.png
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/tools/tools/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/tools/tools/virtfs-proxy-helper.html
> /vroot/usr/local/share/doc/qemu/tools/tools/virtiofsd.html
> /vroot/usr/local/share/doc/qemu/user/user/.buildinfo
> /vroot/usr/local/share/doc/qemu/user/user/genindex.html
> /vroot/usr/local/share/doc/qemu/user/user/index.html
> /vroot/usr/local/share/doc/qemu/user/user/main.html
> /vroot/usr/local/share/doc/qemu/user/user/objects.inv
> /vroot/usr/local/share/doc/qemu/user/user/search.html
> /vroot/usr/local/share/doc/qemu/user/user/searchindex.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/user/user/_static/basic.css
> /vroot/usr/local/share/doc/qemu/user/user/_static/custom.css
> /vroot/usr/local/share/doc/qemu/user/user/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/file.png
> /vroot/usr/local/share/doc/qemu/user/user/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/minus.png
> /vroot/usr/local/share/doc/qemu/user/user/_static/plus.png
> /vroot/usr/local/share/doc/qemu/user/user/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/user/user/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/user/user/_static/underscore.js
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 068/143] meson: convert most of softmmu/
2020-08-07 14:18 ` Paolo Bonzini
@ 2020-08-07 14:39 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 14:39 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 8/7/20 4:18 PM, Paolo Bonzini wrote:
> On 07/08/20 15:36, Philippe Mathieu-Daudé wrote:
>> There is still "obj-y += vl.o" in softmmu/Makefile.objs.
>>
>> Did you meant to squash this into the previous patch?
>
> This is what I meant:
>
> diff --git a/meson.build b/meson.build
> index a7ad3248cc..ef6f811c51 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -618,6 +618,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
>
> common_ss.add(files('cpus-common.c'))
>
> +subdir('softmmu')
> +
> # needed for fuzzing binaries
> subdir('tests/qtest/libqos')
>
> diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
> index a414a74c50..ebcfd15695 100644
> --- a/softmmu/Makefile.objs
> +++ b/softmmu/Makefile.objs
> @@ -1,14 +1,2 @@
> softmmu-main-y = softmmu/main.o
> -
> -obj-y += arch_init.o
> -obj-y += cpus.o
> -obj-y += cpu-throttle.o
> -obj-y += balloon.o
> -obj-y += ioport.o
> -obj-y += memory.o
> -obj-y += memory_mapping.o
> -
> -obj-y += qtest.o
> -
> -obj-y += vl.o
> -vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
> +main.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
OK now I understand.
Please add "Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>" to
the new patch with this snippet content.
> diff --git a/softmmu/meson.build b/softmmu/meson.build
> new file mode 100644
> index 0000000000..95d38df259
> --- /dev/null
> +++ b/softmmu/meson.build
> @@ -0,0 +1,10 @@
> +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
> + 'arch_init.c',
> + 'balloon.c',
> + 'cpus.c',
> + 'cpu-throttle.c',
> + 'ioport.c',
> + 'memory.c',
> + 'memory_mapping.c',
> + 'qtest.c',
> + 'vl.c'))
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 037/143] meson: add qemu-bridge-helper
2020-08-07 14:26 ` Paolo Bonzini
@ 2020-08-07 14:40 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-07 14:40 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau
On 8/7/20 4:26 PM, Paolo Bonzini wrote:
> On 07/08/20 15:20, Philippe Mathieu-Daudé wrote:
>>> endif
>>>
>>> + if host_machine.system() == 'linux'
>>> + executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
>>> + dependencies: [qemuutil, libcap_ng],
>> Is libcap_ng still optional?
>>
>
> Yes, if a dependency is absent it is simply left out. See
> contrib/vhost-user-scsi for an example where the executable is disabled.
>
> Instead, if you want a dependency to be mandatory you have two choices:
>
> - to break the build you use "required: true", see the SDL conversion
> for an example
OK, good :)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> - to disable executables there is a thing called disabler but we're not
> using it because it's confusing. I was thinking of adding an
> "or_disable()" method to dependency objects, but I have never
> contributed it.
>
> Paolo
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 106/143] meson: convert hw/ipmi
2020-08-06 19:15 ` [PATCH 106/143] meson: convert hw/ipmi Paolo Bonzini
@ 2020-08-07 14:42 ` Corey Minyard
0 siblings, 0 replies; 250+ messages in thread
From: Corey Minyard @ 2020-08-07 14:42 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
On Thu, Aug 06, 2020 at 09:15:42PM +0200, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
I looked at all the configure names and files and everything
looks correct.
Reviewed-by: Corey Minyard <cminyard@mvista.com>
> ---
> hw/Makefile.objs | 1 -
> hw/ipmi/Makefile.objs | 8 --------
> hw/ipmi/meson.build | 11 +++++++++++
> hw/meson.build | 1 +
> 4 files changed, 12 insertions(+), 9 deletions(-)
> delete mode 100644 hw/ipmi/Makefile.objs
> create mode 100644 hw/ipmi/meson.build
>
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index a28e211..f136377 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -15,7 +15,6 @@ devices-dirs-y += ide/
> devices-dirs-y += input/
> devices-dirs-y += intc/
> devices-dirs-$(CONFIG_IPACK) += ipack/
> -devices-dirs-$(CONFIG_IPMI) += ipmi/
> endif
>
> common-obj-y += $(devices-dirs-y)
> diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs
> deleted file mode 100644
> index 3cca10b..0000000
> --- a/hw/ipmi/Makefile.objs
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -common-obj-$(CONFIG_IPMI) += ipmi.o ipmi_kcs.o ipmi_bt.o
> -common-obj-$(CONFIG_IPMI_LOCAL) += ipmi_bmc_sim.o
> -common-obj-$(CONFIG_IPMI_EXTERN) += ipmi_bmc_extern.o
> -common-obj-$(CONFIG_ISA_IPMI_KCS) += isa_ipmi_kcs.o
> -common-obj-$(CONFIG_PCI_IPMI_KCS) += pci_ipmi_kcs.o
> -common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o
> -common-obj-$(CONFIG_PCI_IPMI_BT) += pci_ipmi_bt.o
> -common-obj-$(CONFIG_IPMI_SSIF) += smbus_ipmi.o
> diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
> new file mode 100644
> index 0000000..9622ea2
> --- /dev/null
> +++ b/hw/ipmi/meson.build
> @@ -0,0 +1,11 @@
> +ipmi_ss = ss.source_set()
> +ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c', 'ipmi_bt.c'))
> +ipmi_ss.add(when: 'CONFIG_IPMI_LOCAL', if_true: files('ipmi_bmc_sim.c'))
> +ipmi_ss.add(when: 'CONFIG_IPMI_EXTERN', if_true: files('ipmi_bmc_extern.c'))
> +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_KCS', if_true: files('isa_ipmi_kcs.c'))
> +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c'))
> +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
> +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c'))
> +ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c'))
> +
> +softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
> diff --git a/hw/meson.build b/hw/meson.build
> index 8659854..9796f95 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -1,4 +1,5 @@
> subdir('core')
> +subdir('ipmi')
> subdir('isa')
> subdir('mem')
> subdir('misc')
> --
> 1.8.3.1
>
>
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 111/143] meson: convert hw/i2c
2020-08-06 19:15 ` [PATCH 111/143] meson: convert hw/i2c Paolo Bonzini
2020-08-07 13:41 ` Philippe Mathieu-Daudé
@ 2020-08-07 14:45 ` Corey Minyard
1 sibling, 0 replies; 250+ messages in thread
From: Corey Minyard @ 2020-08-07 14:45 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
On Thu, Aug 06, 2020 at 09:15:47PM +0200, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
> ---
> hw/Makefile.objs | 1 -
> hw/i2c/Makefile.objs | 14 --------------
> hw/i2c/meson.build | 16 ++++++++++++++++
> hw/meson.build | 1 +
> 4 files changed, 17 insertions(+), 15 deletions(-)
> delete mode 100644 hw/i2c/Makefile.objs
> create mode 100644 hw/i2c/meson.build
>
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 02c5c0d..22eb804 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -10,7 +10,6 @@ devices-dirs-y += display/
> devices-dirs-y += dma/
> devices-dirs-y += gpio/
> devices-dirs-$(CONFIG_HYPERV) += hyperv/
> -devices-dirs-$(CONFIG_I2C) += i2c/
> endif
>
> common-obj-y += $(devices-dirs-y)
> diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
> deleted file mode 100644
> index f2c61ea..0000000
> --- a/hw/i2c/Makefile.objs
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -common-obj-$(CONFIG_I2C) += core.o
> -common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o
> -common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o
> -common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
> -common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o
> -common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o
> -common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
> -common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
> -common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
> -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o
> -common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o
> -common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o
> -common-obj-$(CONFIG_OMAP) += omap_i2c.o
> -common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
> diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
> new file mode 100644
> index 0000000..3a51153
> --- /dev/null
> +++ b/hw/i2c/meson.build
> @@ -0,0 +1,16 @@
> +i2c_ss = ss.source_set()
> +i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c'))
> +i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c'))
> +i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c'))
> +i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c'))
> +i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_IMX_I2C', if_true: files('imx_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_MPC_I2C', if_true: files('mpc_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('microbit_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_SMBUS_EEPROM', if_true: files('smbus_eeprom.c'))
> +i2c_ss.add(when: 'CONFIG_VERSATILE_I2C', if_true: files('versatile_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c'))
> +i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c'))
> +softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
> diff --git a/hw/meson.build b/hw/meson.build
> index 4d7c31c6..983edc1 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -1,4 +1,5 @@
> subdir('core')
> +subdir('i2c')
> subdir('ide')
> subdir('input')
> subdir('intc')
> --
> 1.8.3.1
>
>
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 14:02 ` Peter Maydell
@ 2020-08-07 15:14 ` Paolo Bonzini
2020-08-07 15:26 ` Peter Maydell
2020-08-07 15:58 ` Daniel P. Berrangé
0 siblings, 2 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 15:14 UTC (permalink / raw)
To: Peter Maydell, Markus Armbruster
Cc: Daniel P. Berrange, Philippe Mathieu-Daudé,
QEMU Developers, John Snow, Stefan Hajnoczi, Alex Bennée
On 07/08/20 16:02, Peter Maydell wrote:
> On Fri, 7 Aug 2020 at 14:55, Markus Armbruster <armbru@redhat.com> wrote:
>> I'm notoriously conservative in my choice of tools, and GNU Make is a
>> much better tool than some people give it credit for, but I've long felt
>> we've pushed it beyond its limits.
>
> The thing is, it feels somewhat like we're already pushing Meson beyond
> *its* limits instead...
We totally are pushing it *to* its limits, though I obviously disagree
with "beyond". QEMU would certainly be one of the largest projects
using Meson. In fact we had to add more than one new feature.
One important difference between Make and Meson is that Meson is by
design limited in what it can do. The idea (which I think has served
them well) is that they want projects to show what they need and work
with them on how to build it. So:
- with Make you can do everything, it just becomes harder and harder;
- with Meson you cannot do everything, plus you're using software that
is opinionated and conservative in some respects with respect to its
design decisions. In exchange: 1) you can always propose to add
features to the upstream project like Marc-André and I did; 2) you don't
have to worry about the minute details of everything.
So that's what makes Shell+Make and Meson substantially different tools.
Stuff like automatically cloning git submodules will never be in Meson,
and we can keep Make forever as a small escape hatch for that. However,
using Make as a Turing-complete language to build our own DSLs on top of
is just a bad idea. Shell+Make can remain simply as a driver for
executing commands, which is what Make does best.
We also have parts that have effectively separate build systems: I have
no plans to convert the TCG tests at all, the firmware could be
converted to Meson or Autotools (yes I am serious :)) or left aside, and
so on.
That said, and going back to pushing Make beyond its limits, I am quite
positive that unnest-vars has to go even if the solution has some
disadvantages. Meson is one solution, our own home-grown DSL and
Makefile generator could be another. However, designing our own build
system DSL is not something I want to spend time on; I prefer to improve
Meson for every other project using it, it's better for the whole open
source development community.
The reason why I started thinking about the conversion is that every now
and then people entered fights against unnest-vars and I was wondering
how those fights would compare to Meson fights. And the result, after
about one year of hacking on and off, is that---with one exception---it
never felt like I was fighting Meson or the Meson maintainers; any
adaptation or concession came naturally, or was even an improvement in
retrospect.
That one exception, the one thing that disappoints me of the whole
conversion, is the trace.h files. The current solution is one of the
first parts I did of the conversion and I have never touched it since; I
think it can be improved (I can even think of two ways to do it), but I
don't really have the time to do it now. But even that bit is just
ugly, not unmaintainable, and I really see nothing in the conversion
that is a step back for QEMU's long term maintainability and our ability
to develop new features.
/me gets off the soap box
Thanks,
Paolo
> (it can't do everything we want it to, we've
> already had to get at least one new feature added upstream for our benefit,
> and in other places we're having to change our existing conventions
> to placate Meson). This would be an easier sell if it was "this is all
> straightforward and Meson has all the functionality we need".
>
> I admit that I'm partly feeling a bit more conservative about tooling
> right now because we just switched the docs to Sphinx and Sphinx has
> turned out to have some annoying problems we didn't foresee. So taking
> another tool from the Python universe isn't hugely appealing.
>
> (This is not a 'nak'; I'm just expressing my unease.)
Yes, it's totally understandable.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 12:20 ` Cornelia Huck
@ 2020-08-07 15:18 ` Paolo Bonzini
2020-08-10 9:58 ` Cornelia Huck
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 15:18 UTC (permalink / raw)
To: Cornelia Huck
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On 07/08/20 14:20, Cornelia Huck wrote:
>> - on an s390x system, it mostly builds, but I end up with a bunch of
>> link errors for libblock.fa, where it fails to find various ZSTD_
>> symbols
> Still happening after switching to the latest version of your branch.
>
Fixed thusly:
diff --git a/block/meson.build b/block/meson.build
index c59e9ebd94..cd3bff5d80 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -40,7 +40,7 @@ block_ss.add(files(
'vmdk.c',
'vpc.c',
'write-threshold.c',
-))
+), zstd)
block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c'))
block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
diff --git a/configure b/configure
index 54c60bc8d6..610801ddaa 100755
--- a/configure
+++ b/configure
@@ -2623,8 +2623,6 @@ if test "$zstd" != "no" ; then
if $pkg_config --atleast-version=$libzstd_minver libzstd ; then
zstd_cflags="$($pkg_config --cflags libzstd)"
zstd_libs="$($pkg_config --libs libzstd)"
- LIBS="$zstd_libs $LIBS"
- QEMU_CFLAGS="$QEMU_CFLAGS $zstd_cflags"
zstd="yes"
else
if test "$zstd" = "yes" ; then
@@ -7394,6 +7392,8 @@ fi
if test "$zstd" = "yes" ; then
echo "CONFIG_ZSTD=y" >> $config_host_mak
+ echo "ZSTD_CFLAGS=$zstd_cflags" >> $config_host_mak
+ echo "ZSTD_LIBS=$zstd_libs" >> $config_host_mak
fi
if test "$libiscsi" = "yes" ; then
diff --git a/meson.build b/meson.build
index 155f7f8065..0323968aec 100644
--- a/meson.build
+++ b/meson.build
@@ -141,6 +141,11 @@ if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
link_args: config_host['LIBISCSI_LIBS'].split())
endif
+zstd = not_found
+if 'CONFIG_ZSTD' in config_host
+ zstd = declare_dependency(compile_args: config_host['ZSTD_CFLAGS'].split(),
+ link_args: config_host['ZSTD_LIBS'].split())
+endif
gbm = not_found
if 'CONFIG_GBM' in config_host
gbm = declare_dependency(compile_args: config_host['GBM_CFLAGS'].split(),
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:14 ` Paolo Bonzini
@ 2020-08-07 15:26 ` Peter Maydell
2020-08-07 16:01 ` Paolo Bonzini
2020-08-07 15:58 ` Daniel P. Berrangé
1 sibling, 1 reply; 250+ messages in thread
From: Peter Maydell @ 2020-08-07 15:26 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Daniel P. Berrange, Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, John Snow, Stefan Hajnoczi,
Alex Bennée
On Fri, 7 Aug 2020 at 16:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> One important difference between Make and Meson is that Meson is by
> design limited in what it can do. The idea (which I think has served
> them well) is that they want projects to show what they need and work
> with them on how to build it. So:
>
> - with Make you can do everything, it just becomes harder and harder;
>
> - with Meson you cannot do everything, plus you're using software that
> is opinionated and conservative in some respects with respect to its
> design decisions. In exchange: 1) you can always propose to add
> features to the upstream project like Marc-André and I did; 2) you don't
> have to worry about the minute details of everything.
Yeah, this is what I don't like. I don't think this philosophy
of tool design is one that works well for us as a large
project that prefers to rely on the distro packaged versions
of our dependencies and build tools. It would be different
if the ecosystem we're in was one where it was really natural
to declare versioned dependencies on particular packages or
tools and have them automatically pulled in as necessary, perhaps.
For instance, I was just glancing through the Meson FAQ,
and "tell the compiler not to use RTTI for C++" is apparently
something that needed a change to Meson to support, which seems
ridiculous. This really feels like we're going to find ourselves
in the future boxed into "we're using Meson, but we also need
to do X, and Meson's opinion is 'nobody would want X', so we're
stuck". This initial attempt at conversion already got stalled
for a long time AFAIK because it took a long time to get a
feature we wanted into Meson and then for Meson to do a
release with the change in it. That seems like a bad sign to me.
thanks
-- PMM
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 14:29 ` Daniel P. Berrangé
@ 2020-08-07 15:30 ` Paolo Bonzini
2020-08-10 10:34 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 15:30 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: peter.maydell, jsnow, philmd, qemu-devel, armbru, stefanha, alex.bennee
On 07/08/20 16:29, Daniel P. Berrangé wrote:
> New binaries have lost a bunch of libraries they previously linked
> to. This isn't neccessarily a bug, if the old make code was incorrectly
> adding too many libraries.
Yes this is because Meson uses --as-needed.
> Comparing 'make install', I see some differences:
>
> < /vroot/usr/local/bin/elf2dmp
> < /vroot/usr/local/bin/qemu-edid
> < /vroot/usr/local/bin/qemu-ga
> < /vroot/usr/local/bin/qemu-storage-daemon
> > /vroot/usr/local/bin/qemu-pr-helper
> < /vroot/usr/local/libexec/qemu-pr-helper
> < /vroot/usr/local/libexec/vhost-user-gpu
> < /vroot/usr/local/libexec/virtfs-proxy-helper
> < /vroot/usr/local/libexec/virtiofsd
> < /vroot/usr/local/share/locale/sv/LC_MESSAGES/qemu.mo
>
> Some documentation files have moved - gaining a bogus extra directory
> component, and others are missing...
I see no missing files after removing the extra directory component.
0a1,38
> /vroot/usr/local/share/doc/qemu/devel/atomics.html
> /vroot/usr/local/share/doc/qemu/devel/bitops.html
> /vroot/usr/local/share/doc/qemu/devel/.buildinfo
> /vroot/usr/local/share/doc/qemu/devel/clocks.html
> /vroot/usr/local/share/doc/qemu/devel/decodetree.html
> /vroot/usr/local/share/doc/qemu/devel/genindex.html
> /vroot/usr/local/share/doc/qemu/devel/index.html
> /vroot/usr/local/share/doc/qemu/devel/kconfig.html
> /vroot/usr/local/share/doc/qemu/devel/loads-stores.html
> /vroot/usr/local/share/doc/qemu/devel/memory.html
> /vroot/usr/local/share/doc/qemu/devel/migration.html
> /vroot/usr/local/share/doc/qemu/devel/multi-thread-tcg.html
> /vroot/usr/local/share/doc/qemu/devel/objects.inv
> /vroot/usr/local/share/doc/qemu/devel/reset.html
> /vroot/usr/local/share/doc/qemu/devel/s390-dasd-ipl.html
> /vroot/usr/local/share/doc/qemu/devel/search.html
> /vroot/usr/local/share/doc/qemu/devel/searchindex.js
> /vroot/usr/local/share/doc/qemu/devel/secure-coding-practices.html
> /vroot/usr/local/share/doc/qemu/devel/stable-process.html
> /vroot/usr/local/share/doc/qemu/devel/_static/alabaster.css
> /vroot/usr/local/share/doc/qemu/devel/_static/basic.css
> /vroot/usr/local/share/doc/qemu/devel/_static/custom.css
> /vroot/usr/local/share/doc/qemu/devel/_static/doctools.js
> /vroot/usr/local/share/doc/qemu/devel/_static/documentation_options.js
> /vroot/usr/local/share/doc/qemu/devel/_static/file.png
> /vroot/usr/local/share/doc/qemu/devel/_static/jquery-3.2.1.js
> /vroot/usr/local/share/doc/qemu/devel/_static/jquery.js
> /vroot/usr/local/share/doc/qemu/devel/_static/language_data.js
> /vroot/usr/local/share/doc/qemu/devel/_static/minus.png
> /vroot/usr/local/share/doc/qemu/devel/_static/plus.png
> /vroot/usr/local/share/doc/qemu/devel/_static/pygments.css
> /vroot/usr/local/share/doc/qemu/devel/_static/searchtools.js
> /vroot/usr/local/share/doc/qemu/devel/_static/underscore-1.3.1.js
> /vroot/usr/local/share/doc/qemu/devel/_static/underscore.js
> /vroot/usr/local/share/doc/qemu/devel/tcg.html
> /vroot/usr/local/share/doc/qemu/devel/tcg-icount.html
> /vroot/usr/local/share/doc/qemu/devel/tcg-plugins.html
> /vroot/usr/local/share/doc/qemu/devel/testing.html
10a49,50
> /vroot/usr/local/share/doc/qemu/interop/qemu-ga-ref.info
> /vroot/usr/local/share/doc/qemu/interop/qemu-qmp-ref.info
I'll stop installing the devel manual and keep the .info file in interop
(which hopefully will go away anyway in 5.2).
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:14 ` Paolo Bonzini
2020-08-07 15:26 ` Peter Maydell
@ 2020-08-07 15:58 ` Daniel P. Berrangé
2020-08-10 10:32 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 250+ messages in thread
From: Daniel P. Berrangé @ 2020-08-07 15:58 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Peter Maydell, Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, Alex Bennée,
Stefan Hajnoczi, John Snow
On Fri, Aug 07, 2020 at 05:14:06PM +0200, Paolo Bonzini wrote:
> Stuff like automatically cloning git submodules will never be in Meson,
> and we can keep Make forever as a small escape hatch for that. However,
> using Make as a Turing-complete language to build our own DSLs on top of
> is just a bad idea. Shell+Make can remain simply as a driver for
> executing commands, which is what Make does best.
>
> We also have parts that have effectively separate build systems: I have
> no plans to convert the TCG tests at all, the firmware could be
> converted to Meson or Autotools (yes I am serious :)) or left aside, and
> so on.
Using meson for submodules too is potentially appealing, as you can
then take advantage of Meson's subproject support. This makes it easy
for distro vendors to turn off building of the bundled pieces in favour
of the distro provided equivalent.
> That one exception, the one thing that disappoints me of the whole
> conversion, is the trace.h files. The current solution is one of the
> first parts I did of the conversion and I have never touched it since; I
> think it can be improved (I can even think of two ways to do it), but I
> don't really have the time to do it now. But even that bit is just
> ugly, not unmaintainable, and I really see nothing in the conversion
> that is a step back for QEMU's long term maintainability and our ability
> to develop new features.
I was never entirely happy with the trace.h stuff even in "make".
Trying to maintain the "trace.h" name for every generated header
was probably a mistake in retrospect. it caused me so much pain
trying to get the "make" rules correct so that we resolved the
right trace.h in each case. I was deperately trying to avoid
updating the #include lines, but I'm not sure it was worth
it in the end. Would have been easier to just generate a unique
header file name for each dir and update the #includes.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:26 ` Peter Maydell
@ 2020-08-07 16:01 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 16:01 UTC (permalink / raw)
To: Peter Maydell
Cc: Daniel P. Berrange, Philippe Mathieu-Daudé,
Markus Armbruster, QEMU Developers, John Snow, Stefan Hajnoczi,
Alex Bennée
On 07/08/20 17:26, Peter Maydell wrote:
> For instance, I was just glancing through the Meson FAQ,
> and "tell the compiler not to use RTTI for C++" is apparently
> something that needed a change to Meson to support, which seems
> ridiculous.
I am not sure why they singled that out in the FAQ, but there's actually
an explanation for requiring a change to Meson: the Meson option takes
care of that for both Visual Studio and GCC. If (as we do) you only
care about GCC, you can just add -Wno-exceptions just like you'd do with
Shell+make.
I agree that making it a FAQ is sort of ridiculous.
> This really feels like we're going to find ourselves
> in the future boxed into "we're using Meson, but we also need
> to do X, and Meson's opinion is 'nobody would want X', so we're
> stuck". This initial attempt at conversion already got stalled
> for a long time AFAIK because it took a long time to get a
> feature we wanted into Meson and then for Meson to do a
> release with the change in it. That seems like a bad sign to me.
I'd say it was mostly because I had other stuff to do. Rebasing to a
new release needed me to have the right amount of free time (a lot) at
the right point of the release cycle (during freeze).
What you refer to is the fact that it took a long time for Meson to
declare the "keyval" module stable. That module is what we use to load
.mak files from configure and minikconf into Meson, and it was a good
thing that it took a long time actually.
The initial version was called "kconfig", and the Meson developers were
worried about advertising something called "kconfig" when the only user
was QEMU and it was not even using kconfig. In the end a user pointed
out that QEMU's config-host.mak file is in fact not a valid kconfig
files. The Meson developers agreed to keep the code exactly the same,
just renaming the module from kconfig to keyval. So I think they made
the right call.
This was the only feature that took time to stabilize, and I think they
made the right call. For what it's worth, the list of things that were
contributed is as follows:
Completely new functionality:
* New "keyval" module
* New module "sourceset" to match source file lists against config
Extensions to existing constructs:
* configure_file(): Allow multiple inputs in command mode
* configure_file(): Add depfile argument
Interoperability:
* Support a NINJA environment variable
* mintro: include test protocol in introspection data
* Add TAP parser (which we don't use, it was only a bait for the
previous change :))
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [PATCH 063/143] meson: convert tests/qtest to meson
2020-08-06 19:14 ` [PATCH 063/143] meson: convert tests/qtest to meson Paolo Bonzini
@ 2020-08-07 17:22 ` Alexander Bulekov
2020-08-07 18:22 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Alexander Bulekov @ 2020-08-07 17:22 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Thomas Huth, qemu-devel, Darren Kenny, Bandan Das,
Stefan Hajnoczi, Philippe Mathieu-Daudé
Thank you, Paolo. I haven't gone through all the other messages yet, so
maybe I missed some insights that would help with this.
Some notes as I try to build qemu-fuzz-i386.
* Needed to do git submodule update --init. IIRC this used to happen
automatically for stuff like slirp. I will need to update the oss-fuzz
build scripts (./scripts/oss-fuzz/build.sh) to init submodules.
* My locally installed Meson was too old. Needed to add --meson=git . Is
there a reason this is not the default?
* The make i386-softmmu/{all,fuzz} flavored targets are gone. Good. Now
we have qemu-system-i386 and qemu-fuzz-i386
* Trying make qemu-fuzz-i386:
../tests/qtest/fuzz/virtio_scsi_fuzz.c:16:10: fatal error: 'libqos/virtio-scsi.h' file not found
#include "libqos/virtio-scsi.h"
^~~~~~~~~~~~~~~~~~~~~~
1 error generated.
make: *** [Makefile.ninja:2761: qemu-fuzz-i386.p/tests_qtest_fuzz_virtio_scsi_fuzz.c.o] Error 1
No big deal, thats probably not the right way to include that stuff
anyways:
------------------------
diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c
index 977ac424ed..6ff6fabe4a 100644
--- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
+++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
@@ -13,9 +13,9 @@
#include "qemu/osdep.h"
#include "tests/qtest/libqos/libqtest.h"
-#include "libqos/virtio-scsi.h"
-#include "libqos/virtio.h"
-#include "libqos/virtio-pci.h"
+#include "tests/qtest/libqos/virtio-scsi.h"
+#include "tests/qtest/libqos/virtio.h"
+#include "tests/qtest/libqos/virtio-pci.h"
#include "standard-headers/linux/virtio_ids.h"
#include "standard-headers/linux/virtio_pci.h"
#include "standard-headers/linux/virtio_scsi.h"
------------------------
* Ok. Lets try again:
In file included from ../ui/vnc.h:103:
../ui/vnc-auth-sasl.h:28:10: fatal error: 'sasl/sasl.h' file not found
#include <sasl/sasl.h>
^~~~~~~~~~~~~
Didn't need that before - oh well. apt install libsasl-dev
../ui/input-keymap.c:7:10: fatal error: 'ui/input-keymap-atset1-to-qcode.c' file not found
#include "ui/input-keymap-atset1-to-qcode.c"
Can't find that anywhere. Lets try to clear out the build dir and build
system without --enable-fuzzing:
CC=clang-9 CXX=clang++-9 ../configure --enable-sanitizers --meson=git
make qemu-system-i386
...
../qemu-options-wrapper.h:32:10: fatal error: 'qemu-options.def' file not found
#include "qemu-options.def"
Ok lets try:
make qemu-options.def
We get further now:
../ui/input-keymap.c:7:10: fatal error: 'ui/input-keymap-atset1-to-qcode.c' file not found
#include "ui/input-keymap-atset1-to-qcode.c"
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lets try: make "ui/input-keymap-atset1-to-qcode.c"
.. and make "ui/input-keymap-linux-to-qcode.c"
.. and make "ui/input-keymap-qcode-to-atset1.c"
.. and make "ui/input-keymap-qcode-to-atset2.c"
.. and make "ui/input-keymap-qcode-to-atset3.c"
.. and make "ui/input-keymap-qcode-to-linux.c"
.. and make "ui/input-keymap-qcode-to-qnum.c"
.. and make "ui/input-keymap-qcode-to-sun.c"
.. and make "ui/input-keymap-qnum-to-qcode.c"
Since it seems the problems aren't specific to the fuzz target, Lets
re-try with --enable-fuzzing
Ok, we're very close now:
clang: error: unknown argument: '-wrap'
.... 19 times
clang: error: no such file or directory: 'qtest_inb'
....
clang: error: no such file or directory: 'qtest_memset'
Ok what is it trying to do? Lets do make -n qemu-fuzz-i386:
clang++-9 -o qemu-fuzz-i386 qemu-fuzz-i386.p/tests_qtest_fuzz_i440fx_fuzz.c.o
-fsanitize=fuzzer -Ttests/qtest/fuzz/fork_fuzz.ld -wrap qtest_inb -wrap
qtest_inw -wrap qtest_inl -wrap qtest_outb -wrap qtest_outw -wrap
qtest_outl -wrap qtest_readb -wrap qtest_readw -wrap qtest_readl -wrap
qtest_readq -wrap qtest_writeb
Hmm those need to have -Wl, . Lets just hack it in, for now (we also
don't build qtest_wrappers.o, so lets fix that):
diff --git a/tests/qtest/fuzz/meson.build b/tests/qtest/fuzz/meson.build
index 58ab69a952..0345f6c993 100644
--- a/tests/qtest/fuzz/meson.build
+++ b/tests/qtest/fuzz/meson.build
@@ -1,4 +1,4 @@
-specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c'), qos)
+specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c', 'qtest_wrappers.c'), qos)
# Targets
specific_fuzz_ss.add(when: 'CONFIG_I440FX', if_true: files('i440fx_fuzz.c'))
@@ -10,25 +10,25 @@ specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio_scsi_fuz
fork_fuzz = declare_dependency(
link_args: ['-fsanitize=fuzzer',
'-Ttests/qtest/fuzz/fork_fuzz.ld',
- '-wrap', 'qtest_inb',
- '-wrap', 'qtest_inw',
- '-wrap', 'qtest_inl',
- '-wrap', 'qtest_outb',
- '-wrap', 'qtest_outw',
- '-wrap', 'qtest_outl',
- '-wrap', 'qtest_readb',
- '-wrap', 'qtest_readw',
- '-wrap', 'qtest_readl',
- '-wrap', 'qtest_readq',
- '-wrap', 'qtest_writeb',
- '-wrap', 'qtest_writew',
- '-wrap', 'qtest_writel',
- '-wrap', 'qtest_writeq',
- '-wrap', 'qtest_memread',
- '-wrap', 'qtest_bufread',
- '-wrap', 'qtest_memwrite',
- '-wrap', 'qtest_bufwrite',
- '-wrap', 'qtest_memset']
+ '-Wl,-wrap,qtest_inb',
+ '-Wl,-wrap,qtest_inw',
+ '-Wl,-wrap,qtest_inl',
+ '-Wl,-wrap,qtest_outb',
+ '-Wl,-wrap,qtest_outw',
+ '-Wl,-wrap,qtest_outl',
+ '-Wl,-wrap,qtest_readb',
+ '-Wl,-wrap,qtest_readw',
+ '-Wl,-wrap,qtest_readl',
+ '-Wl,-wrap,qtest_readq',
+ '-Wl,-wrap,qtest_writeb',
+ '-Wl,-wrap,qtest_writew',
+ '-Wl,-wrap,qtest_writel',
+ '-Wl,-wrap,qtest_writeq',
+ '-Wl,-wrap,qtest_memread',
+ '-Wl,-wrap,qtest_bufread',
+ '-Wl,-wrap,qtest_memwrite',
+ '-Wl,-wrap,qtest_bufwrite',
+ '-Wl,-wrap,qtest_memset']
)
specific_fuzz_ss.add(fork_fuzz)
../tests/qtest/fuzz/qtest_wrappers.c:15:10: fatal error: 'cpu.h' file not found
#include "cpu.h"
How did we get away with that in the first place?
-----------------------------
diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c
index 713c830cdb..0580f8df86 100644
--- a/tests/qtest/fuzz/qtest_wrappers.c
+++ b/tests/qtest/fuzz/qtest_wrappers.c
@@ -12,7 +12,7 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
+#include "hw/core/cpu.h"
#include "exec/ioport.h"
#include "fuzz.h"
-----------------------------
Ok now:
Linking target qemu-fuzz-i386
clang: warning: argument unused during compilation: '-T tests/qtest/fuzz/fork_fuzz.ld' [-Wunused-command-line-argument]
/usr/bin/ld: libcommon.fa.p/softmmu_main.c.o: in function `main':
/tmp/qemu/build/../softmmu/main.c:47: multiple definition of `main'; /usr/lib/llvm-9/lib/clang/9.0.1/lib/linux/libclang_rt.fuzzer-x86_64.a(fuzzer.o):(.text.main+0x0): first defined here
/usr/bin/ld: /tmp/qemu/build/../tests/qtest/fuzz/fork_fuzz.c:22: undefined reference to `__FUZZ_COUNTERS_START'
We are _very_ close, but this is where I have no idea how to get meson
to do what I want. Two things:
1.) The flag for linking should be something like:
-Wl,-T$(SRC_PATH)/tests/qtest/fuzz/fork_fuzz.ld . Right now it is
-T./tests/qtest/fuzz/fork_fuzz.ld
2.) We should not be linking against softmmu_main.c.o
I ran with make -n and copied the last (linking step) command and
manually made these two changes. With that, I find a binary ./qemu-fuzz-i386
and when I run it, I see all the targets I expect to see.
But when I run one of the actual targets, I get:
./qemu-fuzz-i386 --fuzz-target=virtio-net-slirp -runs=1000
ERROR: no interesting inputs were found. Is the code instrumented for coverage? Exit
So it looks like the -fsanitize=fuzzer (or fsanitize=fuzzer-no-link)
flag doesn't get passed anywhere during compilation.. (Confirmed that by
checking make -n)
This feels very close. If I configure, with
CFLAGS="-fsanitize=fuzzer" , I'm up and running.
Thanks again. Once I know that I'm doing things right, I can work on
converting the oss-fuzz build script, so it works with meson.
-Alex
On 200806 2114, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> meson.build | 3 +
> tests/Makefile.include | 49 +---
> tests/meson.build | 1 +
> 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/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/fuzz.c | 2 +-
> tests/qtest/fuzz/fuzz.h | 2 +-
> tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
> tests/qtest/fuzz/qos_fuzz.c | 2 +-
> tests/qtest/fuzz/virtio_net_fuzz.c | 2 +-
> tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 +-
> 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 | 6 +-
> 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 | 254 +++++++++++++++++
> 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 | 2 +-
> 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/test-qga.c | 2 +-
> tests/test-qgraph.c | 5 +-
> 148 files changed, 539 insertions(+), 592 deletions(-)
> delete mode 100644 tests/qtest/Makefile.include
> rename tests/qtest/{ => libqos}/libqtest.h (100%)
> create mode 100644 tests/qtest/libqos/meson.build
> create mode 100644 tests/qtest/meson.build
>
> diff --git a/meson.build b/meson.build
> index 3daa82e..a81516a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -511,6 +511,9 @@ subdir('nbd')
> subdir('scsi')
> subdir('block')
>
> +# needed for fuzzing binaries
> +subdir('tests/qtest/libqos')
> +
> mods = []
> block_mods = []
> softmmu_mods = []
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index a0e5d3e..567ad69 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -109,6 +109,7 @@ check-unit-y += tests/test-qht$(EXESUF)
> check-unit-y += tests/test-qht-par$(EXESUF)
> check-unit-y += tests/test-bitops$(EXESUF)
> check-unit-y += tests/test-bitcnt$(EXESUF)
> +check-unit-y += tests/test-qgraph$(EXESUF)
> check-unit-y += tests/check-qom-interface$(EXESUF)
> check-unit-y += tests/check-qom-proplist$(EXESUF)
> check-unit-y += tests/test-qemu-opts$(EXESUF)
> @@ -306,19 +307,6 @@ tests/test-qapi-gen-timestamp: \
> @rm -f tests/test-qapi-doc.texi
> @>$@
>
> -tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-vmstate1-gen-timestamp ;
> -tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmstate1.xml
> - $(call quiet-command,$(GDBUS_CODEGEN) $< \
> - --interface-prefix org.qemu --generate-c-code tests/qtest/dbus-vmstate1, \
> - "GEN","$(@:%-timestamp=%)")
> - @>$@
> -
> -tests/qtest/dbus-vmstate-test.o-cflags := -DSRCDIR="$(SRC_PATH)"
> -tests/qtest/dbus-vmstate1.o-cflags := $(GIO_CFLAGS)
> -tests/qtest/dbus-vmstate1.o-libs := $(GIO_LIBS)
> -
> -tests/qtest/dbus-vmstate-test.o: tests/qtest/dbus-vmstate1.h
> -
> tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)
> tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y)
> tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) tests/test-qapi-emit-events.o tests/test-qapi-events.o
> @@ -333,6 +321,7 @@ tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y)
> tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y)
> tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y)
> tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y)
> +tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.o $(test-util-obj-y)
> tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y)
> tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y)
> tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y)
> @@ -396,10 +385,8 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
> rm $(INITRD_WORK_DIR)/init
> rmdir $(INITRD_WORK_DIR)
>
> -include $(SRC_PATH)/tests/qtest/Makefile.include
> -
> tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF)
> -tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
> +tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-util-obj-y)
> tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
> tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
>
> @@ -440,16 +427,6 @@ define do_test_tap
> "TAP","$@")
> endef
>
> -.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
> -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y)
> - $(call do_test_human,$(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
> - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> - QTEST_QEMU_IMG=qemu-img$(EXESUF))
> -
> -build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS)) $(check-qtest-y)
> -
> -build-unit: $(check-unit-y)
> -
> check-unit: $(check-unit-y)
> $(call do_test_human, $^)
>
> @@ -458,18 +435,9 @@ check-speed: $(check-speed-y)
>
> # gtester tests with TAP output
>
> -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y)
> - $(call do_test_tap, $(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
> - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> - QTEST_QEMU_IMG=qemu-img$(EXESUF))
> -
> check-report-unit.tap: $(check-unit-y)
> $(call do_test_tap,$^)
>
> -# Reports and overall runs
> -
> -check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
> -
> # Plugins
> ifeq ($(CONFIG_PLUGIN),y)
> .PHONY: plugins
> @@ -582,19 +550,16 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
>
> # Consolidated targets
>
> -.PHONY: check-block check-qtest check-unit check check-clean get-vm-images
> -check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
> +.PHONY: check-block check-unit check check-clean get-vm-images
> ifeq ($(CONFIG_TOOLS),y)
> check-block: $(patsubst %,check-%, $(check-block-y))
> endif
> -check-build: build-unit build-qtest
> +check-build: build-unit
>
> -check: check-block check-unit check-qtest
> +check: check-block check-unit
> check-clean:
> rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
> - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
> rm -f tests/test-qapi-gen-timestamp
> - rm -f tests/qtest/dbus-vmstate1-gen-timestamp
> rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
>
> check: check-block check-qapi-schema check-unit check-qtest check-decodetree
> @@ -606,7 +571,5 @@ clean: check-clean
> all: $(QEMU_IOTESTS_HELPERS-y)
>
> -include $(wildcard tests/*.d)
> --include $(wildcard tests/qtest/*.d)
> --include $(wildcard tests/qtest/libqos/*.d)
>
> endif
> diff --git a/tests/meson.build b/tests/meson.build
> index 8be9c22..d724402 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -8,3 +8,4 @@ if 'CONFIG_TCG' in config_host
> endif
>
> subdir('qapi-schema')
> +subdir('qtest')
> diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
> deleted file mode 100644
> index b0204e4..0000000
> --- a/tests/qtest/Makefile.include
> +++ /dev/null
> @@ -1,332 +0,0 @@
> -# All QTests for now are POSIX-only, but the dependencies are
> -# really in libqtest, not in the testcases themselves.
> -
> -check-qtest-generic-y += cdrom-test
> -check-qtest-generic-y += device-introspect-test
> -check-qtest-generic-y += machine-none-test
> -check-qtest-generic-y += qmp-test
> -check-qtest-generic-y += qmp-cmd-test
> -check-qtest-generic-y += qom-test
> -check-qtest-generic-$(CONFIG_MODULES) += modules-test
> -check-qtest-generic-y += test-hmp
> -
> -check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test
> -check-qtest-pci-$(CONFIG_VGA) += display-vga-test
> -check-qtest-pci-$(CONFIG_HDA) += intel-hda-test
> -check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
> -
> -DBUS_DAEMON := $(shell which dbus-daemon 2>/dev/null)
> -ifneq ($(GDBUS_CODEGEN),)
> -ifneq ($(DBUS_DAEMON),)
> -# Temporarily disabled due to Patchew failures:
> -#check-qtest-pci-$(CONFIG_GIO) += dbus-vmstate-test
> -endif
> -endif
> -
> -check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-i386-y += fdc-test
> -check-qtest-i386-y += ide-test
> -check-qtest-i386-$(CONFIG_TOOLS) += ahci-test
> -check-qtest-i386-y += hd-geo-test
> -check-qtest-i386-y += boot-order-test
> -check-qtest-i386-y += bios-tables-test
> -check-qtest-i386-$(CONFIG_SGA) += boot-serial-test
> -check-qtest-i386-$(CONFIG_SLIRP) += pxe-test
> -check-qtest-i386-y += rtc-test
> -check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += ipmi-kcs-test
> -ifdef CONFIG_LINUX
> -check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += ipmi-bt-test
> -endif
> -check-qtest-i386-y += i440fx-test
> -check-qtest-i386-y += fw_cfg-test
> -check-qtest-i386-y += device-plug-test
> -check-qtest-i386-y += drive_del-test
> -check-qtest-i386-$(CONFIG_WDT_IB700) += wdt_ib700-test
> -check-qtest-i386-y += tco-test
> -check-qtest-i386-y += $(check-qtest-pci-y)
> -check-qtest-i386-$(CONFIG_PVPANIC) += pvpanic-test
> -check-qtest-i386-$(CONFIG_I82801B11) += i82801b11-test
> -check-qtest-i386-$(CONFIG_IOH3420) += ioh3420-test
> -check-qtest-i386-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
> -check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += usb-hcd-ehci-test
> -check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
> -check-qtest-i386-y += cpu-plug-test
> -check-qtest-i386-y += q35-test
> -check-qtest-i386-y += vmgenid-test
> -check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
> -check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
> -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
> -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
> -check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
> -check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
> -check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
> -check-qtest-i386-y += migration-test
> -check-qtest-i386-y += test-x86-cpuid-compat
> -check-qtest-i386-y += numa-test
> -
> -check-qtest-x86_64-y += $(check-qtest-i386-y)
> -
> -check-qtest-avr-y += boot-serial-test
> -
> -check-qtest-alpha-y += boot-serial-test
> -check-qtest-alpha-$(CONFIG_VGA) += display-vga-test
> -
> -check-qtest-hppa-y += boot-serial-test
> -check-qtest-hppa-$(CONFIG_VGA) += display-vga-test
> -
> -check-qtest-m68k-y = boot-serial-test
> -
> -check-qtest-microblaze-y += boot-serial-test
> -
> -check-qtest-mips-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-mips-$(CONFIG_VGA) += display-vga-test
> -
> -check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-mips64-$(CONFIG_VGA) += display-vga-test
> -
> -check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-mips64el-$(CONFIG_VGA) += display-vga-test
> -
> -check-qtest-moxie-y += boot-serial-test
> -
> -check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-ppc-y += boot-order-test
> -check-qtest-ppc-y += prom-env-test
> -check-qtest-ppc-y += drive_del-test
> -check-qtest-ppc-y += boot-serial-test
> -check-qtest-ppc-$(CONFIG_M48T59) += m48t59-test
> -
> -check-qtest-ppc64-y += $(check-qtest-ppc-y)
> -check-qtest-ppc64-$(CONFIG_PSERIES) += device-plug-test
> -check-qtest-ppc64-$(CONFIG_POWERNV) += pnv-xscom-test
> -check-qtest-ppc64-y += migration-test
> -check-qtest-ppc64-$(CONFIG_PSERIES) += rtas-test
> -check-qtest-ppc64-$(CONFIG_SLIRP) += pxe-test
> -check-qtest-ppc64-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
> -check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
> -check-qtest-ppc64-$(CONFIG_SLIRP) += test-netfilter
> -check-qtest-ppc64-$(CONFIG_POSIX) += test-filter-mirror
> -check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += test-filter-redirector
> -check-qtest-ppc64-$(CONFIG_VGA) += display-vga-test
> -check-qtest-ppc64-y += numa-test
> -check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
> -check-qtest-ppc64-y += cpu-plug-test
> -
> -check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = endianness-test
> -
> -check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = endianness-test
> -
> -check-qtest-sparc-y += prom-env-test
> -check-qtest-sparc-y += m48t59-test
> -check-qtest-sparc-y += boot-serial-test
> -
> -check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = endianness-test
> -check-qtest-sparc64-y += prom-env-test
> -check-qtest-sparc64-y += boot-serial-test
> -
> -check-qtest-arm-y += arm-cpu-features
> -check-qtest-arm-y += microbit-test
> -check-qtest-arm-y += m25p80-test
> -check-qtest-arm-y += test-arm-mptimer
> -check-qtest-arm-y += boot-serial-test
> -check-qtest-arm-y += hexloader-test
> -check-qtest-arm-$(CONFIG_PFLASH_CFI02) += pflash-cfi02-test
> -
> -check-qtest-aarch64-y += arm-cpu-features
> -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-test
> -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-swtpm-test
> -check-qtest-aarch64-y += numa-test
> -check-qtest-aarch64-y += boot-serial-test
> -check-qtest-aarch64-y += migration-test
> -
> -# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional
> -ifneq ($(ARCH),arm)
> -check-qtest-aarch64-y += bios-tables-test
> -endif
> -
> -check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> -
> -check-qtest-xtensaeb-y += $(check-qtest-xtensa-y)
> -
> -check-qtest-s390x-y = boot-serial-test
> -check-qtest-s390x-$(CONFIG_SLIRP) += pxe-test
> -check-qtest-s390x-$(CONFIG_SLIRP) += test-netfilter
> -check-qtest-s390x-$(CONFIG_POSIX) += test-filter-mirror
> -check-qtest-s390x-$(CONFIG_POSIX) += test-filter-redirector
> -check-qtest-s390x-y += drive_del-test
> -check-qtest-s390x-y += device-plug-test
> -check-qtest-s390x-y += virtio-ccw-test
> -check-qtest-s390x-y += cpu-plug-test
> -check-qtest-s390x-y += migration-test
> -
> -# libqos / qgraph :
> -libqgraph-obj-y = tests/qtest/libqos/qgraph.o
> -
> -libqos-core-obj-y = $(libqgraph-obj-y) tests/qtest/libqos/pci.o tests/qtest/libqos/fw_cfg.o
> -libqos-core-obj-y += tests/qtest/libqos/malloc.o
> -libqos-core-obj-y += tests/qtest/libqos/libqos.o
> -libqos-spapr-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/malloc-spapr.o
> -libqos-spapr-obj-y += tests/qtest/libqos/libqos-spapr.o
> -libqos-spapr-obj-y += tests/qtest/libqos/rtas.o
> -libqos-spapr-obj-y += tests/qtest/libqos/pci-spapr.o
> -libqos-pc-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/pci-pc.o
> -libqos-pc-obj-y += tests/qtest/libqos/malloc-pc.o tests/qtest/libqos/libqos-pc.o
> -libqos-pc-obj-y += tests/qtest/libqos/ahci.o
> -libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/qtest/libqos/usb.o
> -
> -# qos devices:
> -libqos-obj-y = $(libqgraph-obj-y)
> -libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> -libqos-obj-y += tests/qtest/libqos/qos_external.o
> -libqos-obj-y += tests/qtest/libqos/e1000e.o
> -libqos-obj-y += tests/qtest/libqos/i2c.o
> -libqos-obj-y += tests/qtest/libqos/i2c-imx.o
> -libqos-obj-y += tests/qtest/libqos/i2c-omap.o
> -libqos-obj-y += tests/qtest/libqos/sdhci.o
> -libqos-obj-y += tests/qtest/libqos/tpci200.o
> -libqos-obj-y += tests/qtest/libqos/virtio.o
> -libqos-obj-$(CONFIG_VIRTFS) += tests/qtest/libqos/virtio-9p.o
> -libqos-obj-y += tests/qtest/libqos/virtio-balloon.o
> -libqos-obj-y += tests/qtest/libqos/virtio-blk.o
> -libqos-obj-y += tests/qtest/libqos/virtio-mmio.o
> -libqos-obj-y += tests/qtest/libqos/virtio-net.o
> -libqos-obj-y += tests/qtest/libqos/virtio-pci.o
> -libqos-obj-y += tests/qtest/libqos/virtio-pci-modern.o
> -libqos-obj-y += tests/qtest/libqos/virtio-rng.o
> -libqos-obj-y += tests/qtest/libqos/virtio-scsi.o
> -libqos-obj-y += tests/qtest/libqos/virtio-serial.o
> -
> -# qos machines:
> -libqos-obj-y += tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-imx25-pdk-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-n800-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-raspi2-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-sabrelite-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-smdkc210-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-virt-machine.o
> -libqos-obj-y += tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o
> -libqos-obj-y += tests/qtest/libqos/ppc64_pseries-machine.o
> -libqos-obj-y += tests/qtest/libqos/x86_64_pc-machine.o
> -
> -# qos tests:
> -qos-test-obj-y += tests/qtest/qos-test.o
> -qos-test-obj-y += tests/qtest/ac97-test.o
> -qos-test-obj-y += tests/qtest/ds1338-test.o
> -qos-test-obj-y += tests/qtest/e1000-test.o
> -qos-test-obj-y += tests/qtest/e1000e-test.o
> -qos-test-obj-y += tests/qtest/eepro100-test.o
> -qos-test-obj-y += tests/qtest/es1370-test.o
> -qos-test-obj-y += tests/qtest/ipoctal232-test.o
> -qos-test-obj-y += tests/qtest/megasas-test.o
> -qos-test-obj-y += tests/qtest/ne2000-test.o
> -qos-test-obj-y += tests/qtest/tulip-test.o
> -qos-test-obj-y += tests/qtest/nvme-test.o
> -qos-test-obj-y += tests/qtest/pca9552-test.o
> -qos-test-obj-y += tests/qtest/pci-test.o
> -qos-test-obj-y += tests/qtest/pcnet-test.o
> -qos-test-obj-y += tests/qtest/sdhci-test.o
> -qos-test-obj-y += tests/qtest/spapr-phb-test.o
> -qos-test-obj-y += tests/qtest/tmp105-test.o
> -qos-test-obj-y += tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
> -qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)
> -qos-test-obj-y += tests/qtest/virtio-test.o
> -qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o
> -qos-test-obj-y += tests/qtest/virtio-blk-test.o
> -qos-test-obj-y += tests/qtest/virtio-net-test.o
> -qos-test-obj-y += tests/qtest/virtio-rng-test.o
> -qos-test-obj-y += tests/qtest/virtio-scsi-test.o
> -qos-test-obj-y += tests/qtest/virtio-serial-test.o
> -qos-test-obj-y += tests/qtest/vmxnet3-test.o
> -
> -check-unit-y += tests/test-qgraph$(EXESUF)
> -tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)
> -
> -check-qtest-generic-y += qos-test
> -tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y)
> -
> -# QTest dependencies:
> -tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o
> -tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o
> -tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect-test.o
> -tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o
> -tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o
> -tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o
> -tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o
> -tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o
> -tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-obj-y)
> -tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj-y)
> -tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o
> -tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y)
> -tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
> -tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o
> -tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o
> -tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o $(libqos-obj-y)
> -tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libqos-obj-y)
> -tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(libqos-obj-y)
> -tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \
> - tests/qtest/tpm-emu.o $(test-io-obj-y) \
> - tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y)
> -tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
> -tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o
> -tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o
> -tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-obj-y)
> -tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y)
> -tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-obj-y)
> -tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-obj-y)
> -tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o
> -tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o
> -tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y)
> -tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o
> -tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o
> -tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o
> -tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o
> -tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o
> -tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o
> -tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
> -tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o
> -tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o
> -tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o
> -tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o
> -tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o
> -tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
> -tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
> -tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
> -tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o
> -tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o tests/qtest/migration-helpers.o
> -tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-obj-y)
> -tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o $(qtest-obj-y)
> -tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.o $(qtest-obj-y)
> -tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
> -tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> -tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> -tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
> -tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
> -tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
> -tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
> -tests/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o
> -tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o tests/qtest/tpm-emu.o \
> - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> -tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/tpm-emu.o $(test-io-obj-y)
> -tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \
> - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> -tests/qtest/tpm-tis-device-swtpm-test$(EXESUF): tests/qtest/tpm-tis-device-swtpm-test.o tests/qtest/tpm-emu.o \
> - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> -tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
> -tests/qtest/tpm-tis-device-test$(EXESUF): tests/qtest/tpm-tis-device-test.o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
> -
> -# QTest rules
> -
> -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
> -QTEST_TARGETS =
> -# The qtests are not runnable (yet) under TSan due to a known issue.
> -# https://github.com/google/sanitizers/issues/1116
> -ifndef CONFIG_TSAN
> -ifeq ($(CONFIG_POSIX),y)
> -QTEST_TARGETS = $(TARGETS)
> -check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/qtest/%$(EXESUF)))
> -check-qtest-y += $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF))
> -endif
> -endif
> -
> -qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y)
> -$(check-qtest-y): $(qtest-obj-y)
> diff --git a/tests/qtest/ac97-test.c b/tests/qtest/ac97-test.c
> index b084e31..e09f249 100644
> --- a/tests/qtest/ac97-test.c
> +++ b/tests/qtest/ac97-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/acpi-utils.h b/tests/qtest/acpi-utils.h
> index 0c86780..261784d 100644
> --- a/tests/qtest/acpi-utils.h
> +++ b/tests/qtest/acpi-utils.h
> @@ -13,7 +13,7 @@
> #ifndef TEST_ACPI_UTILS_H
> #define TEST_ACPI_UTILS_H
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> /* DSDT and SSDTs format */
> typedef struct {
> diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> index c8d42ce..ca4294f 100644
> --- a/tests/qtest/ahci-test.c
> +++ b/tests/qtest/ahci-test.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include <getopt.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/libqos-pc.h"
> #include "libqos/ahci.h"
> #include "libqos/pci-pc.h"
> diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
> index f7e062c..77b5e30 100644
> --- a/tests/qtest/arm-cpu-features.c
> +++ b/tests/qtest/arm-cpu-features.c
> @@ -10,7 +10,7 @@
> */
> #include "qemu/osdep.h"
> #include "qemu/bitops.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qjson.h"
>
> diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c
> index 2f1c072..fac580d 100644
> --- a/tests/qtest/boot-order-test.c
> +++ b/tests/qtest/boot-order-test.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "libqos/fw_cfg.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index 9e66c6d..24df5c4 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include "boot-sector.h"
> #include "qemu-common.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> #define LOW(x) ((x) & 0xff)
> #define HIGH(x) ((x) >> 8)
> diff --git a/tests/qtest/boot-sector.h b/tests/qtest/boot-sector.h
> index 6ee6bb4..b339fde 100644
> --- a/tests/qtest/boot-sector.h
> +++ b/tests/qtest/boot-sector.h
> @@ -14,7 +14,7 @@
> #ifndef TEST_BOOT_SECTOR_H
> #define TEST_BOOT_SECTOR_H
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> /* Create boot disk file. fname must be a suitable string for mkstemp() */
> int boot_sector_init(char *fname);
> diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
> index bfe7624..b6b1c23 100644
> --- a/tests/qtest/boot-serial-test.c
> +++ b/tests/qtest/boot-serial-test.c
> @@ -14,7 +14,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/libqos-spapr.h"
>
> static const uint8_t bios_avr[] = {
> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
> index 833a050..e9afab6 100644
> --- a/tests/qtest/cdrom-test.c
> +++ b/tests/qtest/cdrom-test.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "qapi/qmp/qdict.h"
>
> diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c
> index 2e5e47d..aca9b98 100644
> --- a/tests/qtest/dbus-vmstate-test.c
> +++ b/tests/qtest/dbus-vmstate-test.c
> @@ -1,7 +1,7 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> #include <gio/gio.h>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu-common.h"
> #include "dbus-vmstate1.h"
> #include "migration-helpers.h"
> diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c
> index d68b785..9f22340 100644
> --- a/tests/qtest/device-introspect-test.c
> +++ b/tests/qtest/device-introspect-test.c
> @@ -22,7 +22,7 @@
> #include "qapi/qmp/qstring.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> const char common_args[] = "-nodefaults -machine none";
>
> diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c
> index 318e422..9214892 100644
> --- a/tests/qtest/device-plug-test.c
> +++ b/tests/qtest/device-plug-test.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qstring.h"
>
> diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c
> index 5f8839b..2ab11ad 100644
> --- a/tests/qtest/drive_del-test.c
> +++ b/tests/qtest/drive_del-test.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/virtio.h"
> #include "qapi/qmp/qdict.h"
>
> diff --git a/tests/qtest/ds1338-test.c b/tests/qtest/ds1338-test.c
> index f6ade9a..c5d46bc 100644
> --- a/tests/qtest/ds1338-test.c
> +++ b/tests/qtest/ds1338-test.c
> @@ -18,7 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/i2c.h"
>
> #define DS1338_ADDR 0x68
> diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c
> index c387984..ea286d1 100644
> --- a/tests/qtest/e1000-test.c
> +++ b/tests/qtest/e1000-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/eepro100-test.c b/tests/qtest/eepro100-test.c
> index 8dbffff..d72ad09 100644
> --- a/tests/qtest/eepro100-test.c
> +++ b/tests/qtest/eepro100-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c
> index cc088ac..4e79e22 100644
> --- a/tests/qtest/endianness-test.c
> +++ b/tests/qtest/endianness-test.c
> @@ -13,7 +13,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/bswap.h"
>
> typedef struct TestCase TestCase;
> diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c
> index adccdac..2fd7fd2 100644
> --- a/tests/qtest/es1370-test.c
> +++ b/tests/qtest/es1370-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
> index 031594a..1ceea84 100644
> --- a/tests/qtest/fuzz/fuzz.c
> +++ b/tests/qtest/fuzz/fuzz.c
> @@ -20,7 +20,7 @@
> #include "sysemu/sysemu.h"
> #include "qemu/main-loop.h"
> #include "qemu/rcu.h"
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
> #include "tests/qtest/libqos/qgraph.h"
> #include "fuzz.h"
>
> diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h
> index 9ca3d10..8eb765e 100644
> --- a/tests/qtest/fuzz/fuzz.h
> +++ b/tests/qtest/fuzz/fuzz.h
> @@ -18,7 +18,7 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
>
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
>
> /**
> * A libfuzzer fuzzing target
> diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
> index bf966d4..f45373f 100644
> --- a/tests/qtest/fuzz/i440fx_fuzz.c
> +++ b/tests/qtest/fuzz/i440fx_fuzz.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
>
> #include "qemu/main-loop.h"
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
> #include "tests/qtest/libqos/pci.h"
> #include "tests/qtest/libqos/pci-pc.h"
> #include "fuzz.h"
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index d52f3eb..b943577 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -25,7 +25,7 @@
> #include "sysemu/sysemu.h"
> #include "qemu/main-loop.h"
>
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
> #include "tests/qtest/libqos/malloc.h"
> #include "tests/qtest/libqos/qgraph.h"
> #include "tests/qtest/libqos/qgraph_internal.h"
> diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_net_fuzz.c
> index a33bd73..277a9e2 100644
> --- a/tests/qtest/fuzz/virtio_net_fuzz.c
> +++ b/tests/qtest/fuzz/virtio_net_fuzz.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
>
> #include "standard-headers/linux/virtio_config.h"
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
> #include "tests/qtest/libqos/virtio-net.h"
> #include "fuzz.h"
> #include "fork_fuzz.h"
> diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> index 3a9ea13..977ac42 100644
> --- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
> +++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "tests/qtest/libqtest.h"
> +#include "tests/qtest/libqos/libqtest.h"
> #include "libqos/virtio-scsi.h"
> #include "libqos/virtio.h"
> #include "libqos/virtio-pci.h"
> diff --git a/tests/qtest/fw_cfg-test.c b/tests/qtest/fw_cfg-test.c
> index 5dc807b..95b3907 100644
> --- a/tests/qtest/fw_cfg-test.c
> +++ b/tests/qtest/fw_cfg-test.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "standard-headers/linux/qemu_fw_cfg.h"
> #include "libqos/fw_cfg.h"
> #include "qemu/bswap.h"
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index 48e8e02..f7b7cfb 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -19,7 +19,7 @@
> #include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "qapi/qmp/qlist.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/fw_cfg.h"
> #include "libqos/libqos.h"
> #include "standard-headers/linux/qemu_fw_cfg.h"
> diff --git a/tests/qtest/hexloader-test.c b/tests/qtest/hexloader-test.c
> index 8b7aa2d..5615020 100644
> --- a/tests/qtest/hexloader-test.c
> +++ b/tests/qtest/hexloader-test.c
> @@ -10,7 +10,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> /* Load 'test.hex' and verify that the in-memory contents are as expected.
> * 'test.hex' is a memory test pattern stored in Hexadecimal Object
> diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> index 5cfd97f..3f8081e 100644
> --- a/tests/qtest/ide-test.c
> +++ b/tests/qtest/ide-test.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/libqos.h"
> #include "libqos/pci-pc.h"
> #include "libqos/malloc-pc.h"
> diff --git a/tests/qtest/ipoctal232-test.c b/tests/qtest/ipoctal232-test.c
> index 53a8c9b..65ce10b 100644
> --- a/tests/qtest/ipoctal232-test.c
> +++ b/tests/qtest/ipoctal232-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
>
> diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> index ecda256..d5c8b9f 100644
> --- a/tests/qtest/ivshmem-test.c
> +++ b/tests/qtest/ivshmem-test.c
> @@ -13,7 +13,7 @@
> #include "contrib/ivshmem-server/ivshmem-server.h"
> #include "libqos/libqos-pc.h"
> #include "libqos/libqos-spapr.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu-common.h"
>
> #define TMPSHMSIZE (1 << 20)
> diff --git a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> index 8f827ae..79631cc 100644
> --- a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> +++ b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "sdhci.h"
>
> typedef struct QXlnxZCU102Machine QXlnxZCU102Machine;
> diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> index cc1b08e..2946abc 100644
> --- a/tests/qtest/libqos/ahci.c
> +++ b/tests/qtest/libqos/ahci.c
> @@ -25,8 +25,8 @@
> #include "qemu/osdep.h"
>
> #include "libqtest.h"
> -#include "libqos/ahci.h"
> -#include "libqos/pci-pc.h"
> +#include "ahci.h"
> +#include "pci-pc.h"
>
> #include "qemu-common.h"
> #include "qemu/host-utils.h"
> @@ -579,7 +579,7 @@ void ahci_write_fis(AHCIQState *ahci, AHCICommand *cmd)
> /* NCQ commands use exclusively 8 bit fields and needs no adjustment.
> * Only the count field needs to be adjusted for non-NCQ commands.
> * The auxiliary FIS fields are defined per-command and are not currently
> - * implemented in libqos/ahci.o, but may or may not need to be flipped. */
> + * implemented in ahci.o, but may or may not need to be flipped. */
> if (!cmd->props->ncq) {
> tmp.count = cpu_to_le16(tmp.count);
> }
> diff --git a/tests/qtest/libqos/ahci.h b/tests/qtest/libqos/ahci.h
> index 44ab110..88835b6 100644
> --- a/tests/qtest/libqos/ahci.h
> +++ b/tests/qtest/libqos/ahci.h
> @@ -25,9 +25,9 @@
> * THE SOFTWARE.
> */
>
> -#include "libqos/libqos.h"
> -#include "libqos/pci.h"
> -#include "libqos/malloc-pc.h"
> +#include "libqos.h"
> +#include "pci.h"
> +#include "malloc-pc.h"
>
> /*** Supplementary PCI Config Space IDs & Masks ***/
> #define PCI_DEVICE_ID_INTEL_Q35_AHCI (0x2922)
> diff --git a/tests/qtest/libqos/arm-imx25-pdk-machine.c b/tests/qtest/libqos/arm-imx25-pdk-machine.c
> index 0da3f19..6692adf 100644
> --- a/tests/qtest/libqos/arm-imx25-pdk-machine.c
> +++ b/tests/qtest/libqos/arm-imx25-pdk-machine.c
> @@ -20,9 +20,9 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/i2c.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> +#include "i2c.h"
>
> #define ARM_PAGE_SIZE 4096
> #define IMX25_PDK_RAM_START 0x80000000
> diff --git a/tests/qtest/libqos/arm-n800-machine.c b/tests/qtest/libqos/arm-n800-machine.c
> index 35f8207..ff2049c 100644
> --- a/tests/qtest/libqos/arm-n800-machine.c
> +++ b/tests/qtest/libqos/arm-n800-machine.c
> @@ -20,9 +20,9 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/i2c.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> +#include "i2c.h"
>
> #define ARM_PAGE_SIZE 4096
> #define N800_RAM_START 0x80000000
> diff --git a/tests/qtest/libqos/arm-raspi2-machine.c b/tests/qtest/libqos/arm-raspi2-machine.c
> index 8480d80..35bb470 100644
> --- a/tests/qtest/libqos/arm-raspi2-machine.c
> +++ b/tests/qtest/libqos/arm-raspi2-machine.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "sdhci.h"
>
> #define ARM_PAGE_SIZE 4096
> diff --git a/tests/qtest/libqos/arm-sabrelite-machine.c b/tests/qtest/libqos/arm-sabrelite-machine.c
> index f6e403b..72425f0 100644
> --- a/tests/qtest/libqos/arm-sabrelite-machine.c
> +++ b/tests/qtest/libqos/arm-sabrelite-machine.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "sdhci.h"
>
> #define ARM_PAGE_SIZE 4096
> diff --git a/tests/qtest/libqos/arm-smdkc210-machine.c b/tests/qtest/libqos/arm-smdkc210-machine.c
> index eebac7f..321b882 100644
> --- a/tests/qtest/libqos/arm-smdkc210-machine.c
> +++ b/tests/qtest/libqos/arm-smdkc210-machine.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "sdhci.h"
>
> #define ARM_PAGE_SIZE 4096
> diff --git a/tests/qtest/libqos/arm-virt-machine.c b/tests/qtest/libqos/arm-virt-machine.c
> index 9316598..e0f5932 100644
> --- a/tests/qtest/libqos/arm-virt-machine.c
> +++ b/tests/qtest/libqos/arm-virt-machine.c
> @@ -19,9 +19,9 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-mmio.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> +#include "virtio-mmio.h"
>
> #define ARM_PAGE_SIZE 4096
> #define VIRTIO_MMIO_BASE_ADDR 0x0A003E00
> diff --git a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> index 473acce..56e53c7 100644
> --- a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> +++ b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "sdhci.h"
>
> typedef struct QXilinxZynqA9Machine QXilinxZynqA9Machine;
> diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c
> index e2927ed..a451f61 100644
> --- a/tests/qtest/libqos/e1000e.c
> +++ b/tests/qtest/libqos/e1000e.c
> @@ -18,13 +18,13 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/pci-pc.h"
> +#include "pci-pc.h"
> #include "qemu/sockets.h"
> #include "qemu/iov.h"
> #include "qemu/module.h"
> #include "qemu/bitops.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "e1000e.h"
>
> #define E1000E_IMS (0x00d0)
> diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h
> index 35183b2..a22f5fd 100644
> --- a/tests/qtest/libqos/e1000e.h
> +++ b/tests/qtest/libqos/e1000e.h
> @@ -19,7 +19,7 @@
> #ifndef QGRAPH_E1000E_H
> #define QGRAPH_E1000E_H
>
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
> #include "pci.h"
>
> #define E1000E_RX0_MSG_ID (0)
> diff --git a/tests/qtest/libqos/fw_cfg.c b/tests/qtest/libqos/fw_cfg.c
> index 1f46258..6b8e1ba 100644
> --- a/tests/qtest/libqos/fw_cfg.c
> +++ b/tests/qtest/libqos/fw_cfg.c
> @@ -13,7 +13,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/fw_cfg.h"
> +#include "fw_cfg.h"
> #include "libqtest.h"
> #include "qemu/bswap.h"
> #include "hw/nvram/fw_cfg.h"
> diff --git a/tests/qtest/libqos/i2c-imx.c b/tests/qtest/libqos/i2c-imx.c
> index f33ece5..8f9a7e3 100644
> --- a/tests/qtest/libqos/i2c-imx.c
> +++ b/tests/qtest/libqos/i2c-imx.c
> @@ -18,7 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/i2c.h"
> +#include "i2c.h"
>
>
> #include "libqtest.h"
> diff --git a/tests/qtest/libqos/i2c-omap.c b/tests/qtest/libqos/i2c-omap.c
> index 9ae8214..eb4e453 100644
> --- a/tests/qtest/libqos/i2c-omap.c
> +++ b/tests/qtest/libqos/i2c-omap.c
> @@ -7,7 +7,7 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "libqos/i2c.h"
> +#include "i2c.h"
>
>
> #include "qemu/bswap.h"
> diff --git a/tests/qtest/libqos/i2c.c b/tests/qtest/libqos/i2c.c
> index 38f800d..ade1bdb 100644
> --- a/tests/qtest/libqos/i2c.c
> +++ b/tests/qtest/libqos/i2c.c
> @@ -7,7 +7,7 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "libqos/i2c.h"
> +#include "i2c.h"
> #include "libqtest.h"
>
> void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
> diff --git a/tests/qtest/libqos/i2c.h b/tests/qtest/libqos/i2c.h
> index c65f087..1341bac 100644
> --- a/tests/qtest/libqos/i2c.h
> +++ b/tests/qtest/libqos/i2c.h
> @@ -10,7 +10,7 @@
> #define LIBQOS_I2C_H
>
> #include "libqtest.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
>
> typedef struct I2CAdapter I2CAdapter;
> struct I2CAdapter {
> diff --git a/tests/qtest/libqos/libqos-pc.c b/tests/qtest/libqos/libqos-pc.c
> index d04abc5..db420a5 100644
> --- a/tests/qtest/libqos/libqos-pc.c
> +++ b/tests/qtest/libqos/libqos-pc.c
> @@ -1,7 +1,7 @@
> #include "qemu/osdep.h"
> -#include "libqos/libqos-pc.h"
> -#include "libqos/malloc-pc.h"
> -#include "libqos/pci-pc.h"
> +#include "libqos-pc.h"
> +#include "malloc-pc.h"
> +#include "pci-pc.h"
>
> static QOSOps qos_ops = {
> .alloc_init = pc_alloc_init,
> diff --git a/tests/qtest/libqos/libqos-pc.h b/tests/qtest/libqos/libqos-pc.h
> index a0e4c45..1a9923e 100644
> --- a/tests/qtest/libqos/libqos-pc.h
> +++ b/tests/qtest/libqos/libqos-pc.h
> @@ -1,7 +1,7 @@
> #ifndef LIBQOS_PC_H
> #define LIBQOS_PC_H
>
> -#include "libqos/libqos.h"
> +#include "libqos.h"
>
> QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap);
> QOSState *qtest_pc_boot(const char *cmdline_fmt, ...);
> diff --git a/tests/qtest/libqos/libqos-spapr.c b/tests/qtest/libqos/libqos-spapr.c
> index 8766d54..db0e87b 100644
> --- a/tests/qtest/libqos/libqos-spapr.c
> +++ b/tests/qtest/libqos/libqos-spapr.c
> @@ -1,7 +1,7 @@
> #include "qemu/osdep.h"
> -#include "libqos/libqos-spapr.h"
> -#include "libqos/malloc-spapr.h"
> -#include "libqos/pci-spapr.h"
> +#include "libqos-spapr.h"
> +#include "malloc-spapr.h"
> +#include "pci-spapr.h"
>
> static QOSOps qos_ops = {
> .alloc_init = spapr_alloc_init,
> diff --git a/tests/qtest/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-spapr.h
> index 49bd72d..c613389 100644
> --- a/tests/qtest/libqos/libqos-spapr.h
> +++ b/tests/qtest/libqos/libqos-spapr.h
> @@ -1,7 +1,7 @@
> #ifndef LIBQOS_SPAPR_H
> #define LIBQOS_SPAPR_H
>
> -#include "libqos/libqos.h"
> +#include "libqos.h"
>
> QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap);
> QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...);
> diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c
> index f229eb2..2251e86 100644
> --- a/tests/qtest/libqos/libqos.c
> +++ b/tests/qtest/libqos/libqos.c
> @@ -2,8 +2,8 @@
> #include <sys/wait.h>
>
> #include "libqtest.h"
> -#include "libqos/libqos.h"
> -#include "libqos/pci.h"
> +#include "libqos.h"
> +#include "pci.h"
> #include "qapi/qmp/qdict.h"
>
> /*** Test Setup & Teardown ***/
> diff --git a/tests/qtest/libqos/libqos.h b/tests/qtest/libqos/libqos.h
> index 8e971c2..e0b2bfe 100644
> --- a/tests/qtest/libqos/libqos.h
> +++ b/tests/qtest/libqos/libqos.h
> @@ -2,8 +2,8 @@
> #define LIBQOS_H
>
> #include "libqtest.h"
> -#include "libqos/pci.h"
> -#include "libqos/malloc.h"
> +#include "pci.h"
> +#include "malloc.h"
>
> typedef struct QOSState QOSState;
>
> diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqos/libqtest.h
> similarity index 100%
> rename from tests/qtest/libqtest.h
> rename to tests/qtest/libqos/libqtest.h
> diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c
> index 6f92ce4..16ff960 100644
> --- a/tests/qtest/libqos/malloc-pc.c
> +++ b/tests/qtest/libqos/malloc-pc.c
> @@ -11,8 +11,8 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/malloc-pc.h"
> -#include "libqos/fw_cfg.h"
> +#include "malloc-pc.h"
> +#include "fw_cfg.h"
>
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> diff --git a/tests/qtest/libqos/malloc-pc.h b/tests/qtest/libqos/malloc-pc.h
> index 21e75ae..d8d7985 100644
> --- a/tests/qtest/libqos/malloc-pc.h
> +++ b/tests/qtest/libqos/malloc-pc.h
> @@ -13,7 +13,7 @@
> #ifndef LIBQOS_MALLOC_PC_H
> #define LIBQOS_MALLOC_PC_H
>
> -#include "libqos/malloc.h"
> +#include "malloc.h"
>
> void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags);
>
> diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-spapr.c
> index 2a6b7e3..84862e4 100644
> --- a/tests/qtest/libqos/malloc-spapr.c
> +++ b/tests/qtest/libqos/malloc-spapr.c
> @@ -6,7 +6,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/malloc-spapr.h"
> +#include "malloc-spapr.h"
>
> #include "qemu-common.h"
>
> diff --git a/tests/qtest/libqos/malloc-spapr.h b/tests/qtest/libqos/malloc-spapr.h
> index e5fe9bf..f99572f 100644
> --- a/tests/qtest/libqos/malloc-spapr.h
> +++ b/tests/qtest/libqos/malloc-spapr.h
> @@ -8,7 +8,7 @@
> #ifndef LIBQOS_MALLOC_SPAPR_H
> #define LIBQOS_MALLOC_SPAPR_H
>
> -#include "libqos/malloc.h"
> +#include "malloc.h"
>
> void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags);
>
> diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> index 615422a..f708b01 100644
> --- a/tests/qtest/libqos/malloc.c
> +++ b/tests/qtest/libqos/malloc.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/malloc.h"
> +#include "malloc.h"
> #include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
> new file mode 100644
> index 0000000..e39e779
> --- /dev/null
> +++ b/tests/qtest/libqos/meson.build
> @@ -0,0 +1,57 @@
> +libqos = static_library('libqos',
> + files('../libqtest.c',
> + 'qgraph.c',
> + 'qos_external.c',
> + 'pci.c',
> + 'fw_cfg.c',
> + 'malloc.c',
> + 'libqos.c',
> +
> + # spapr
> + 'malloc-spapr.c',
> + 'libqos-spapr.c',
> + 'rtas.c',
> + 'pci-spapr.c',
> +
> + # pc
> + 'pci-pc.c',
> + 'malloc-pc.c',
> + 'libqos-pc.c',
> + 'ahci.c',
> +
> + # usb
> + 'usb.c',
> +
> + # qgraph devices:
> + 'e1000e.c',
> + 'i2c.c',
> + 'i2c-imx.c',
> + 'i2c-omap.c',
> + 'sdhci.c',
> + 'tpci200.c',
> + 'virtio.c',
> + 'virtio-9p.c',
> + 'virtio-balloon.c',
> + 'virtio-blk.c',
> + 'virtio-mmio.c',
> + 'virtio-net.c',
> + 'virtio-pci.c',
> + 'virtio-pci-modern.c',
> + 'virtio-rng.c',
> + 'virtio-scsi.c',
> + 'virtio-serial.c',
> +
> + # qgraph machines:
> + 'aarch64-xlnx-zcu102-machine.c',
> + 'arm-imx25-pdk-machine.c',
> + 'arm-n800-machine.c',
> + 'arm-raspi2-machine.c',
> + 'arm-sabrelite-machine.c',
> + 'arm-smdkc210-machine.c',
> + 'arm-virt-machine.c',
> + 'arm-xilinx-zynq-a9-machine.c',
> + 'ppc64_pseries-machine.c',
> + 'x86_64_pc-machine.c',
> +))
> +
> +qos = declare_dependency(link_whole: libqos)
> diff --git a/tests/qtest/libqos/pci-pc.c b/tests/qtest/libqos/pci-pc.c
> index 3bb2eb3..f978442 100644
> --- a/tests/qtest/libqos/pci-pc.c
> +++ b/tests/qtest/libqos/pci-pc.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/pci-pc.h"
> +#include "pci-pc.h"
> #include "qapi/qmp/qdict.h"
> #include "hw/pci/pci_regs.h"
>
> diff --git a/tests/qtest/libqos/pci-pc.h b/tests/qtest/libqos/pci-pc.h
> index 4690005..49ec950 100644
> --- a/tests/qtest/libqos/pci-pc.h
> +++ b/tests/qtest/libqos/pci-pc.h
> @@ -13,9 +13,9 @@
> #ifndef LIBQOS_PCI_PC_H
> #define LIBQOS_PCI_PC_H
>
> -#include "libqos/pci.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "pci.h"
> +#include "malloc.h"
> +#include "qgraph.h"
>
> typedef struct QPCIBusPC {
> QOSGraphObject obj;
> diff --git a/tests/qtest/libqos/pci-spapr.c b/tests/qtest/libqos/pci-spapr.c
> index d6f8c01..2622269 100644
> --- a/tests/qtest/libqos/pci-spapr.c
> +++ b/tests/qtest/libqos/pci-spapr.c
> @@ -7,9 +7,9 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/pci-spapr.h"
> -#include "libqos/rtas.h"
> -#include "libqos/qgraph.h"
> +#include "pci-spapr.h"
> +#include "rtas.h"
> +#include "qgraph.h"
>
> #include "hw/pci/pci_regs.h"
>
> diff --git a/tests/qtest/libqos/pci-spapr.h b/tests/qtest/libqos/pci-spapr.h
> index d9e2563..20a4371 100644
> --- a/tests/qtest/libqos/pci-spapr.h
> +++ b/tests/qtest/libqos/pci-spapr.h
> @@ -8,9 +8,9 @@
> #ifndef LIBQOS_PCI_SPAPR_H
> #define LIBQOS_PCI_SPAPR_H
>
> -#include "libqos/malloc.h"
> -#include "libqos/pci.h"
> -#include "libqos/qgraph.h"
> +#include "malloc.h"
> +#include "pci.h"
> +#include "qgraph.h"
>
> /* From include/hw/pci-host/spapr.h */
>
> diff --git a/tests/qtest/libqos/pci.c b/tests/qtest/libqos/pci.c
> index 2309a72..e1e9618 100644
> --- a/tests/qtest/libqos/pci.c
> +++ b/tests/qtest/libqos/pci.c
> @@ -11,11 +11,11 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqos/pci.h"
> +#include "pci.h"
>
> #include "hw/pci/pci_regs.h"
> #include "qemu/host-utils.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
>
> void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id,
> void (*func)(QPCIDevice *dev, int devfn, void *data),
> diff --git a/tests/qtest/libqos/pci.h b/tests/qtest/libqos/pci.h
> index 590c175..ee64fde 100644
> --- a/tests/qtest/libqos/pci.h
> +++ b/tests/qtest/libqos/pci.h
> @@ -14,7 +14,7 @@
> #define LIBQOS_PCI_H
>
> #include "libqtest.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
>
> #define QPCI_PIO_LIMIT 0x10000
>
> diff --git a/tests/qtest/libqos/ppc64_pseries-machine.c b/tests/qtest/libqos/ppc64_pseries-machine.c
> index 5d7bd88..24ca179 100644
> --- a/tests/qtest/libqos/ppc64_pseries-machine.c
> +++ b/tests/qtest/libqos/ppc64_pseries-machine.c
> @@ -18,10 +18,10 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
> #include "pci-spapr.h"
> #include "qemu/module.h"
> -#include "libqos/malloc-spapr.h"
> +#include "malloc-spapr.h"
>
> typedef struct QSPAPR_pci_host QSPAPR_pci_host;
> typedef struct Qppc64_pseriesMachine Qppc64_pseriesMachine;
> diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c
> index eb0af8a..fc49cfa 100644
> --- a/tests/qtest/libqos/qgraph.c
> +++ b/tests/qtest/libqos/qgraph.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/queue.h"
> -#include "libqos/qgraph_internal.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph_internal.h"
> +#include "qgraph.h"
>
> #define QGRAPH_PRINT_DEBUG 0
> #define QOS_ROOT ""
> diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h
> index db1244e..1054326 100644
> --- a/tests/qtest/libqos/qgraph.h
> +++ b/tests/qtest/libqos/qgraph.h
> @@ -106,7 +106,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
> * <example>
> * <title>Creating new driver an its interface</title>
> * <programlisting>
> - #include "libqos/qgraph.h"
> + #include "qgraph.h"
>
> struct My_driver {
> QOSGraphObject obj;
> @@ -190,7 +190,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
> * <example>
> * <title>Creating new test</title>
> * <programlisting>
> - * #include "libqos/qgraph.h"
> + * #include "qgraph.h"
> *
> * static void my_test_function(void *obj, void *data)
> * {
> @@ -230,7 +230,7 @@ typedef void *(*QOSBeforeTest) (GString *cmd_line, void *arg);
> * a valid test path will be:
> * "/x86_64/pc/other_node/my_driver/my_interface/my_test".
> *
> - * Additional examples are also in libqos/test-qgraph.c
> + * Additional examples are also in test-qgraph.c
> *
> * Command line:
> * Command line is built by using node names and optional arguments
> diff --git a/tests/qtest/libqos/qgraph_internal.h b/tests/qtest/libqos/qgraph_internal.h
> index aa3123f..968fa69 100644
> --- a/tests/qtest/libqos/qgraph_internal.h
> +++ b/tests/qtest/libqos/qgraph_internal.h
> @@ -20,11 +20,11 @@
> #define QGRAPH_INTERNAL_H
>
> /* This header is declaring additional helper functions defined in
> - * libqos/qgraph.c
> + * qgraph.c
> * It should not be included in tests
> */
>
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
>
> typedef struct QOSGraphMachine QOSGraphMachine;
> typedef enum QOSEdgeType QOSEdgeType;
> diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c
> index 0dfc05c..10ee0f7 100644
> --- a/tests/qtest/libqos/qos_external.c
> +++ b/tests/qtest/libqos/qos_external.c
> @@ -24,10 +24,10 @@
> #include "qapi/qmp/qstring.h"
> #include "qemu/module.h"
> #include "qapi/qmp/qlist.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/qgraph_internal.h"
> -#include "libqos/qos_external.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> +#include "qgraph_internal.h"
> +#include "qos_external.h"
>
> static void machine_apply_to_node(const char *name)
> {
> diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_external.h
> index 56a2f37..8446e3d 100644
> --- a/tests/qtest/libqos/qos_external.h
> +++ b/tests/qtest/libqos/qos_external.h
> @@ -19,7 +19,9 @@
> #ifndef QOS_EXTERNAL_H
> #define QOS_EXTERNAL_H
>
> -#include "libqos/malloc.h"
> +#include "qgraph.h"
> +
> +#include "malloc.h"
> #include "qapi/qapi-types-machine.h"
> #include "qapi/qapi-types-qom.h"
>
> diff --git a/tests/qtest/libqos/rtas.c b/tests/qtest/libqos/rtas.c
> index d81ff42..db29d55 100644
> --- a/tests/qtest/libqos/rtas.c
> +++ b/tests/qtest/libqos/rtas.c
> @@ -5,7 +5,7 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/rtas.h"
> +#include "rtas.h"
>
> static void qrtas_copy_args(QTestState *qts, uint64_t target_args,
> uint32_t nargs, uint32_t *args)
> diff --git a/tests/qtest/libqos/rtas.h b/tests/qtest/libqos/rtas.h
> index 459e23a..f38f99d 100644
> --- a/tests/qtest/libqos/rtas.h
> +++ b/tests/qtest/libqos/rtas.h
> @@ -5,7 +5,7 @@
>
> #ifndef LIBQOS_RTAS_H
> #define LIBQOS_RTAS_H
> -#include "libqos/malloc.h"
> +#include "malloc.h"
>
> int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc,
> struct tm *tm, uint32_t *ns);
> diff --git a/tests/qtest/libqos/sdhci.c b/tests/qtest/libqos/sdhci.c
> index fbf2e36..65f0d07 100644
> --- a/tests/qtest/libqos/sdhci.c
> +++ b/tests/qtest/libqos/sdhci.c
> @@ -18,7 +18,7 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
> #include "pci.h"
> #include "qemu/module.h"
> #include "sdhci.h"
> diff --git a/tests/qtest/libqos/sdhci.h b/tests/qtest/libqos/sdhci.h
> index 1acd309..22d647b 100644
> --- a/tests/qtest/libqos/sdhci.h
> +++ b/tests/qtest/libqos/sdhci.h
> @@ -19,7 +19,7 @@
> #ifndef QGRAPH_QSDHCI_H
> #define QGRAPH_QSDHCI_H
>
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
> #include "pci.h"
>
> typedef struct QSDHCI QSDHCI;
> diff --git a/tests/qtest/libqos/tpci200.c b/tests/qtest/libqos/tpci200.c
> index ae590a4..1787b1f 100644
> --- a/tests/qtest/libqos/tpci200.c
> +++ b/tests/qtest/libqos/tpci200.c
> @@ -10,8 +10,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/pci.h"
> +#include "qgraph.h"
> +#include "pci.h"
>
> typedef struct QTpci200 QTpci200;
> typedef struct QIpack QIpack;
> diff --git a/tests/qtest/libqos/usb.c b/tests/qtest/libqos/usb.c
> index d7a9cb3..8b45b02 100644
> --- a/tests/qtest/libqos/usb.c
> +++ b/tests/qtest/libqos/usb.c
> @@ -14,7 +14,7 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "hw/usb/uhci-regs.h"
> -#include "libqos/usb.h"
> +#include "usb.h"
>
> void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar)
> {
> diff --git a/tests/qtest/libqos/usb.h b/tests/qtest/libqos/usb.h
> index eeced39..50030d7 100644
> --- a/tests/qtest/libqos/usb.h
> +++ b/tests/qtest/libqos/usb.h
> @@ -1,7 +1,7 @@
> #ifndef LIBQOS_USB_H
> #define LIBQOS_USB_H
>
> -#include "libqos/pci-pc.h"
> +#include "pci-pc.h"
>
> struct qhc {
> QPCIDevice *dev;
> diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c
> index c87b561..2e30006 100644
> --- a/tests/qtest/libqos/virtio-9p.c
> +++ b/tests/qtest/libqos/virtio-9p.c
> @@ -20,8 +20,8 @@
> #include "libqtest.h"
> #include "qemu/module.h"
> #include "standard-headers/linux/virtio_ids.h"
> -#include "libqos/virtio-9p.h"
> -#include "libqos/qgraph.h"
> +#include "virtio-9p.h"
> +#include "qgraph.h"
>
> static QGuestAllocator *alloc;
>
> diff --git a/tests/qtest/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h
> index be9621a..b1e6bad 100644
> --- a/tests/qtest/libqos/virtio-9p.h
> +++ b/tests/qtest/libqos/virtio-9p.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_9P_H
> #define TESTS_LIBQOS_VIRTIO_9P_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtio9P QVirtio9P;
> typedef struct QVirtio9PPCI QVirtio9PPCI;
> diff --git a/tests/qtest/libqos/virtio-balloon.c b/tests/qtest/libqos/virtio-balloon.c
> index 9745f4a..a3da5c2 100644
> --- a/tests/qtest/libqos/virtio-balloon.c
> +++ b/tests/qtest/libqos/virtio-balloon.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-balloon.h"
> +#include "qgraph.h"
> +#include "virtio-balloon.h"
>
> /* virtio-balloon-device */
> static void *qvirtio_balloon_get_driver(QVirtioBalloon *v_balloon,
> diff --git a/tests/qtest/libqos/virtio-balloon.h b/tests/qtest/libqos/virtio-balloon.h
> index 5b91930..309894c 100644
> --- a/tests/qtest/libqos/virtio-balloon.h
> +++ b/tests/qtest/libqos/virtio-balloon.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_BALLOON_H
> #define TESTS_LIBQOS_VIRTIO_BALLOON_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioBalloon QVirtioBalloon;
> typedef struct QVirtioBalloonPCI QVirtioBalloonPCI;
> diff --git a/tests/qtest/libqos/virtio-blk.c b/tests/qtest/libqos/virtio-blk.c
> index 5fc6940..5da0259 100644
> --- a/tests/qtest/libqos/virtio-blk.c
> +++ b/tests/qtest/libqos/virtio-blk.c
> @@ -20,8 +20,8 @@
> #include "libqtest.h"
> #include "qemu/module.h"
> #include "standard-headers/linux/virtio_blk.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-blk.h"
> +#include "qgraph.h"
> +#include "virtio-blk.h"
>
> #define PCI_SLOT 0x04
> #define PCI_FN 0x00
> diff --git a/tests/qtest/libqos/virtio-blk.h b/tests/qtest/libqos/virtio-blk.h
> index 5170f13..dcef388 100644
> --- a/tests/qtest/libqos/virtio-blk.h
> +++ b/tests/qtest/libqos/virtio-blk.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_BLK_H
> #define TESTS_LIBQOS_VIRTIO_BLK_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioBlk QVirtioBlk;
> typedef struct QVirtioBlkPCI QVirtioBlkPCI;
> diff --git a/tests/qtest/libqos/virtio-mmio.c b/tests/qtest/libqos/virtio-mmio.c
> index e0a2bd7..75efda3 100644
> --- a/tests/qtest/libqos/virtio-mmio.c
> +++ b/tests/qtest/libqos/virtio-mmio.c
> @@ -10,10 +10,10 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-mmio.h"
> -#include "libqos/malloc.h"
> -#include "libqos/qgraph.h"
> +#include "virtio.h"
> +#include "virtio-mmio.h"
> +#include "malloc.h"
> +#include "qgraph.h"
> #include "standard-headers/linux/virtio_ring.h"
>
> static uint8_t qvirtio_mmio_config_readb(QVirtioDevice *d, uint64_t off)
> diff --git a/tests/qtest/libqos/virtio-mmio.h b/tests/qtest/libqos/virtio-mmio.h
> index 0e45778..30803bc 100644
> --- a/tests/qtest/libqos/virtio-mmio.h
> +++ b/tests/qtest/libqos/virtio-mmio.h
> @@ -10,8 +10,8 @@
> #ifndef LIBQOS_VIRTIO_MMIO_H
> #define LIBQOS_VIRTIO_MMIO_H
>
> -#include "libqos/virtio.h"
> -#include "libqos/qgraph.h"
> +#include "virtio.h"
> +#include "qgraph.h"
>
> #define QVIRTIO_MMIO_MAGIC_VALUE 0x000
> #define QVIRTIO_MMIO_VERSION 0x004
> diff --git a/tests/qtest/libqos/virtio-net.c b/tests/qtest/libqos/virtio-net.c
> index a9e253a..1cae07f 100644
> --- a/tests/qtest/libqos/virtio-net.c
> +++ b/tests/qtest/libqos/virtio-net.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-net.h"
> +#include "qgraph.h"
> +#include "virtio-net.h"
> #include "hw/virtio/virtio-net.h"
>
>
> diff --git a/tests/qtest/libqos/virtio-net.h b/tests/qtest/libqos/virtio-net.h
> index b8cbec0..5ba2161 100644
> --- a/tests/qtest/libqos/virtio-net.h
> +++ b/tests/qtest/libqos/virtio-net.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_NET_H
> #define TESTS_LIBQOS_VIRTIO_NET_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioNet QVirtioNet;
> typedef struct QVirtioNetPCI QVirtioNetPCI;
> diff --git a/tests/qtest/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pci.c
> index 62851c2..cd3c0f5 100644
> --- a/tests/qtest/libqos/virtio-pci.c
> +++ b/tests/qtest/libqos/virtio-pci.c
> @@ -9,13 +9,13 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> -#include "libqos/pci.h"
> -#include "libqos/pci-pc.h"
> -#include "libqos/malloc.h"
> -#include "libqos/malloc-pc.h"
> -#include "libqos/qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
> +#include "pci.h"
> +#include "pci-pc.h"
> +#include "malloc.h"
> +#include "malloc-pc.h"
> +#include "qgraph.h"
> #include "standard-headers/linux/virtio_ring.h"
> #include "standard-headers/linux/virtio_pci.h"
>
> diff --git a/tests/qtest/libqos/virtio-pci.h b/tests/qtest/libqos/virtio-pci.h
> index 294d556..f5115ca 100644
> --- a/tests/qtest/libqos/virtio-pci.h
> +++ b/tests/qtest/libqos/virtio-pci.h
> @@ -10,9 +10,9 @@
> #ifndef LIBQOS_VIRTIO_PCI_H
> #define LIBQOS_VIRTIO_PCI_H
>
> -#include "libqos/virtio.h"
> -#include "libqos/pci.h"
> -#include "libqos/qgraph.h"
> +#include "virtio.h"
> +#include "pci.h"
> +#include "qgraph.h"
>
> typedef struct QVirtioPCIMSIXOps QVirtioPCIMSIXOps;
>
> diff --git a/tests/qtest/libqos/virtio-rng.c b/tests/qtest/libqos/virtio-rng.c
> index 46f8d95..2e09dd7 100644
> --- a/tests/qtest/libqos/virtio-rng.c
> +++ b/tests/qtest/libqos/virtio-rng.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-rng.h"
> +#include "qgraph.h"
> +#include "virtio-rng.h"
>
> /* virtio-rng-device */
> static void *qvirtio_rng_get_driver(QVirtioRng *v_rng,
> diff --git a/tests/qtest/libqos/virtio-rng.h b/tests/qtest/libqos/virtio-rng.h
> index 9342372..9ca102b 100644
> --- a/tests/qtest/libqos/virtio-rng.h
> +++ b/tests/qtest/libqos/virtio-rng.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_RNG_H
> #define TESTS_LIBQOS_VIRTIO_RNG_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioRng QVirtioRng;
> typedef struct QVirtioRngPCI QVirtioRngPCI;
> diff --git a/tests/qtest/libqos/virtio-scsi.c b/tests/qtest/libqos/virtio-scsi.c
> index c8c3598..5644e32 100644
> --- a/tests/qtest/libqos/virtio-scsi.c
> +++ b/tests/qtest/libqos/virtio-scsi.c
> @@ -20,8 +20,8 @@
> #include "libqtest.h"
> #include "qemu/module.h"
> #include "standard-headers/linux/virtio_ids.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-scsi.h"
> +#include "qgraph.h"
> +#include "virtio-scsi.h"
>
> /* virtio-scsi-device */
> static void *qvirtio_scsi_get_driver(QVirtioSCSI *v_scsi,
> diff --git a/tests/qtest/libqos/virtio-scsi.h b/tests/qtest/libqos/virtio-scsi.h
> index 9e3774d..531315e 100644
> --- a/tests/qtest/libqos/virtio-scsi.h
> +++ b/tests/qtest/libqos/virtio-scsi.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_SCSI_H
> #define TESTS_LIBQOS_VIRTIO_SCSI_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioSCSI QVirtioSCSI;
> typedef struct QVirtioSCSIPCI QVirtioSCSIPCI;
> diff --git a/tests/qtest/libqos/virtio-serial.c b/tests/qtest/libqos/virtio-serial.c
> index b956540..ee34afd 100644
> --- a/tests/qtest/libqos/virtio-serial.c
> +++ b/tests/qtest/libqos/virtio-serial.c
> @@ -19,8 +19,8 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
> #include "qemu/module.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio-serial.h"
> +#include "qgraph.h"
> +#include "virtio-serial.h"
>
> static void *qvirtio_serial_get_driver(QVirtioSerial *v_serial,
> const char *interface)
> diff --git a/tests/qtest/libqos/virtio-serial.h b/tests/qtest/libqos/virtio-serial.h
> index 3328c6c..3db43b2 100644
> --- a/tests/qtest/libqos/virtio-serial.h
> +++ b/tests/qtest/libqos/virtio-serial.h
> @@ -19,9 +19,9 @@
> #ifndef TESTS_LIBQOS_VIRTIO_SERIAL_H
> #define TESTS_LIBQOS_VIRTIO_SERIAL_H
>
> -#include "libqos/qgraph.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "qgraph.h"
> +#include "virtio.h"
> +#include "virtio-pci.h"
>
> typedef struct QVirtioSerial QVirtioSerial;
> typedef struct QVirtioSerialPCI QVirtioSerialPCI;
> diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c
> index 9aa3606..6fe7bf9 100644
> --- a/tests/qtest/libqos/virtio.c
> +++ b/tests/qtest/libqos/virtio.c
> @@ -10,7 +10,7 @@
> #include "qemu/osdep.h"
> #include "qemu/bswap.h"
> #include "libqtest.h"
> -#include "libqos/virtio.h"
> +#include "virtio.h"
> #include "standard-headers/linux/virtio_config.h"
> #include "standard-headers/linux/virtio_ring.h"
>
> diff --git a/tests/qtest/libqos/virtio.h b/tests/qtest/libqos/virtio.h
> index 529ef75..b8bd06e 100644
> --- a/tests/qtest/libqos/virtio.h
> +++ b/tests/qtest/libqos/virtio.h
> @@ -10,7 +10,7 @@
> #ifndef LIBQOS_VIRTIO_H
> #define LIBQOS_VIRTIO_H
>
> -#include "libqos/malloc.h"
> +#include "malloc.h"
> #include "standard-headers/linux/virtio_ring.h"
>
> #define QVIRTIO_F_BAD_FEATURE 0x40000000ull
> diff --git a/tests/qtest/libqos/x86_64_pc-machine.c b/tests/qtest/libqos/x86_64_pc-machine.c
> index 0edb1c9..ad96742 100644
> --- a/tests/qtest/libqos/x86_64_pc-machine.c
> +++ b/tests/qtest/libqos/x86_64_pc-machine.c
> @@ -18,7 +18,7 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> -#include "libqos/qgraph.h"
> +#include "qgraph.h"
> #include "pci-pc.h"
> #include "qemu/module.h"
> #include "malloc-pc.h"
> diff --git a/tests/qtest/libqtest-single.h b/tests/qtest/libqtest-single.h
> index 6f1bb13..176979a 100644
> --- a/tests/qtest/libqtest-single.h
> +++ b/tests/qtest/libqtest-single.h
> @@ -11,7 +11,7 @@
> #ifndef LIBQTEST_SINGLE_H
> #define LIBQTEST_SINGLE_H
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> QTestState *global_qtest __attribute__((common, weak));
>
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index fd46805..26f1223 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -20,7 +20,7 @@
> #include <sys/wait.h>
> #include <sys/un.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c
> index b94a123..6db3234 100644
> --- a/tests/qtest/m48t59-test.c
> +++ b/tests/qtest/m48t59-test.c
> @@ -14,7 +14,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> #define RTC_SECONDS 0x9
> #define RTC_MINUTES 0xa
> diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
> index 57107f1..aab06b9 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -14,7 +14,7 @@
>
> #include "qemu-common.h"
> #include "qemu/cutils.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
>
>
> diff --git a/tests/qtest/megasas-test.c b/tests/qtest/megasas-test.c
> index d6796b9..eae70ff 100644
> --- a/tests/qtest/megasas-test.c
> +++ b/tests/qtest/megasas-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/bswap.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> new file mode 100644
> index 0000000..820c15c
> --- /dev/null
> +++ b/tests/qtest/meson.build
> @@ -0,0 +1,254 @@
> +# All QTests for now are POSIX-only, but the dependencies are
> +# really in libqtest, not in the testcases themselves.
> +if not config_host.has_key('CONFIG_POSIX')
> + subdir_done()
> +endif
> +
> +qtests_generic = [
> + 'cdrom-test',
> + 'device-introspect-test',
> + 'machine-none-test',
> + 'qmp-test',
> + 'qmp-cmd-test',
> + 'qom-test',
> + 'test-hmp',
> + 'qos-test',
> +]
> +if config_host.has_key('CONFIG_MODULES')
> + qtests_generic += [ 'modules-test' ]
> +endif
> +
> +qtests_pci = \
> + (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : [])
> +
> +qtests_i386 = \
> + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
> + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
> + (have_tools ? ['ahci-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['test-filter-redirector'] : []) + \
> + (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \
> + (config_host.has_key('CONFIG_LINUX') and \
> + config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_PVPANIC') ? ['pvpanic-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_USB_UHCI') and \
> + config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-swtpm-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test'] : []) + \
> + qtests_pci + \
> + ['fdc-test',
> + 'ide-test',
> + 'ahci-test',
> + 'hd-geo-test',
> + 'boot-order-test',
> + 'bios-tables-test',
> + 'rtc-test',
> + 'i440fx-test',
> + 'fw_cfg-test',
> + 'device-plug-test',
> + 'drive_del-test',
> + 'tco-test',
> + 'cpu-plug-test',
> + 'q35-test',
> + 'vmgenid-test',
> + 'migration-test',
> + 'test-x86-cpuid-compat',
> + 'numa-test']
> +
> +dbus_daemon = find_program('dbus-daemon')
> +if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
> + # Temporarily disabled due to Patchew failures:
> + #qtests_i386 += ['dbus-vmstate-test']
> + dbus_vmstate1 = custom_target('dbus-vmstate description',
> + output: ['dbus-vmstate1.h', 'dbus-vmstate1.c'],
> + input: files('dbus-vmstate1.xml'),
> + command: [config_host['GDBUS_CODEGEN'],
> + '@INPUT@',
> + '--interface-prefix', 'org.qemu',
> + '--generate-c-code', '@BASENAME@'])
> +endif
> +
> +qtests_x86_64 = qtests_i386
> +
> +qtests_alpha = [ 'boot-serial-test' ] + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
> +
> +qtests_avr = [ 'boot-serial-test' ]
> +
> +qtests_hppa = [ 'boot-serial-test' ] + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
> +
> +qtests_m68k = [ 'boot-serial-test' ]
> +qtests_microblaze = [ 'boot-serial-test' ]
> +qtests_microblazeel = qtests_microblaze
> +
> +qtests_mips = \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
> +
> +qtests_mips64 = \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
> +
> +qtests_mips64el = \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
> +
> +qtests_moxie = [ 'boot-serial-test' ]
> +
> +qtests_ppc = \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
> + ['boot-order-test', 'prom-env-test', 'drive_del-test', 'boot-serial-test'] \
> +
> +qtests_ppc64 = \
> + (config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \
> + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
> + (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
> + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
> + qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test']
> +
> +qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
> +qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
> +
> +qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test']
> +
> +qtests_sparc64 = \
> + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
> + ['prom-env-test', 'boot-serial-test']
> +
> +qtests_arm = \
> + (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \
> + ['arm-cpu-features',
> + 'microbit-test',
> + 'm25p80-test',
> + 'test-arm-mptimer',
> + 'boot-serial-test',
> + 'hexloader-test']
> +
> +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
> +qtests_aarch64 = \
> + (cpu != 'arm' ? ['bios-tables-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
> + ['numa-test',
> + 'boot-serial-test',
> + 'migration-test']
> +
> +qtests_s390x = \
> + (config_host.has_key('CONFIG_SLIRP') ? ['pxe-test', 'test-netfilter'] : []) + \
> + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
> + (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
> + ['boot-serial-test',
> + 'drive_del-test',
> + 'device-plug-test',
> + 'virtio-ccw-test',
> + 'cpu-plug-test',
> + 'migration-test']
> +
> +qos_test_srcs = files(
> + 'ac97-test.c',
> + 'ds1338-test.c',
> + 'e1000-test.c',
> + 'e1000e-test.c',
> + 'eepro100-test.c',
> + 'es1370-test.c',
> + 'ipoctal232-test.c',
> + 'megasas-test.c',
> + 'ne2000-test.c',
> + 'tulip-test.c',
> + 'nvme-test.c',
> + 'pca9552-test.c',
> + 'pci-test.c',
> + 'pcnet-test.c',
> + 'sdhci-test.c',
> + 'spapr-phb-test.c',
> + 'tmp105-test.c',
> + 'usb-hcd-ohci-test.c',
> + 'vhost-user-test.c',
> + 'virtio-test.c',
> + 'virtio-9p-test.c',
> + 'virtio-blk-test.c',
> + 'virtio-net-test.c',
> + 'virtio-rng-test.c',
> + 'virtio-scsi-test.c',
> + 'virtio-serial-test.c',
> + 'vmxnet3-test.c',
> +)
> +
> +extra_qtest_deps = {
> + 'bios-tables-test': [io],
> + 'ivshmem-test': [rt],
> + 'qos-test': [chardev, io],
> + 'tpm-crb-swtpm-test': [io],
> + 'tpm-crb-test': [io],
> + 'tpm-tis-swtpm-test': [io],
> + 'tpm-tis-test': [io],
> + 'tpm-tis-device-swtpm-test': [io],
> + 'tpm-tis-device-test': [io],
> +}
> +extra_qtest_srcs = {
> + 'bios-tables-test': files('boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'),
> + 'pxe-test': files('boot-sector.c'),
> + 'cdrom-test': files('boot-sector.c'),
> + 'migration-test': files('migration-helpers.c'),
> + 'ivshmem-test': files('../../contrib/ivshmem-server/ivshmem-server.c'),
> + 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1.to_list(),
> + 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
> + 'tpm-crb-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
> + 'tpm-crb-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
> + 'tpm-tis-device-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
> + 'tpm-tis-device-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
> + 'tpm-tis-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
> + 'tpm-tis-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tis-util.c', 'tpm-tests.c'),
> + 'qos-test': qos_test_srcs
> +}
> +
> +
> +qtest_executables = {}
> +foreach dir : target_dirs
> + if not dir.endswith('-softmmu')
> + continue
> + endif
> +
> + target_base = dir.split('-')[0]
> + qtests = get_variable('qtests_' + target_base, []) + qtests_generic
> +
> + qtest_env = environment()
> + qtest_env.set('QTEST_QEMU_IMG', './qemu-img')
> + qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
> + qtest_env.set('QTEST_QEMU_BINARY', '@0@-softmmu/qemu-system-@0@'.format(target_base))
> +
> + foreach test : qtests
> + # Executables are shared across targets, declare them only the first time we
> + # encounter them
> + if not qtest_executables.has_key(test)
> + qtest_executables += {
> + test: executable(test,
> + files(test + '.c') + extra_qtest_srcs.get(test, []),
> + dependencies: [qemuutil, qos] + extra_qtest_deps.get(test, []))
> + }
> + endif
> + # FIXME: missing dependency on the emulator binary and qemu-img
> + test('qtest-@0@: @1@'.format(target_base, test),
> + qtest_executables[test],
> + env: qtest_env,
> + args: ['--tap', '-k'],
> + protocol: 'tap',
> + suite: ['qtest', 'qtest-' + target_base])
> + endforeach
> +endforeach
> diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
> index 04e199e..2b25557 100644
> --- a/tests/qtest/microbit-test.c
> +++ b/tests/qtest/microbit-test.c
> @@ -16,7 +16,7 @@
>
> #include "qemu/osdep.h"
> #include "exec/hwaddr.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> #include "hw/arm/nrf51.h"
> #include "hw/char/nrf51_uart.h"
> diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h
> index a11808b..d63bba9 100644
> --- a/tests/qtest/migration-helpers.h
> +++ b/tests/qtest/migration-helpers.h
> @@ -12,7 +12,7 @@
> #ifndef MIGRATION_HELPERS_H_
> #define MIGRATION_HELPERS_H_
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> extern bool got_stop;
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index 21ea5ba..00a233c 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/module.h"
> @@ -25,7 +25,7 @@
> #include "qapi/qobject-output-visitor.h"
>
> #include "migration-helpers.h"
> -#include "migration/migration-test.h"
> +#include "tests/migration/migration-test.h"
>
> /* TODO actually test the results and get rid of this */
> #define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS__))
> diff --git a/tests/qtest/modules-test.c b/tests/qtest/modules-test.c
> index 8821768..c238b3f 100644
> --- a/tests/qtest/modules-test.c
> +++ b/tests/qtest/modules-test.c
> @@ -1,5 +1,5 @@
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> const char common_args[] = "-nodefaults -machine none";
>
> diff --git a/tests/qtest/ne2000-test.c b/tests/qtest/ne2000-test.c
> index 3fc0e55..43cfc45 100644
> --- a/tests/qtest/ne2000-test.c
> +++ b/tests/qtest/ne2000-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c
> index e1ed6d4..b25ebf9 100644
> --- a/tests/qtest/numa-test.c
> +++ b/tests/qtest/numa-test.c
> @@ -10,7 +10,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
>
> diff --git a/tests/qtest/nvme-test.c b/tests/qtest/nvme-test.c
> index ff04421..d32c953 100644
> --- a/tests/qtest/nvme-test.c
> +++ b/tests/qtest/nvme-test.c
> @@ -10,7 +10,7 @@
> #include "qemu/osdep.h"
> #include "qemu/module.h"
> #include "qemu/units.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
>
> diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c
> index d80ed93..42a1312 100644
> --- a/tests/qtest/pca9552-test.c
> +++ b/tests/qtest/pca9552-test.c
> @@ -9,7 +9,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/qgraph.h"
> #include "libqos/i2c.h"
> #include "hw/misc/pca9552_regs.h"
> diff --git a/tests/qtest/pci-test.c b/tests/qtest/pci-test.c
> index 4b2092b..e15d4d9 100644
> --- a/tests/qtest/pci-test.c
> +++ b/tests/qtest/pci-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/pcnet-test.c b/tests/qtest/pcnet-test.c
> index 900944f..7583aeb 100644
> --- a/tests/qtest/pcnet-test.c
> +++ b/tests/qtest/pcnet-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-test.c
> index 17aa669..afb702b 100644
> --- a/tests/qtest/pflash-cfi02-test.c
> +++ b/tests/qtest/pflash-cfi02-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> /*
> * To test the pflash_cfi02 device, we run QEMU with the musicpal machine with
> diff --git a/tests/qtest/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c
> index 2c46d5c..c8d4043 100644
> --- a/tests/qtest/pnv-xscom-test.c
> +++ b/tests/qtest/pnv-xscom-test.c
> @@ -8,7 +8,7 @@
> */
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> typedef enum PnvChipType {
> PNV_CHIP_POWER8E, /* AKA Murano (default) */
> diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
> index 60e6ec3..f41d801 100644
> --- a/tests/qtest/prom-env-test.c
> +++ b/tests/qtest/prom-env-test.c
> @@ -20,7 +20,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/libqos-spapr.h"
>
> #define MAGIC 0xcafec0de
> diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c
> index ff9176a..e576394 100644
> --- a/tests/qtest/pvpanic-test.c
> +++ b/tests/qtest/pvpanic-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
>
> static void test_panic(void)
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 1161a77..32bbae3 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -15,7 +15,7 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> #include "qemu-common.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "libqos/libqos-spapr.h"
>
> diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c
> index c922d81..b7cf144 100644
> --- a/tests/qtest/q35-test.c
> +++ b/tests/qtest/q35-test.c
> @@ -10,7 +10,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/pci.h"
> #include "libqos/pci-pc.h"
> #include "hw/pci-host/q35.h"
> diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
> index f7b1aa7..f34e688 100644
> --- a/tests/qtest/qmp-cmd-test.c
> +++ b/tests/qtest/qmp-cmd-test.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-introspect.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c
> index 1a8876b..5950c3e 100644
> --- a/tests/qtest/qmp-test.c
> +++ b/tests/qtest/qmp-test.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-control.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
> index 1acf0d7..eb34af8 100644
> --- a/tests/qtest/qom-test.c
> +++ b/tests/qtest/qom-test.c
> @@ -13,7 +13,7 @@
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> static void test_properties(QTestState *qts, const char *path, bool recurse)
> {
> diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c
> index 167b42d..a7e83e7 100644
> --- a/tests/qtest/rtas-test.c
> +++ b/tests/qtest/rtas-test.c
> @@ -1,6 +1,6 @@
> #include "qemu/osdep.h"
> #include "qemu/cutils.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> #include "libqos/libqos-spapr.h"
> #include "libqos/rtas.h"
> diff --git a/tests/qtest/sdhci-test.c b/tests/qtest/sdhci-test.c
> index 6275e76..a110cfe 100644
> --- a/tests/qtest/sdhci-test.c
> +++ b/tests/qtest/sdhci-test.c
> @@ -10,7 +10,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/registerfields.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/pci-pc.h"
> #include "hw/pci/pci.h"
> diff --git a/tests/qtest/spapr-phb-test.c b/tests/qtest/spapr-phb-test.c
> index 093dc22..ea8d596 100644
> --- a/tests/qtest/spapr-phb-test.c
> +++ b/tests/qtest/spapr-phb-test.c
> @@ -9,7 +9,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
>
> diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c
> index 254f735..47bc7ad 100644
> --- a/tests/qtest/tco-test.c
> +++ b/tests/qtest/tco-test.c
> @@ -9,7 +9,7 @@
>
> #include "qemu/osdep.h"
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "libqos/pci.h"
> #include "libqos/pci-pc.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c
> index 1e3ced8..bc0dee6 100644
> --- a/tests/qtest/test-filter-mirror.c
> +++ b/tests/qtest/test-filter-mirror.c
> @@ -10,7 +10,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter-redirector.c
> index e4d5322..829db8c 100644
> --- a/tests/qtest/test-filter-redirector.c
> +++ b/tests/qtest/test-filter-redirector.c
> @@ -52,7 +52,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c
> index d5e7ebd..aea1384 100644
> --- a/tests/qtest/test-hmp.c
> +++ b/tests/qtest/test-hmp.c
> @@ -15,7 +15,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
>
> static int verbose;
>
> diff --git a/tests/qtest/tpm-crb-swtpm-test.c b/tests/qtest/tpm-crb-swtpm-test.c
> index 55fdb56..1d82a48 100644
> --- a/tests/qtest/tpm-crb-swtpm-test.c
> +++ b/tests/qtest/tpm-crb-swtpm-test.c
> @@ -15,7 +15,7 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "tpm-tests.h"
> #include "hw/acpi/tpm.h"
> diff --git a/tests/qtest/tpm-tis-device-swtpm-test.c b/tests/qtest/tpm-tis-device-swtpm-test.c
> index 7b20035..f7126ef 100644
> --- a/tests/qtest/tpm-tis-device-swtpm-test.c
> +++ b/tests/qtest/tpm-tis-device-swtpm-test.c
> @@ -16,7 +16,7 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "tpm-tests.h"
> #include "hw/acpi/tpm.h"
> diff --git a/tests/qtest/tpm-tis-swtpm-test.c b/tests/qtest/tpm-tis-swtpm-test.c
> index 90131cb..fa590e6 100644
> --- a/tests/qtest/tpm-tis-swtpm-test.c
> +++ b/tests/qtest/tpm-tis-swtpm-test.c
> @@ -15,7 +15,7 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "tpm-tests.h"
> #include "hw/acpi/tpm.h"
> diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
> index 58a9593..e2b29ef 100644
> --- a/tests/qtest/tpm-util.c
> +++ b/tests/qtest/tpm-util.c
> @@ -15,7 +15,7 @@
> #include "qemu/osdep.h"
>
> #include "hw/acpi/tpm.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "tpm-util.h"
> #include "qapi/qmp/qdict.h"
>
> diff --git a/tests/qtest/tulip-test.c b/tests/qtest/tulip-test.c
> index 2fb6c4d..da16cbf 100644
> --- a/tests/qtest/tulip-test.c
> +++ b/tests/qtest/tulip-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/virtio-rng-test.c b/tests/qtest/virtio-rng-test.c
> index 092ba13..e6b8cd8 100644
> --- a/tests/qtest/virtio-rng-test.c
> +++ b/tests/qtest/virtio-rng-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/virtio-rng.h"
> diff --git a/tests/qtest/virtio-test.c b/tests/qtest/virtio-test.c
> index f7c6afd..6313417 100644
> --- a/tests/qtest/virtio-test.c
> +++ b/tests/qtest/virtio-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
> index efba76e..6781a51 100644
> --- a/tests/qtest/vmgenid-test.c
> +++ b/tests/qtest/vmgenid-test.c
> @@ -14,7 +14,7 @@
> #include "hw/acpi/acpi-defs.h"
> #include "boot-sector.h"
> #include "acpi-utils.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
>
> #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"
> diff --git a/tests/qtest/vmxnet3-test.c b/tests/qtest/vmxnet3-test.c
> index a810252..97c23fd 100644
> --- a/tests/qtest/vmxnet3-test.c
> +++ b/tests/qtest/vmxnet3-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qemu/module.h"
> #include "libqos/qgraph.h"
> #include "libqos/pci.h"
> diff --git a/tests/qtest/wdt_ib700-test.c b/tests/qtest/wdt_ib700-test.c
> index 797288d..6c36e43 100644
> --- a/tests/qtest/wdt_ib700-test.c
> +++ b/tests/qtest/wdt_ib700-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/timer.h"
>
> diff --git a/tests/test-qga.c b/tests/test-qga.c
> index d1b4c3e..4ac4c22 100644
> --- a/tests/test-qga.c
> +++ b/tests/test-qga.c
> @@ -4,7 +4,7 @@
> #include <sys/socket.h>
> #include <sys/un.h>
>
> -#include "libqtest.h"
> +#include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
>
> diff --git a/tests/test-qgraph.c b/tests/test-qgraph.c
> index 5c7e457..267291c 100644
> --- a/tests/test-qgraph.c
> +++ b/tests/test-qgraph.c
> @@ -17,9 +17,8 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> -#include "libqos/qgraph.h"
> -#include "libqos/qgraph_internal.h"
> +#include "qtest/libqos/qgraph.h"
> +#include "qtest/libqos/qgraph_internal.h"
>
> #define MACHINE_PC "x86_64/pc"
> #define MACHINE_RASPI2 "arm/raspi2"
> --
> 1.8.3.1
>
>
>
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [PATCH 063/143] meson: convert tests/qtest to meson
2020-08-07 17:22 ` Alexander Bulekov
@ 2020-08-07 18:22 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-07 18:22 UTC (permalink / raw)
To: Alexander Bulekov
Cc: Thomas Huth, qemu-devel, Darren Kenny, Bandan Das,
Stefan Hajnoczi, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 70310 bytes --]
Thanks Alexander. Fuzzing wasn't tested at all, so thanks for doing some of
the work for me.
Most things you noticed are bugs or stupidities on my part that I haven't
debugged yet. Release early, release often and all that. The next version
should have all these wrinkles ironed out!
Paolo
Il ven 7 ago 2020, 19:23 Alexander Bulekov <alxndr@bu.edu> ha scritto:
> Thank you, Paolo. I haven't gone through all the other messages yet, so
> maybe I missed some insights that would help with this.
>
> Some notes as I try to build qemu-fuzz-i386.
> * Needed to do git submodule update --init. IIRC this used to happen
> automatically for stuff like slirp. I will need to update the oss-fuzz
> build scripts (./scripts/oss-fuzz/build.sh) to init submodules.
>
> * My locally installed Meson was too old. Needed to add --meson=git . Is
> there a reason this is not the default?
>
> * The make i386-softmmu/{all,fuzz} flavored targets are gone. Good. Now
> we have qemu-system-i386 and qemu-fuzz-i386
>
> * Trying make qemu-fuzz-i386:
> ../tests/qtest/fuzz/virtio_scsi_fuzz.c:16:10: fatal error:
> 'libqos/virtio-scsi.h' file not found
> #include "libqos/virtio-scsi.h"
> ^~~~~~~~~~~~~~~~~~~~~~
> 1 error generated.
> make: *** [Makefile.ninja:2761:
> qemu-fuzz-i386.p/tests_qtest_fuzz_virtio_scsi_fuzz.c.o] Error 1
>
> No big deal, thats probably not the right way to include that stuff
> anyways:
>
> ------------------------
>
> diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c
> b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> index 977ac424ed..6ff6fabe4a 100644
> --- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
> +++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> @@ -13,9 +13,9 @@
> #include "qemu/osdep.h"
>
> #include "tests/qtest/libqos/libqtest.h"
> -#include "libqos/virtio-scsi.h"
> -#include "libqos/virtio.h"
> -#include "libqos/virtio-pci.h"
> +#include "tests/qtest/libqos/virtio-scsi.h"
> +#include "tests/qtest/libqos/virtio.h"
> +#include "tests/qtest/libqos/virtio-pci.h"
> #include "standard-headers/linux/virtio_ids.h"
> #include "standard-headers/linux/virtio_pci.h"
> #include "standard-headers/linux/virtio_scsi.h"
>
> ------------------------
>
> * Ok. Lets try again:
> In file included from ../ui/vnc.h:103:
> ../ui/vnc-auth-sasl.h:28:10: fatal error: 'sasl/sasl.h' file not found
> #include <sasl/sasl.h>
> ^~~~~~~~~~~~~
>
> Didn't need that before - oh well. apt install libsasl-dev
>
> ../ui/input-keymap.c:7:10: fatal error:
> 'ui/input-keymap-atset1-to-qcode.c' file not found
> #include "ui/input-keymap-atset1-to-qcode.c"
>
> Can't find that anywhere. Lets try to clear out the build dir and build
> system without --enable-fuzzing:
> CC=clang-9 CXX=clang++-9 ../configure --enable-sanitizers --meson=git
> make qemu-system-i386
> ...
> ../qemu-options-wrapper.h:32:10: fatal error: 'qemu-options.def' file not
> found
> #include "qemu-options.def"
>
> Ok lets try:
> make qemu-options.def
>
> We get further now:
>
> ../ui/input-keymap.c:7:10: fatal error:
> 'ui/input-keymap-atset1-to-qcode.c' file not found
> #include "ui/input-keymap-atset1-to-qcode.c"
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> lets try: make "ui/input-keymap-atset1-to-qcode.c"
> .. and make "ui/input-keymap-linux-to-qcode.c"
> .. and make "ui/input-keymap-qcode-to-atset1.c"
> .. and make "ui/input-keymap-qcode-to-atset2.c"
> .. and make "ui/input-keymap-qcode-to-atset3.c"
> .. and make "ui/input-keymap-qcode-to-linux.c"
> .. and make "ui/input-keymap-qcode-to-qnum.c"
> .. and make "ui/input-keymap-qcode-to-sun.c"
> .. and make "ui/input-keymap-qnum-to-qcode.c"
>
> Since it seems the problems aren't specific to the fuzz target, Lets
> re-try with --enable-fuzzing
>
> Ok, we're very close now:
> clang: error: unknown argument: '-wrap'
> .... 19 times
> clang: error: no such file or directory: 'qtest_inb'
> ....
> clang: error: no such file or directory: 'qtest_memset'
>
> Ok what is it trying to do? Lets do make -n qemu-fuzz-i386:
>
> clang++-9 -o qemu-fuzz-i386
> qemu-fuzz-i386.p/tests_qtest_fuzz_i440fx_fuzz.c.o
> -fsanitize=fuzzer -Ttests/qtest/fuzz/fork_fuzz.ld -wrap qtest_inb -wrap
> qtest_inw -wrap qtest_inl -wrap qtest_outb -wrap qtest_outw -wrap
> qtest_outl -wrap qtest_readb -wrap qtest_readw -wrap qtest_readl -wrap
> qtest_readq -wrap qtest_writeb
>
> Hmm those need to have -Wl, . Lets just hack it in, for now (we also
> don't build qtest_wrappers.o, so lets fix that):
> diff --git a/tests/qtest/fuzz/meson.build b/tests/qtest/fuzz/meson.build
> index 58ab69a952..0345f6c993 100644
> --- a/tests/qtest/fuzz/meson.build
> +++ b/tests/qtest/fuzz/meson.build
> @@ -1,4 +1,4 @@
> -specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c'), qos)
> +specific_fuzz_ss.add(files('fuzz.c', 'fork_fuzz.c', 'qos_fuzz.c',
> 'qtest_wrappers.c'), qos)
>
> # Targets
> specific_fuzz_ss.add(when: 'CONFIG_I440FX', if_true:
> files('i440fx_fuzz.c'))
> @@ -10,25 +10,25 @@ specific_fuzz_ss.add(when: 'CONFIG_VIRTIO_SCSI',
> if_true: files('virtio_scsi_fuz
> fork_fuzz = declare_dependency(
> link_args: ['-fsanitize=fuzzer',
> '-Ttests/qtest/fuzz/fork_fuzz.ld',
> - '-wrap', 'qtest_inb',
> - '-wrap', 'qtest_inw',
> - '-wrap', 'qtest_inl',
> - '-wrap', 'qtest_outb',
> - '-wrap', 'qtest_outw',
> - '-wrap', 'qtest_outl',
> - '-wrap', 'qtest_readb',
> - '-wrap', 'qtest_readw',
> - '-wrap', 'qtest_readl',
> - '-wrap', 'qtest_readq',
> - '-wrap', 'qtest_writeb',
> - '-wrap', 'qtest_writew',
> - '-wrap', 'qtest_writel',
> - '-wrap', 'qtest_writeq',
> - '-wrap', 'qtest_memread',
> - '-wrap', 'qtest_bufread',
> - '-wrap', 'qtest_memwrite',
> - '-wrap', 'qtest_bufwrite',
> - '-wrap', 'qtest_memset']
> + '-Wl,-wrap,qtest_inb',
> + '-Wl,-wrap,qtest_inw',
> + '-Wl,-wrap,qtest_inl',
> + '-Wl,-wrap,qtest_outb',
> + '-Wl,-wrap,qtest_outw',
> + '-Wl,-wrap,qtest_outl',
> + '-Wl,-wrap,qtest_readb',
> + '-Wl,-wrap,qtest_readw',
> + '-Wl,-wrap,qtest_readl',
> + '-Wl,-wrap,qtest_readq',
> + '-Wl,-wrap,qtest_writeb',
> + '-Wl,-wrap,qtest_writew',
> + '-Wl,-wrap,qtest_writel',
> + '-Wl,-wrap,qtest_writeq',
> + '-Wl,-wrap,qtest_memread',
> + '-Wl,-wrap,qtest_bufread',
> + '-Wl,-wrap,qtest_memwrite',
> + '-Wl,-wrap,qtest_bufwrite',
> + '-Wl,-wrap,qtest_memset']
> )
>
> specific_fuzz_ss.add(fork_fuzz)
>
> ../tests/qtest/fuzz/qtest_wrappers.c:15:10: fatal error: 'cpu.h' file not
> found
> #include "cpu.h"
>
> How did we get away with that in the first place?
>
> -----------------------------
> diff --git a/tests/qtest/fuzz/qtest_wrappers.c
> b/tests/qtest/fuzz/qtest_wrappers.c
> index 713c830cdb..0580f8df86 100644
> --- a/tests/qtest/fuzz/qtest_wrappers.c
> +++ b/tests/qtest/fuzz/qtest_wrappers.c
> @@ -12,7 +12,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "cpu.h"
> +#include "hw/core/cpu.h"
> #include "exec/ioport.h"
>
> #include "fuzz.h"
> -----------------------------
>
> Ok now:
> Linking target qemu-fuzz-i386
> clang: warning: argument unused during compilation: '-T
> tests/qtest/fuzz/fork_fuzz.ld' [-Wunused-command-line-argument]
> /usr/bin/ld: libcommon.fa.p/softmmu_main.c.o: in function `main':
> /tmp/qemu/build/../softmmu/main.c:47: multiple definition of `main';
> /usr/lib/llvm-9/lib/clang/9.0.1/lib/linux/libclang_rt.fuzzer-x86_64.a(fuzzer.o):(.text.main+0x0):
> first defined here
> /usr/bin/ld: /tmp/qemu/build/../tests/qtest/fuzz/fork_fuzz.c:22: undefined
> reference to `__FUZZ_COUNTERS_START'
>
> We are _very_ close, but this is where I have no idea how to get meson
> to do what I want. Two things:
> 1.) The flag for linking should be something like:
> -Wl,-T$(SRC_PATH)/tests/qtest/fuzz/fork_fuzz.ld . Right now it is
> -T./tests/qtest/fuzz/fork_fuzz.ld
> 2.) We should not be linking against softmmu_main.c.o
>
> I ran with make -n and copied the last (linking step) command and
> manually made these two changes. With that, I find a binary
> ./qemu-fuzz-i386
> and when I run it, I see all the targets I expect to see.
> But when I run one of the actual targets, I get:
> ./qemu-fuzz-i386 --fuzz-target=virtio-net-slirp -runs=1000
> ERROR: no interesting inputs were found. Is the code instrumented for
> coverage? Exit
> So it looks like the -fsanitize=fuzzer (or fsanitize=fuzzer-no-link)
> flag doesn't get passed anywhere during compilation.. (Confirmed that by
> checking make -n)
>
> This feels very close. If I configure, with
> CFLAGS="-fsanitize=fuzzer" , I'm up and running.
>
> Thanks again. Once I know that I'm doing things right, I can work on
> converting the oss-fuzz build script, so it works with meson.
> -Alex
>
> On 200806 2114, Paolo Bonzini wrote:
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > meson.build | 3 +
> > tests/Makefile.include | 49 +---
> > tests/meson.build | 1 +
> > 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/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/fuzz.c | 2 +-
> > tests/qtest/fuzz/fuzz.h | 2 +-
> > tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
> > tests/qtest/fuzz/qos_fuzz.c | 2 +-
> > tests/qtest/fuzz/virtio_net_fuzz.c | 2 +-
> > tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 +-
> > 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 | 6 +-
> > 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 | 254 +++++++++++++++++
> > 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 | 2 +-
> > 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/test-qga.c | 2 +-
> > tests/test-qgraph.c | 5 +-
> > 148 files changed, 539 insertions(+), 592 deletions(-)
> > delete mode 100644 tests/qtest/Makefile.include
> > rename tests/qtest/{ => libqos}/libqtest.h (100%)
> > create mode 100644 tests/qtest/libqos/meson.build
> > create mode 100644 tests/qtest/meson.build
> >
> > diff --git a/meson.build b/meson.build
> > index 3daa82e..a81516a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -511,6 +511,9 @@ subdir('nbd')
> > subdir('scsi')
> > subdir('block')
> >
> > +# needed for fuzzing binaries
> > +subdir('tests/qtest/libqos')
> > +
> > mods = []
> > block_mods = []
> > softmmu_mods = []
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index a0e5d3e..567ad69 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -109,6 +109,7 @@ check-unit-y += tests/test-qht$(EXESUF)
> > check-unit-y += tests/test-qht-par$(EXESUF)
> > check-unit-y += tests/test-bitops$(EXESUF)
> > check-unit-y += tests/test-bitcnt$(EXESUF)
> > +check-unit-y += tests/test-qgraph$(EXESUF)
> > check-unit-y += tests/check-qom-interface$(EXESUF)
> > check-unit-y += tests/check-qom-proplist$(EXESUF)
> > check-unit-y += tests/test-qemu-opts$(EXESUF)
> > @@ -306,19 +307,6 @@ tests/test-qapi-gen-timestamp: \
> > @rm -f tests/test-qapi-doc.texi
> > @>$@
> >
> > -tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c:
> tests/qtest/dbus-vmstate1-gen-timestamp ;
> > -tests/qtest/dbus-vmstate1-gen-timestamp:
> $(SRC_PATH)/tests/qtest/dbus-vmstate1.xml
> > - $(call quiet-command,$(GDBUS_CODEGEN) $< \
> > - --interface-prefix org.qemu --generate-c-code
> tests/qtest/dbus-vmstate1, \
> > - "GEN","$(@:%-timestamp=%)")
> > - @>$@
> > -
> > -tests/qtest/dbus-vmstate-test.o-cflags := -DSRCDIR="$(SRC_PATH)"
> > -tests/qtest/dbus-vmstate1.o-cflags := $(GIO_CFLAGS)
> > -tests/qtest/dbus-vmstate1.o-libs := $(GIO_LIBS)
> > -
> > -tests/qtest/dbus-vmstate-test.o: tests/qtest/dbus-vmstate1.h
> > -
> > tests/test-string-output-visitor$(EXESUF):
> tests/test-string-output-visitor.o $(test-qapi-obj-y)
> > tests/test-string-input-visitor$(EXESUF):
> tests/test-string-input-visitor.o $(test-qapi-obj-y)
> > tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o
> $(test-qapi-obj-y) tests/test-qapi-emit-events.o tests/test-qapi-events.o
> > @@ -333,6 +321,7 @@ tests/test-shift128$(EXESUF): tests/test-shift128.o
> $(test-util-obj-y)
> > tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y)
> > tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y)
> > tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y)
> > +tests/test-qgraph$(EXESUF): tests/test-qgraph.o
> tests/qtest/libqos/qgraph.o $(test-util-obj-y)
> > tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o
> $(test-crypto-obj-y)
> > tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o
> $(test-crypto-obj-y)
> > tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o
> $(test-crypto-obj-y)
> > @@ -396,10 +385,8 @@ tests/migration/initrd-stress.img:
> tests/migration/stress$(EXESUF)
> > rm $(INITRD_WORK_DIR)/init
> > rmdir $(INITRD_WORK_DIR)
> >
> > -include $(SRC_PATH)/tests/qtest/Makefile.include
> > -
> > tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF)
> > -tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
> > +tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o
> $(test-util-obj-y)
> > tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
> $(test-util-obj-y) libvhost-user.a
> > tests/qemu-iotests/socket_scm_helper$(EXESUF):
> tests/qemu-iotests/socket_scm_helper.o
> >
> > @@ -440,16 +427,6 @@ define do_test_tap
> > "TAP","$@")
> > endef
> >
> > -.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
> > -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%:
> %-softmmu/all $(check-qtest-y)
> > - $(call do_test_human,$(check-qtest-$*-y:%=tests/qtest/%$(EXESUF))
> $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
> > - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> > - QTEST_QEMU_IMG=qemu-img$(EXESUF))
> > -
> > -build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS))
> $(check-qtest-y)
> > -
> > -build-unit: $(check-unit-y)
> > -
> > check-unit: $(check-unit-y)
> > $(call do_test_human, $^)
> >
> > @@ -458,18 +435,9 @@ check-speed: $(check-speed-y)
> >
> > # gtester tests with TAP output
> >
> > -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)):
> check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y)
> > - $(call do_test_tap, $(check-qtest-$*-y:%=tests/qtest/%$(EXESUF))
> $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
> > - QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> > - QTEST_QEMU_IMG=qemu-img$(EXESUF))
> > -
> > check-report-unit.tap: $(check-unit-y)
> > $(call do_test_tap,$^)
> >
> > -# Reports and overall runs
> > -
> > -check-report.tap: $(patsubst %,check-report-qtest-%.tap,
> $(QTEST_TARGETS)) check-report-unit.tap
> > -
> > # Plugins
> > ifeq ($(CONFIG_PLUGIN),y)
> > .PHONY: plugins
> > @@ -582,19 +550,16 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
> get-vm-images
> >
> > # Consolidated targets
> >
> > -.PHONY: check-block check-qtest check-unit check check-clean
> get-vm-images
> > -check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
> > +.PHONY: check-block check-unit check check-clean get-vm-images
> > ifeq ($(CONFIG_TOOLS),y)
> > check-block: $(patsubst %,check-%, $(check-block-y))
> > endif
> > -check-build: build-unit build-qtest
> > +check-build: build-unit
> >
> > -check: check-block check-unit check-qtest
> > +check: check-block check-unit
> > check-clean:
> > rm -rf $(check-unit-y) tests/*.o tests/*/*.o
> $(QEMU_IOTESTS_HELPERS-y)
> > - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST),
> $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF)))
> $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
> > rm -f tests/test-qapi-gen-timestamp
> > - rm -f tests/qtest/dbus-vmstate1-gen-timestamp
> > rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
> >
> > check: check-block check-qapi-schema check-unit check-qtest
> check-decodetree
> > @@ -606,7 +571,5 @@ clean: check-clean
> > all: $(QEMU_IOTESTS_HELPERS-y)
> >
> > -include $(wildcard tests/*.d)
> > --include $(wildcard tests/qtest/*.d)
> > --include $(wildcard tests/qtest/libqos/*.d)
> >
> > endif
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 8be9c22..d724402 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -8,3 +8,4 @@ if 'CONFIG_TCG' in config_host
> > endif
> >
> > subdir('qapi-schema')
> > +subdir('qtest')
> > diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
> > deleted file mode 100644
> > index b0204e4..0000000
> > --- a/tests/qtest/Makefile.include
> > +++ /dev/null
> > @@ -1,332 +0,0 @@
> > -# All QTests for now are POSIX-only, but the dependencies are
> > -# really in libqtest, not in the testcases themselves.
> > -
> > -check-qtest-generic-y += cdrom-test
> > -check-qtest-generic-y += device-introspect-test
> > -check-qtest-generic-y += machine-none-test
> > -check-qtest-generic-y += qmp-test
> > -check-qtest-generic-y += qmp-cmd-test
> > -check-qtest-generic-y += qom-test
> > -check-qtest-generic-$(CONFIG_MODULES) += modules-test
> > -check-qtest-generic-y += test-hmp
> > -
> > -check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test
> > -check-qtest-pci-$(CONFIG_VGA) += display-vga-test
> > -check-qtest-pci-$(CONFIG_HDA) += intel-hda-test
> > -check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
> > -
> > -DBUS_DAEMON := $(shell which dbus-daemon 2>/dev/null)
> > -ifneq ($(GDBUS_CODEGEN),)
> > -ifneq ($(DBUS_DAEMON),)
> > -# Temporarily disabled due to Patchew failures:
> > -#check-qtest-pci-$(CONFIG_GIO) += dbus-vmstate-test
> > -endif
> > -endif
> > -
> > -check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-i386-y += fdc-test
> > -check-qtest-i386-y += ide-test
> > -check-qtest-i386-$(CONFIG_TOOLS) += ahci-test
> > -check-qtest-i386-y += hd-geo-test
> > -check-qtest-i386-y += boot-order-test
> > -check-qtest-i386-y += bios-tables-test
> > -check-qtest-i386-$(CONFIG_SGA) += boot-serial-test
> > -check-qtest-i386-$(CONFIG_SLIRP) += pxe-test
> > -check-qtest-i386-y += rtc-test
> > -check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += ipmi-kcs-test
> > -ifdef CONFIG_LINUX
> > -check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += ipmi-bt-test
> > -endif
> > -check-qtest-i386-y += i440fx-test
> > -check-qtest-i386-y += fw_cfg-test
> > -check-qtest-i386-y += device-plug-test
> > -check-qtest-i386-y += drive_del-test
> > -check-qtest-i386-$(CONFIG_WDT_IB700) += wdt_ib700-test
> > -check-qtest-i386-y += tco-test
> > -check-qtest-i386-y += $(check-qtest-pci-y)
> > -check-qtest-i386-$(CONFIG_PVPANIC) += pvpanic-test
> > -check-qtest-i386-$(CONFIG_I82801B11) += i82801b11-test
> > -check-qtest-i386-$(CONFIG_IOH3420) += ioh3420-test
> > -check-qtest-i386-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
> > -check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=
> usb-hcd-ehci-test
> > -check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
> > -check-qtest-i386-y += cpu-plug-test
> > -check-qtest-i386-y += q35-test
> > -check-qtest-i386-y += vmgenid-test
> > -check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
> > -check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
> > -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
> > -check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
> > -check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
> > -check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
> > -check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
> > -check-qtest-i386-y += migration-test
> > -check-qtest-i386-y += test-x86-cpuid-compat
> > -check-qtest-i386-y += numa-test
> > -
> > -check-qtest-x86_64-y += $(check-qtest-i386-y)
> > -
> > -check-qtest-avr-y += boot-serial-test
> > -
> > -check-qtest-alpha-y += boot-serial-test
> > -check-qtest-alpha-$(CONFIG_VGA) += display-vga-test
> > -
> > -check-qtest-hppa-y += boot-serial-test
> > -check-qtest-hppa-$(CONFIG_VGA) += display-vga-test
> > -
> > -check-qtest-m68k-y = boot-serial-test
> > -
> > -check-qtest-microblaze-y += boot-serial-test
> > -
> > -check-qtest-mips-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-mips-$(CONFIG_VGA) += display-vga-test
> > -
> > -check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-mips64-$(CONFIG_VGA) += display-vga-test
> > -
> > -check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-mips64el-$(CONFIG_VGA) += display-vga-test
> > -
> > -check-qtest-moxie-y += boot-serial-test
> > -
> > -check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-ppc-y += boot-order-test
> > -check-qtest-ppc-y += prom-env-test
> > -check-qtest-ppc-y += drive_del-test
> > -check-qtest-ppc-y += boot-serial-test
> > -check-qtest-ppc-$(CONFIG_M48T59) += m48t59-test
> > -
> > -check-qtest-ppc64-y += $(check-qtest-ppc-y)
> > -check-qtest-ppc64-$(CONFIG_PSERIES) += device-plug-test
> > -check-qtest-ppc64-$(CONFIG_POWERNV) += pnv-xscom-test
> > -check-qtest-ppc64-y += migration-test
> > -check-qtest-ppc64-$(CONFIG_PSERIES) += rtas-test
> > -check-qtest-ppc64-$(CONFIG_SLIRP) += pxe-test
> > -check-qtest-ppc64-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
> > -check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
> > -check-qtest-ppc64-$(CONFIG_SLIRP) += test-netfilter
> > -check-qtest-ppc64-$(CONFIG_POSIX) += test-filter-mirror
> > -check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += test-filter-redirector
> > -check-qtest-ppc64-$(CONFIG_VGA) += display-vga-test
> > -check-qtest-ppc64-y += numa-test
> > -check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
> > -check-qtest-ppc64-y += cpu-plug-test
> > -
> > -check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -
> > -check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -
> > -check-qtest-sparc-y += prom-env-test
> > -check-qtest-sparc-y += m48t59-test
> > -check-qtest-sparc-y += boot-serial-test
> > -
> > -check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = endianness-test
> > -check-qtest-sparc64-y += prom-env-test
> > -check-qtest-sparc64-y += boot-serial-test
> > -
> > -check-qtest-arm-y += arm-cpu-features
> > -check-qtest-arm-y += microbit-test
> > -check-qtest-arm-y += m25p80-test
> > -check-qtest-arm-y += test-arm-mptimer
> > -check-qtest-arm-y += boot-serial-test
> > -check-qtest-arm-y += hexloader-test
> > -check-qtest-arm-$(CONFIG_PFLASH_CFI02) += pflash-cfi02-test
> > -
> > -check-qtest-aarch64-y += arm-cpu-features
> > -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-test
> > -check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) +=
> tpm-tis-device-swtpm-test
> > -check-qtest-aarch64-y += numa-test
> > -check-qtest-aarch64-y += boot-serial-test
> > -check-qtest-aarch64-y += migration-test
> > -
> > -# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test
> unconditional
> > -ifneq ($(ARCH),arm)
> > -check-qtest-aarch64-y += bios-tables-test
> > -endif
> > -
> > -check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
> > -
> > -check-qtest-xtensaeb-y += $(check-qtest-xtensa-y)
> > -
> > -check-qtest-s390x-y = boot-serial-test
> > -check-qtest-s390x-$(CONFIG_SLIRP) += pxe-test
> > -check-qtest-s390x-$(CONFIG_SLIRP) += test-netfilter
> > -check-qtest-s390x-$(CONFIG_POSIX) += test-filter-mirror
> > -check-qtest-s390x-$(CONFIG_POSIX) += test-filter-redirector
> > -check-qtest-s390x-y += drive_del-test
> > -check-qtest-s390x-y += device-plug-test
> > -check-qtest-s390x-y += virtio-ccw-test
> > -check-qtest-s390x-y += cpu-plug-test
> > -check-qtest-s390x-y += migration-test
> > -
> > -# libqos / qgraph :
> > -libqgraph-obj-y = tests/qtest/libqos/qgraph.o
> > -
> > -libqos-core-obj-y = $(libqgraph-obj-y) tests/qtest/libqos/pci.o
> tests/qtest/libqos/fw_cfg.o
> > -libqos-core-obj-y += tests/qtest/libqos/malloc.o
> > -libqos-core-obj-y += tests/qtest/libqos/libqos.o
> > -libqos-spapr-obj-y = $(libqos-core-obj-y)
> tests/qtest/libqos/malloc-spapr.o
> > -libqos-spapr-obj-y += tests/qtest/libqos/libqos-spapr.o
> > -libqos-spapr-obj-y += tests/qtest/libqos/rtas.o
> > -libqos-spapr-obj-y += tests/qtest/libqos/pci-spapr.o
> > -libqos-pc-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/pci-pc.o
> > -libqos-pc-obj-y += tests/qtest/libqos/malloc-pc.o
> tests/qtest/libqos/libqos-pc.o
> > -libqos-pc-obj-y += tests/qtest/libqos/ahci.o
> > -libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
> tests/qtest/libqos/usb.o
> > -
> > -# qos devices:
> > -libqos-obj-y = $(libqgraph-obj-y)
> > -libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> > -libqos-obj-y += tests/qtest/libqos/qos_external.o
> > -libqos-obj-y += tests/qtest/libqos/e1000e.o
> > -libqos-obj-y += tests/qtest/libqos/i2c.o
> > -libqos-obj-y += tests/qtest/libqos/i2c-imx.o
> > -libqos-obj-y += tests/qtest/libqos/i2c-omap.o
> > -libqos-obj-y += tests/qtest/libqos/sdhci.o
> > -libqos-obj-y += tests/qtest/libqos/tpci200.o
> > -libqos-obj-y += tests/qtest/libqos/virtio.o
> > -libqos-obj-$(CONFIG_VIRTFS) += tests/qtest/libqos/virtio-9p.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-balloon.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-blk.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-mmio.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-net.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-pci.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-pci-modern.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-rng.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-scsi.o
> > -libqos-obj-y += tests/qtest/libqos/virtio-serial.o
> > -
> > -# qos machines:
> > -libqos-obj-y += tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-imx25-pdk-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-n800-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-raspi2-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-sabrelite-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-smdkc210-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-virt-machine.o
> > -libqos-obj-y += tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o
> > -libqos-obj-y += tests/qtest/libqos/ppc64_pseries-machine.o
> > -libqos-obj-y += tests/qtest/libqos/x86_64_pc-machine.o
> > -
> > -# qos tests:
> > -qos-test-obj-y += tests/qtest/qos-test.o
> > -qos-test-obj-y += tests/qtest/ac97-test.o
> > -qos-test-obj-y += tests/qtest/ds1338-test.o
> > -qos-test-obj-y += tests/qtest/e1000-test.o
> > -qos-test-obj-y += tests/qtest/e1000e-test.o
> > -qos-test-obj-y += tests/qtest/eepro100-test.o
> > -qos-test-obj-y += tests/qtest/es1370-test.o
> > -qos-test-obj-y += tests/qtest/ipoctal232-test.o
> > -qos-test-obj-y += tests/qtest/megasas-test.o
> > -qos-test-obj-y += tests/qtest/ne2000-test.o
> > -qos-test-obj-y += tests/qtest/tulip-test.o
> > -qos-test-obj-y += tests/qtest/nvme-test.o
> > -qos-test-obj-y += tests/qtest/pca9552-test.o
> > -qos-test-obj-y += tests/qtest/pci-test.o
> > -qos-test-obj-y += tests/qtest/pcnet-test.o
> > -qos-test-obj-y += tests/qtest/sdhci-test.o
> > -qos-test-obj-y += tests/qtest/spapr-phb-test.o
> > -qos-test-obj-y += tests/qtest/tmp105-test.o
> > -qos-test-obj-y += tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
> > -qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o
> $(chardev-obj-y) $(test-io-obj-y)
> > -qos-test-obj-y += tests/qtest/virtio-test.o
> > -qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o
> > -qos-test-obj-y += tests/qtest/virtio-blk-test.o
> > -qos-test-obj-y += tests/qtest/virtio-net-test.o
> > -qos-test-obj-y += tests/qtest/virtio-rng-test.o
> > -qos-test-obj-y += tests/qtest/virtio-scsi-test.o
> > -qos-test-obj-y += tests/qtest/virtio-serial-test.o
> > -qos-test-obj-y += tests/qtest/vmxnet3-test.o
> > -
> > -check-unit-y += tests/test-qgraph$(EXESUF)
> > -tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)
> > -
> > -check-qtest-generic-y += qos-test
> > -tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y)
> > -
> > -# QTest dependencies:
> > -tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o
> > -tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o
> > -tests/qtest/device-introspect-test$(EXESUF):
> tests/qtest/device-introspect-test.o
> > -tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o
> > -tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o
> > -tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o
> > -tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o
> > -tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o
> > -tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o
> $(libqos-obj-y)
> > -tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o
> $(libqos-spapr-obj-y)
> > -tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o
> > -tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y)
> > -tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o
> $(libqos-pc-obj-y) qemu-img$(EXESUF)
> > -tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o
> > -tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o
> > -tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o
> $(libqos-obj-y)
> > -tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o
> $(libqos-obj-y)
> > -tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o
> $(libqos-obj-y)
> > -tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \
> > - tests/qtest/tpm-emu.o $(test-io-obj-y) \
> > - tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y)
> > -tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o
> tests/qtest/boot-sector.o $(libqos-obj-y)
> > -tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o
> > -tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o
> > -tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o
> $(libqos-pc-obj-y)
> > -tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y)
> > -tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o
> $(libqos-pc-obj-y)
> > -tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o
> $(libqos-pc-obj-y)
> > -tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o
> > -tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o
> > -tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y)
> > -tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o
> > -tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o
> > -tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o
> > -tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o
> > -tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o
> > -tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o
> > -tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
> > -tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o
> > -tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o
> > -tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o
> > -tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o
> > -tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o
> > -tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o
> $(libqos-usb-obj-y)
> > -tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o
> $(libqos-usb-obj-y)
> > -tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o
> $(libqos-usb-obj-y)
> > -tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o
> > -tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o
> tests/qtest/migration-helpers.o
> > -tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o
> $(qtest-obj-y)
> > -tests/qtest/test-filter-mirror$(EXESUF):
> tests/qtest/test-filter-mirror.o $(qtest-obj-y)
> > -tests/qtest/test-filter-redirector$(EXESUF):
> tests/qtest/test-filter-redirector.o $(qtest-obj-y)
> > -tests/qtest/test-x86-cpuid-compat$(EXESUF):
> tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
> > -tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o
> contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
> $(libqos-spapr-obj-y)
> > -tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o
> tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o
> $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> > -tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
> > -tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
> > -tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o
> tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
> > -tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o
> tests/qtest/boot-sector.o $(libqos-obj-y)
> > -tests/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o
> > -tests/qtest/tpm-crb-swtpm-test$(EXESUF):
> tests/qtest/tpm-crb-swtpm-test.o tests/qtest/tpm-emu.o \
> > - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> > -tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o
> tests/qtest/tpm-emu.o $(test-io-obj-y)
> > -tests/qtest/tpm-tis-swtpm-test$(EXESUF):
> tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \
> > - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> > -tests/qtest/tpm-tis-device-swtpm-test$(EXESUF):
> tests/qtest/tpm-tis-device-swtpm-test.o tests/qtest/tpm-emu.o \
> > - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
> > -tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o
> tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
> > -tests/qtest/tpm-tis-device-test$(EXESUF):
> tests/qtest/tpm-tis-device-test.o tests/qtest/tpm-tis-util.o
> tests/qtest/tpm-emu.o $(test-io-obj-y)
> > -
> > -# QTest rules
> > -
> > -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
> > -QTEST_TARGETS =
> > -# The qtests are not runnable (yet) under TSan due to a known issue.
> > -# https://github.com/google/sanitizers/issues/1116
> > -ifndef CONFIG_TSAN
> > -ifeq ($(CONFIG_POSIX),y)
> > -QTEST_TARGETS = $(TARGETS)
> > -check-qtest-y=$(foreach TARGET,$(TARGETS),
> $(check-qtest-$(TARGET)-y:%=tests/qtest/%$(EXESUF)))
> > -check-qtest-y += $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF))
> > -endif
> > -endif
> > -
> > -qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y)
> > -$(check-qtest-y): $(qtest-obj-y)
> > diff --git a/tests/qtest/ac97-test.c b/tests/qtest/ac97-test.c
> > index b084e31..e09f249 100644
> > --- a/tests/qtest/ac97-test.c
> > +++ b/tests/qtest/ac97-test.c
> > @@ -8,7 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/module.h"
> > #include "libqos/qgraph.h"
> > #include "libqos/pci.h"
> > diff --git a/tests/qtest/acpi-utils.h b/tests/qtest/acpi-utils.h
> > index 0c86780..261784d 100644
> > --- a/tests/qtest/acpi-utils.h
> > +++ b/tests/qtest/acpi-utils.h
> > @@ -13,7 +13,7 @@
> > #ifndef TEST_ACPI_UTILS_H
> > #define TEST_ACPI_UTILS_H
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> >
> > /* DSDT and SSDTs format */
> > typedef struct {
> > diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> > index c8d42ce..ca4294f 100644
> > --- a/tests/qtest/ahci-test.c
> > +++ b/tests/qtest/ahci-test.c
> > @@ -25,7 +25,7 @@
> > #include "qemu/osdep.h"
> > #include <getopt.h>
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/libqos-pc.h"
> > #include "libqos/ahci.h"
> > #include "libqos/pci-pc.h"
> > diff --git a/tests/qtest/arm-cpu-features.c
> b/tests/qtest/arm-cpu-features.c
> > index f7e062c..77b5e30 100644
> > --- a/tests/qtest/arm-cpu-features.c
> > +++ b/tests/qtest/arm-cpu-features.c
> > @@ -10,7 +10,7 @@
> > */
> > #include "qemu/osdep.h"
> > #include "qemu/bitops.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qapi/qmp/qdict.h"
> > #include "qapi/qmp/qjson.h"
> >
> > diff --git a/tests/qtest/boot-order-test.c
> b/tests/qtest/boot-order-test.c
> > index 2f1c072..fac580d 100644
> > --- a/tests/qtest/boot-order-test.c
> > +++ b/tests/qtest/boot-order-test.c
> > @@ -12,7 +12,7 @@
> >
> > #include "qemu/osdep.h"
> > #include "libqos/fw_cfg.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qapi/qmp/qdict.h"
> > #include "standard-headers/linux/qemu_fw_cfg.h"
> >
> > diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> > index 9e66c6d..24df5c4 100644
> > --- a/tests/qtest/boot-sector.c
> > +++ b/tests/qtest/boot-sector.c
> > @@ -13,7 +13,7 @@
> > #include "qemu/osdep.h"
> > #include "boot-sector.h"
> > #include "qemu-common.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> >
> > #define LOW(x) ((x) & 0xff)
> > #define HIGH(x) ((x) >> 8)
> > diff --git a/tests/qtest/boot-sector.h b/tests/qtest/boot-sector.h
> > index 6ee6bb4..b339fde 100644
> > --- a/tests/qtest/boot-sector.h
> > +++ b/tests/qtest/boot-sector.h
> > @@ -14,7 +14,7 @@
> > #ifndef TEST_BOOT_SECTOR_H
> > #define TEST_BOOT_SECTOR_H
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> >
> > /* Create boot disk file. fname must be a suitable string for mkstemp()
> */
> > int boot_sector_init(char *fname);
> > diff --git a/tests/qtest/boot-serial-test.c
> b/tests/qtest/boot-serial-test.c
> > index bfe7624..b6b1c23 100644
> > --- a/tests/qtest/boot-serial-test.c
> > +++ b/tests/qtest/boot-serial-test.c
> > @@ -14,7 +14,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/libqos-spapr.h"
> >
> > static const uint8_t bios_avr[] = {
> > diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
> > index 833a050..e9afab6 100644
> > --- a/tests/qtest/cdrom-test.c
> > +++ b/tests/qtest/cdrom-test.c
> > @@ -11,7 +11,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "boot-sector.h"
> > #include "qapi/qmp/qdict.h"
> >
> > diff --git a/tests/qtest/dbus-vmstate-test.c
> b/tests/qtest/dbus-vmstate-test.c
> > index 2e5e47d..aca9b98 100644
> > --- a/tests/qtest/dbus-vmstate-test.c
> > +++ b/tests/qtest/dbus-vmstate-test.c
> > @@ -1,7 +1,7 @@
> > #include "qemu/osdep.h"
> > #include <glib/gstdio.h>
> > #include <gio/gio.h>
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu-common.h"
> > #include "dbus-vmstate1.h"
> > #include "migration-helpers.h"
> > diff --git a/tests/qtest/device-introspect-test.c
> b/tests/qtest/device-introspect-test.c
> > index d68b785..9f22340 100644
> > --- a/tests/qtest/device-introspect-test.c
> > +++ b/tests/qtest/device-introspect-test.c
> > @@ -22,7 +22,7 @@
> > #include "qapi/qmp/qstring.h"
> > #include "qapi/qmp/qdict.h"
> > #include "qapi/qmp/qlist.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> >
> > const char common_args[] = "-nodefaults -machine none";
> >
> > diff --git a/tests/qtest/device-plug-test.c
> b/tests/qtest/device-plug-test.c
> > index 318e422..9214892 100644
> > --- a/tests/qtest/device-plug-test.c
> > +++ b/tests/qtest/device-plug-test.c
> > @@ -11,7 +11,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qapi/qmp/qdict.h"
> > #include "qapi/qmp/qstring.h"
> >
> > diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c
> > index 5f8839b..2ab11ad 100644
> > --- a/tests/qtest/drive_del-test.c
> > +++ b/tests/qtest/drive_del-test.c
> > @@ -11,7 +11,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/virtio.h"
> > #include "qapi/qmp/qdict.h"
> >
> > diff --git a/tests/qtest/ds1338-test.c b/tests/qtest/ds1338-test.c
> > index f6ade9a..c5d46bc 100644
> > --- a/tests/qtest/ds1338-test.c
> > +++ b/tests/qtest/ds1338-test.c
> > @@ -18,7 +18,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/i2c.h"
> >
> > #define DS1338_ADDR 0x68
> > diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c
> > index c387984..ea286d1 100644
> > --- a/tests/qtest/e1000-test.c
> > +++ b/tests/qtest/e1000-test.c
> > @@ -8,7 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/module.h"
> > #include "libqos/qgraph.h"
> > #include "libqos/pci.h"
> > diff --git a/tests/qtest/eepro100-test.c b/tests/qtest/eepro100-test.c
> > index 8dbffff..d72ad09 100644
> > --- a/tests/qtest/eepro100-test.c
> > +++ b/tests/qtest/eepro100-test.c
> > @@ -8,7 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/module.h"
> > #include "libqos/qgraph.h"
> > #include "libqos/pci.h"
> > diff --git a/tests/qtest/endianness-test.c
> b/tests/qtest/endianness-test.c
> > index cc088ac..4e79e22 100644
> > --- a/tests/qtest/endianness-test.c
> > +++ b/tests/qtest/endianness-test.c
> > @@ -13,7 +13,7 @@
> >
> > #include "qemu/osdep.h"
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/bswap.h"
> >
> > typedef struct TestCase TestCase;
> > diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c
> > index adccdac..2fd7fd2 100644
> > --- a/tests/qtest/es1370-test.c
> > +++ b/tests/qtest/es1370-test.c
> > @@ -8,7 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/module.h"
> > #include "libqos/qgraph.h"
> > #include "libqos/pci.h"
> > diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
> > index 031594a..1ceea84 100644
> > --- a/tests/qtest/fuzz/fuzz.c
> > +++ b/tests/qtest/fuzz/fuzz.c
> > @@ -20,7 +20,7 @@
> > #include "sysemu/sysemu.h"
> > #include "qemu/main-loop.h"
> > #include "qemu/rcu.h"
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> > #include "tests/qtest/libqos/qgraph.h"
> > #include "fuzz.h"
> >
> > diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h
> > index 9ca3d10..8eb765e 100644
> > --- a/tests/qtest/fuzz/fuzz.h
> > +++ b/tests/qtest/fuzz/fuzz.h
> > @@ -18,7 +18,7 @@
> > #include "qemu/units.h"
> > #include "qapi/error.h"
> >
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> >
> > /**
> > * A libfuzzer fuzzing target
> > diff --git a/tests/qtest/fuzz/i440fx_fuzz.c
> b/tests/qtest/fuzz/i440fx_fuzz.c
> > index bf966d4..f45373f 100644
> > --- a/tests/qtest/fuzz/i440fx_fuzz.c
> > +++ b/tests/qtest/fuzz/i440fx_fuzz.c
> > @@ -13,7 +13,7 @@
> > #include "qemu/osdep.h"
> >
> > #include "qemu/main-loop.h"
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> > #include "tests/qtest/libqos/pci.h"
> > #include "tests/qtest/libqos/pci-pc.h"
> > #include "fuzz.h"
> > diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> > index d52f3eb..b943577 100644
> > --- a/tests/qtest/fuzz/qos_fuzz.c
> > +++ b/tests/qtest/fuzz/qos_fuzz.c
> > @@ -25,7 +25,7 @@
> > #include "sysemu/sysemu.h"
> > #include "qemu/main-loop.h"
> >
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> > #include "tests/qtest/libqos/malloc.h"
> > #include "tests/qtest/libqos/qgraph.h"
> > #include "tests/qtest/libqos/qgraph_internal.h"
> > diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c
> b/tests/qtest/fuzz/virtio_net_fuzz.c
> > index a33bd73..277a9e2 100644
> > --- a/tests/qtest/fuzz/virtio_net_fuzz.c
> > +++ b/tests/qtest/fuzz/virtio_net_fuzz.c
> > @@ -13,7 +13,7 @@
> > #include "qemu/osdep.h"
> >
> > #include "standard-headers/linux/virtio_config.h"
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> > #include "tests/qtest/libqos/virtio-net.h"
> > #include "fuzz.h"
> > #include "fork_fuzz.h"
> > diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c
> b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> > index 3a9ea13..977ac42 100644
> > --- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
> > +++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
> > @@ -12,7 +12,7 @@
> >
> > #include "qemu/osdep.h"
> >
> > -#include "tests/qtest/libqtest.h"
> > +#include "tests/qtest/libqos/libqtest.h"
> > #include "libqos/virtio-scsi.h"
> > #include "libqos/virtio.h"
> > #include "libqos/virtio-pci.h"
> > diff --git a/tests/qtest/fw_cfg-test.c b/tests/qtest/fw_cfg-test.c
> > index 5dc807b..95b3907 100644
> > --- a/tests/qtest/fw_cfg-test.c
> > +++ b/tests/qtest/fw_cfg-test.c
> > @@ -12,7 +12,7 @@
> >
> > #include "qemu/osdep.h"
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "standard-headers/linux/qemu_fw_cfg.h"
> > #include "libqos/fw_cfg.h"
> > #include "qemu/bswap.h"
> > diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> > index 48e8e02..f7b7cfb 100644
> > --- a/tests/qtest/hd-geo-test.c
> > +++ b/tests/qtest/hd-geo-test.c
> > @@ -19,7 +19,7 @@
> > #include "qemu-common.h"
> > #include "qemu/bswap.h"
> > #include "qapi/qmp/qlist.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/fw_cfg.h"
> > #include "libqos/libqos.h"
> > #include "standard-headers/linux/qemu_fw_cfg.h"
> > diff --git a/tests/qtest/hexloader-test.c b/tests/qtest/hexloader-test.c
> > index 8b7aa2d..5615020 100644
> > --- a/tests/qtest/hexloader-test.c
> > +++ b/tests/qtest/hexloader-test.c
> > @@ -10,7 +10,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> >
> > /* Load 'test.hex' and verify that the in-memory contents are as
> expected.
> > * 'test.hex' is a memory test pattern stored in Hexadecimal Object
> > diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> > index 5cfd97f..3f8081e 100644
> > --- a/tests/qtest/ide-test.c
> > +++ b/tests/qtest/ide-test.c
> > @@ -25,7 +25,7 @@
> > #include "qemu/osdep.h"
> >
> >
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "libqos/libqos.h"
> > #include "libqos/pci-pc.h"
> > #include "libqos/malloc-pc.h"
> > diff --git a/tests/qtest/ipoctal232-test.c
> b/tests/qtest/ipoctal232-test.c
> > index 53a8c9b..65ce10b 100644
> > --- a/tests/qtest/ipoctal232-test.c
> > +++ b/tests/qtest/ipoctal232-test.c
> > @@ -8,7 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu/module.h"
> > #include "libqos/qgraph.h"
> >
> > diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> > index ecda256..d5c8b9f 100644
> > --- a/tests/qtest/ivshmem-test.c
> > +++ b/tests/qtest/ivshmem-test.c
> > @@ -13,7 +13,7 @@
> > #include "contrib/ivshmem-server/ivshmem-server.h"
> > #include "libqos/libqos-pc.h"
> > #include "libqos/libqos-spapr.h"
> > -#include "libqtest.h"
> > +#include "libqos/libqtest.h"
> > #include "qemu-common.h"
> >
> > #define TMPSHMSIZE (1 << 20)
> > diff --git a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> > index 8f827ae..79631cc 100644
> > --- a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> > +++ b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
> > @@ -19,8 +19,8 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "sdhci.h"
> >
> > typedef struct QXlnxZCU102Machine QXlnxZCU102Machine;
> > diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> > index cc1b08e..2946abc 100644
> > --- a/tests/qtest/libqos/ahci.c
> > +++ b/tests/qtest/libqos/ahci.c
> > @@ -25,8 +25,8 @@
> > #include "qemu/osdep.h"
> >
> > #include "libqtest.h"
> > -#include "libqos/ahci.h"
> > -#include "libqos/pci-pc.h"
> > +#include "ahci.h"
> > +#include "pci-pc.h"
> >
> > #include "qemu-common.h"
> > #include "qemu/host-utils.h"
> > @@ -579,7 +579,7 @@ void ahci_write_fis(AHCIQState *ahci, AHCICommand
> *cmd)
> > /* NCQ commands use exclusively 8 bit fields and needs no
> adjustment.
> > * Only the count field needs to be adjusted for non-NCQ commands.
> > * The auxiliary FIS fields are defined per-command and are not
> currently
> > - * implemented in libqos/ahci.o, but may or may not need to be
> flipped. */
> > + * implemented in ahci.o, but may or may not need to be flipped. */
> > if (!cmd->props->ncq) {
> > tmp.count = cpu_to_le16(tmp.count);
> > }
> > diff --git a/tests/qtest/libqos/ahci.h b/tests/qtest/libqos/ahci.h
> > index 44ab110..88835b6 100644
> > --- a/tests/qtest/libqos/ahci.h
> > +++ b/tests/qtest/libqos/ahci.h
> > @@ -25,9 +25,9 @@
> > * THE SOFTWARE.
> > */
> >
> > -#include "libqos/libqos.h"
> > -#include "libqos/pci.h"
> > -#include "libqos/malloc-pc.h"
> > +#include "libqos.h"
> > +#include "pci.h"
> > +#include "malloc-pc.h"
> >
> > /*** Supplementary PCI Config Space IDs & Masks ***/
> > #define PCI_DEVICE_ID_INTEL_Q35_AHCI (0x2922)
> > diff --git a/tests/qtest/libqos/arm-imx25-pdk-machine.c
> b/tests/qtest/libqos/arm-imx25-pdk-machine.c
> > index 0da3f19..6692adf 100644
> > --- a/tests/qtest/libqos/arm-imx25-pdk-machine.c
> > +++ b/tests/qtest/libqos/arm-imx25-pdk-machine.c
> > @@ -20,9 +20,9 @@
> >
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > -#include "libqos/i2c.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > +#include "i2c.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > #define IMX25_PDK_RAM_START 0x80000000
> > diff --git a/tests/qtest/libqos/arm-n800-machine.c
> b/tests/qtest/libqos/arm-n800-machine.c
> > index 35f8207..ff2049c 100644
> > --- a/tests/qtest/libqos/arm-n800-machine.c
> > +++ b/tests/qtest/libqos/arm-n800-machine.c
> > @@ -20,9 +20,9 @@
> >
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > -#include "libqos/i2c.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > +#include "i2c.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > #define N800_RAM_START 0x80000000
> > diff --git a/tests/qtest/libqos/arm-raspi2-machine.c
> b/tests/qtest/libqos/arm-raspi2-machine.c
> > index 8480d80..35bb470 100644
> > --- a/tests/qtest/libqos/arm-raspi2-machine.c
> > +++ b/tests/qtest/libqos/arm-raspi2-machine.c
> > @@ -19,8 +19,8 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "sdhci.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > diff --git a/tests/qtest/libqos/arm-sabrelite-machine.c
> b/tests/qtest/libqos/arm-sabrelite-machine.c
> > index f6e403b..72425f0 100644
> > --- a/tests/qtest/libqos/arm-sabrelite-machine.c
> > +++ b/tests/qtest/libqos/arm-sabrelite-machine.c
> > @@ -19,8 +19,8 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "sdhci.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > diff --git a/tests/qtest/libqos/arm-smdkc210-machine.c
> b/tests/qtest/libqos/arm-smdkc210-machine.c
> > index eebac7f..321b882 100644
> > --- a/tests/qtest/libqos/arm-smdkc210-machine.c
> > +++ b/tests/qtest/libqos/arm-smdkc210-machine.c
> > @@ -19,8 +19,8 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "sdhci.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > diff --git a/tests/qtest/libqos/arm-virt-machine.c
> b/tests/qtest/libqos/arm-virt-machine.c
> > index 9316598..e0f5932 100644
> > --- a/tests/qtest/libqos/arm-virt-machine.c
> > +++ b/tests/qtest/libqos/arm-virt-machine.c
> > @@ -19,9 +19,9 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > -#include "libqos/virtio-mmio.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > +#include "virtio-mmio.h"
> >
> > #define ARM_PAGE_SIZE 4096
> > #define VIRTIO_MMIO_BASE_ADDR 0x0A003E00
> > diff --git a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> > index 473acce..56e53c7 100644
> > --- a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> > +++ b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
> > @@ -19,8 +19,8 @@
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > #include "qemu/module.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "sdhci.h"
> >
> > typedef struct QXilinxZynqA9Machine QXilinxZynqA9Machine;
> > diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c
> > index e2927ed..a451f61 100644
> > --- a/tests/qtest/libqos/e1000e.c
> > +++ b/tests/qtest/libqos/e1000e.c
> > @@ -18,13 +18,13 @@
> >
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > -#include "libqos/pci-pc.h"
> > +#include "pci-pc.h"
> > #include "qemu/sockets.h"
> > #include "qemu/iov.h"
> > #include "qemu/module.h"
> > #include "qemu/bitops.h"
> > -#include "libqos/malloc.h"
> > -#include "libqos/qgraph.h"
> > +#include "malloc.h"
> > +#include "qgraph.h"
> > #include "e1000e.h"
> >
> > #define E1000E_IMS (0x00d0)
> > diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h
> > index 35183b2..a22f5fd 100644
> > --- a/tests/qtest/libqos/e1000e.h
> > +++ b/tests/qtest/libqos/e1000e.h
> > @@ -19,7 +19,7 @@
> > #ifndef QGRAPH_E1000E_H
> > #define QGRAPH_E1000E_H
> >
> > -#include "libqos/qgraph.h"
> > +#include "qgraph.h"
> > #include "pci.h"
> >
> > #define E1000E_RX0_MSG_ID (0)
> > diff --git a/tests/qtest/libqos/fw_cfg.c b/tests/qtest/libqos/fw_cfg.c
> > index 1f46258..6b8e1ba 100644
> > --- a/tests/qtest/libqos/fw_cfg.c
> > +++ b/tests/qtest/libqos/fw_cfg.c
> > @@ -13,7 +13,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqos/fw_cfg.h"
> > +#include "fw_cfg.h"
> > #include "libqtest.h"
> > #include "qemu/bswap.h"
> > #include "hw/nvram/fw_cfg.h"
> > diff --git a/tests/qtest/libqos/i2c-imx.c b/tests/qtest/libqos/i2c-imx.c
> > index f33ece5..8f9a7e3 100644
> > --- a/tests/qtest/libqos/i2c-imx.c
> > +++ b/tests/qtest/libqos/i2c-imx.c
> > @@ -18,7 +18,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqos/i2c.h"
> > +#include "i2c.h"
> >
> >
> > #include "libqtest.h"
> > diff --git a/tests/qtest/libqos/i2c-omap.c
> b/tests/qtest/libqos/i2c-omap.c
> > index 9ae8214..eb4e453 100644
> > --- a/tests/qtest/libqos/i2c-omap.c
> > +++ b/tests/qtest/libqos/i2c-omap.c
> > @@ -7,7 +7,7 @@
> > * See the COPYING file in the top-level directory.
> > */
> > #include "qemu/osdep.h"
> > -#include "libqos/i2c.h"
> > +#include "i2c.h"
> >
> >
> > #include "qemu/bswap.h"
> > diff --git a/tests/qtest/libqos/i2c.c b/tests/qtest/libqos/i2c.c
> > index 38f800d..ade1bdb 100644
> > --- a/tests/qtest/libqos/i2c.c
> > +++ b/tests/qtest/libqos/i2c.c
> > @@ -7,7 +7,7 @@
> > * See the COPYING file in the top-level directory.
> > */
> > #include "qemu/osdep.h"
> > -#include "libqos/i2c.h"
> > +#include "i2c.h"
> > #include "libqtest.h"
> >
> > void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
> > diff --git a/tests/qtest/libqos/i2c.h b/tests/qtest/libqos/i2c.h
> > index c65f087..1341bac 100644
> > --- a/tests/qtest/libqos/i2c.h
> > +++ b/tests/qtest/libqos/i2c.h
> > @@ -10,7 +10,7 @@
> > #define LIBQOS_I2C_H
> >
> > #include "libqtest.h"
> > -#include "libqos/qgraph.h"
> > +#include "qgraph.h"
> >
> > typedef struct I2CAdapter I2CAdapter;
> > struct I2CAdapter {
> > diff --git a/tests/qtest/libqos/libqos-pc.c
> b/tests/qtest/libqos/libqos-pc.c
> > index d04abc5..db420a5 100644
> > --- a/tests/qtest/libqos/libqos-pc.c
> > +++ b/tests/qtest/libqos/libqos-pc.c
> > @@ -1,7 +1,7 @@
> > #include "qemu/osdep.h"
> > -#include "libqos/libqos-pc.h"
> > -#include "libqos/malloc-pc.h"
> > -#include "libqos/pci-pc.h"
> > +#include "libqos-pc.h"
> > +#include "malloc-pc.h"
> > +#include "pci-pc.h"
> >
> > static QOSOps qos_ops = {
> > .alloc_init = pc_alloc_init,
> > diff --git a/tests/qtest/libqos/libqos-pc.h
> b/tests/qtest/libqos/libqos-pc.h
> > index a0e4c45..1a9923e 100644
> > --- a/tests/qtest/libqos/libqos-pc.h
> > +++ b/tests/qtest/libqos/libqos-pc.h
> > @@ -1,7 +1,7 @@
> > #ifndef LIBQOS_PC_H
> > #define LIBQOS_PC_H
> >
> > -#include "libqos/libqos.h"
> > +#include "libqos.h"
> >
> > QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap);
> > QOSState *qtest_pc_boot(const char *cmdline_fmt, ...);
> > diff --git a/tests/qtest/libqos/libqos-spapr.c
> b/tests/qtest/libqos/libqos-spapr.c
> > index 8766d54..db0e87b 100644
> > --- a/tests/qtest/libqos/libqos-spapr.c
> > +++ b/tests/qtest/libqos/libqos-spapr.c
> > @@ -1,7 +1,7 @@
> > #include "qemu/osdep.h"
> > -#include "libqos/libqos-spapr.h"
> > -#include "libqos/malloc-spapr.h"
> > -#include "libqos/pci-spapr.h"
> > +#include "libqos-spapr.h"
> > +#include "malloc-spapr.h"
> > +#include "pci-spapr.h"
> >
> > static QOSOps qos_ops = {
> > .alloc_init = spapr_alloc_init,
> > diff --git a/tests/qtest/libqos/libqos-spapr.h
> b/tests/qtest/libqos/libqos-spapr.h
> > index 49bd72d..c613389 100644
> > --- a/tests/qtest/libqos/libqos-spapr.h
> > +++ b/tests/qtest/libqos/libqos-spapr.h
> > @@ -1,7 +1,7 @@
> > #ifndef LIBQOS_SPAPR_H
> > #define LIBQOS_SPAPR_H
> >
> > -#include "libqos/libqos.h"
> > +#include "libqos.h"
> >
> > QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap);
> > QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...);
> > diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c
> > index f229eb2..2251e86 100644
> > --- a/tests/qtest/libqos/libqos.c
> > +++ b/tests/qtest/libqos/libqos.c
> > @@ -2,8 +2,8 @@
> > #include <sys/wait.h>
> >
> > #include "libqtest.h"
> > -#include "libqos/libqos.h"
> > -#include "libqos/pci.h"
> > +#include "libqos.h"
> > +#include "pci.h"
> > #include "qapi/qmp/qdict.h"
> >
> > /*** Test Setup & Teardown ***/
> > diff --git a/tests/qtest/libqos/libqos.h b/tests/qtest/libqos/libqos.h
> > index 8e971c2..e0b2bfe 100644
> > --- a/tests/qtest/libqos/libqos.h
> > +++ b/tests/qtest/libqos/libqos.h
> > @@ -2,8 +2,8 @@
> > #define LIBQOS_H
> >
> > #include "libqtest.h"
> > -#include "libqos/pci.h"
> > -#include "libqos/malloc.h"
> > +#include "pci.h"
> > +#include "malloc.h"
> >
> > typedef struct QOSState QOSState;
> >
> > diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqos/libqtest.h
> > similarity index 100%
> > rename from tests/qtest/libqtest.h
> > rename to tests/qtest/libqos/libqtest.h
> > diff --git a/tests/qtest/libqos/malloc-pc.c
> b/tests/qtest/libqos/malloc-pc.c
> > index 6f92ce4..16ff960 100644
> > --- a/tests/qtest/libqos/malloc-pc.c
> > +++ b/tests/qtest/libqos/malloc-pc.c
> > @@ -11,8 +11,8 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqos/malloc-pc.h"
> > -#include "libqos/fw_cfg.h"
> > +#include "malloc-pc.h"
> > +#include "fw_cfg.h"
> >
> > #include "standard-headers/linux/qemu_fw_cfg.h"
> >
> > diff --git a/tests/qtest/libqos/malloc-pc.h
> b/tests/qtest/libqos/malloc-pc.h
> > index 21e75ae..d8d7985 100644
> > --- a/tests/qtest/libqos/malloc-pc.h
> > +++ b/tests/qtest/libqos/malloc-pc.h
> > @@ -13,7 +13,7 @@
> > #ifndef LIBQOS_MALLOC_PC_H
> > #define LIBQOS_MALLOC_PC_H
> >
> > -#include "libqos/malloc.h"
> > +#include "malloc.h"
> >
> > void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts
> flags);
> >
> > diff --git a/tests/qtest/libqos/malloc-spapr.c
> b/tests/qtest/libqos/malloc-spapr.c
> > index 2a6b7e3..84862e4 100644
> > --- a/tests/qtest/libqos/malloc-spapr.c
> > +++ b/tests/qtest/libqos/malloc-spapr.c
> > @@ -6,7 +6,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqos/malloc-spapr.h"
> > +#include "malloc-spapr.h"
> >
> > #include "qemu-common.h"
> >
> > diff --git a/tests/qtest/libqos/malloc-spapr.h
> b/tests/qtest/libqos/malloc-spapr.h
> > index e5fe9bf..f99572f 100644
> > --- a/tests/qtest/libqos/malloc-spapr.h
> > +++ b/tests/qtest/libqos/malloc-spapr.h
> > @@ -8,7 +8,7 @@
> > #ifndef LIBQOS_MALLOC_SPAPR_H
> > #define LIBQOS_MALLOC_SPAPR_H
> >
> > -#include "libqos/malloc.h"
> > +#include "malloc.h"
> >
> > void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts
> flags);
> >
> > diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> > index 615422a..f708b01 100644
> > --- a/tests/qtest/libqos/malloc.c
> > +++ b/tests/qtest/libqos/malloc.c
> > @@ -11,7 +11,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > -#include "libqos/malloc.h"
> > +#include "malloc.h"
> > #include "qemu-common.h"
> > #include "qemu/host-utils.h"
> >
> > diff --git a/tests/qtest/libqos/meson.build
> b/tests/qtest/libqos/meson.build
> > new file mode 100644
> > index 0000000..e39e779
> > --- /dev/null
> > +++ b/tests/qtest/libqos/meson.build
> > @@ -0,0 +1,57 @@
> > +libqos = static_library('libqos',
> > + files('../libqtest.c',
> > + 'qgraph.c',
> > + 'qos_external.c',
> > +
[-- Attachment #2: Type: text/html, Size: 87710 bytes --]
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:18 ` Paolo Bonzini
@ 2020-08-10 9:58 ` Cornelia Huck
2020-08-10 10:04 ` Cornelia Huck
0 siblings, 1 reply; 250+ messages in thread
From: Cornelia Huck @ 2020-08-10 9:58 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Fri, 7 Aug 2020 17:18:42 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/08/20 14:20, Cornelia Huck wrote:
> >> - on an s390x system, it mostly builds, but I end up with a bunch of
> >> link errors for libblock.fa, where it fails to find various ZSTD_
> >> symbols
> > Still happening after switching to the latest version of your branch.
> >
>
> Fixed thusly:
(...)
Thanks, that makes it build now on my LPAR, and it seems to have
created a working qemu-system-s390x.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-10 9:58 ` Cornelia Huck
@ 2020-08-10 10:04 ` Cornelia Huck
2020-08-10 11:16 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Cornelia Huck @ 2020-08-10 10:04 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Mon, 10 Aug 2020 11:58:51 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> On Fri, 7 Aug 2020 17:18:42 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> > On 07/08/20 14:20, Cornelia Huck wrote:
> > >> - on an s390x system, it mostly builds, but I end up with a bunch of
> > >> link errors for libblock.fa, where it fails to find various ZSTD_
> > >> symbols
> > > Still happening after switching to the latest version of your branch.
> > >
> >
> > Fixed thusly:
>
> (...)
>
> Thanks, that makes it build now on my LPAR, and it seems to have
> created a working qemu-system-s390x.
'make check' is unhappy, however:
Running test qtest-s390x: device-introspect-test
missing object type 'virtio-gpu-device'
Broken pipe
../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
ERROR qtest-s390x: device-introspect-test - too few tests run (expected 6, got 5)
Any idea why virtio-gpu is missing? I'd expect it to be included by
default.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:58 ` Daniel P. Berrangé
@ 2020-08-10 10:32 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-10 10:32 UTC (permalink / raw)
To: Daniel P. Berrangé, Paolo Bonzini
Cc: Peter Maydell, John Snow, Markus Armbruster, QEMU Developers,
Stefan Hajnoczi, Alex Bennée
On 8/7/20 5:58 PM, Daniel P. Berrangé wrote:
> On Fri, Aug 07, 2020 at 05:14:06PM +0200, Paolo Bonzini wrote:
>> That one exception, the one thing that disappoints me of the whole
>> conversion, is the trace.h files. The current solution is one of the
>> first parts I did of the conversion and I have never touched it since; I
>> think it can be improved (I can even think of two ways to do it), but I
>> don't really have the time to do it now. But even that bit is just
>> ugly, not unmaintainable, and I really see nothing in the conversion
>> that is a step back for QEMU's long term maintainability and our ability
>> to develop new features.
>
> I was never entirely happy with the trace.h stuff even in "make".
> Trying to maintain the "trace.h" name for every generated header
> was probably a mistake in retrospect. it caused me so much pain
> trying to get the "make" rules correct so that we resolved the
> right trace.h in each case. I was deperately trying to avoid
> updating the #include lines, but I'm not sure it was worth
> it in the end. Would have been easier to just generate a unique
> header file name for each dir and update the #includes.
Never too late. Having unique trace headers would allow us to reuse
trace functions in different modules.
I.e.:
- hexdump()
- cases where multi-devices not well split in subsystem parts
. xen out of i386
. net could reuse mdio
. rocker out of net
. can out of net
. reuse semihosting traces in target/
- cases with buses where the device is target-specific
>
> Regards,
> Daniel
>
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-07 15:30 ` Paolo Bonzini
@ 2020-08-10 10:34 ` Philippe Mathieu-Daudé
2020-08-10 11:20 ` Paolo Bonzini
0 siblings, 1 reply; 250+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-10 10:34 UTC (permalink / raw)
To: Paolo Bonzini, Daniel P. Berrangé
Cc: peter.maydell, jsnow, qemu-devel, armbru, stefanha, alex.bennee
On 8/7/20 5:30 PM, Paolo Bonzini wrote:
> On 07/08/20 16:29, Daniel P. Berrangé wrote:
>> New binaries have lost a bunch of libraries they previously linked
>> to. This isn't neccessarily a bug, if the old make code was incorrectly
>> adding too many libraries.
>
> Yes this is because Meson uses --as-needed.
Maybe worth a patch at the beginning of the series, before
starting the conversion?
Phil.
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-10 10:04 ` Cornelia Huck
@ 2020-08-10 11:16 ` Paolo Bonzini
2020-08-10 11:54 ` Cornelia Huck
0 siblings, 1 reply; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-10 11:16 UTC (permalink / raw)
To: Cornelia Huck
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On 10/08/20 12:04, Cornelia Huck wrote:
> 'make check' is unhappy, however:
>
> Running test qtest-s390x: device-introspect-test
> missing object type 'virtio-gpu-device'
> Broken pipe
> ../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
> ERROR qtest-s390x: device-introspect-test - too few tests run (expected 6, got 5)
It could be an unnecessary dependency on virgl that was detected by the GitLab CI:
diff --git a/hw/display/meson.build b/hw/display/meson.build
index ffcccc0..fa4f806 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -77,7 +77,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
#hw_display_modules += [[ 'virtio-gpu', virtio_gpu.sources(), [pixman, virgl],
# ['CONFIG_VIRTIO_GPU']]]
- softmmu_ss.add_all(when: [pixman, virgl, 'CONFIG_VIRTIO_GPU'],
+ softmmu_ss.add_all(when: [pixman, 'CONFIG_VIRTIO_GPU'],
if_true: virtio_gpu_ss)
endif
In any case I'll post another version today or tomorrow. (I decided to bite the
bullet, include the unit tests conversion and get rid of more Makefile gunk).
Paolo
^ permalink raw reply related [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-10 10:34 ` Philippe Mathieu-Daudé
@ 2020-08-10 11:20 ` Paolo Bonzini
0 siblings, 0 replies; 250+ messages in thread
From: Paolo Bonzini @ 2020-08-10 11:20 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Daniel P. Berrangé
Cc: peter.maydell, jsnow, qemu-devel, armbru, stefanha, alex.bennee
On 10/08/20 12:34, Philippe Mathieu-Daudé wrote:
>>> New binaries have lost a bunch of libraries they previously linked
>>> to. This isn't neccessarily a bug, if the old make code was incorrectly
>>> adding too many libraries.
>> Yes this is because Meson uses --as-needed.
> Maybe worth a patch at the beginning of the series, before
> starting the conversion?
Could be, yes. Thanks for the idea!
Paolo
^ permalink raw reply [flat|nested] 250+ messages in thread
* Re: [DRAFT PATCH 000/143] Meson integration for 5.2
2020-08-10 11:16 ` Paolo Bonzini
@ 2020-08-10 11:54 ` Cornelia Huck
0 siblings, 0 replies; 250+ messages in thread
From: Cornelia Huck @ 2020-08-10 11:54 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, berrange, philmd, qemu-devel, armbru, alex.bennee,
stefanha, jsnow
On Mon, 10 Aug 2020 13:16:03 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 10/08/20 12:04, Cornelia Huck wrote:
> > 'make check' is unhappy, however:
> >
> > Running test qtest-s390x: device-introspect-test
> > missing object type 'virtio-gpu-device'
> > Broken pipe
> > ../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
> > ERROR qtest-s390x: device-introspect-test - too few tests run (expected 6, got 5)
>
> It could be an unnecessary dependency on virgl that was detected by the GitLab CI:
>
> diff --git a/hw/display/meson.build b/hw/display/meson.build
> index ffcccc0..fa4f806 100644
> --- a/hw/display/meson.build
> +++ b/hw/display/meson.build
> @@ -77,7 +77,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
> #hw_display_modules += [[ 'virtio-gpu', virtio_gpu.sources(), [pixman, virgl],
> # ['CONFIG_VIRTIO_GPU']]]
>
> - softmmu_ss.add_all(when: [pixman, virgl, 'CONFIG_VIRTIO_GPU'],
> + softmmu_ss.add_all(when: [pixman, 'CONFIG_VIRTIO_GPU'],
> if_true: virtio_gpu_ss)
> endif
Yes, that gets me further along.
> In any case I'll post another version today or tomorrow. (I decided to bite the
> bullet, include the unit tests conversion and get rid of more Makefile gunk).
I have another one for you :)
Building tests/test-coroutine gives me another link error in
libblock.fa(block_qcow2-threads.c.o) (again, some missing zstd symbols;
let me know if you need more info.)
^ permalink raw reply [flat|nested] 250+ messages in thread
end of thread, other threads:[~2020-08-10 11:55 UTC | newest]
Thread overview: 250+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-06 19:13 [DRAFT PATCH 000/143] Meson integration for 5.2 Paolo Bonzini
2020-08-06 19:13 ` [PATCH 001/143] tests: move socket_scm_helper back to tests/ Paolo Bonzini
2020-08-06 21:50 ` Philippe Mathieu-Daudé
2020-08-06 19:13 ` [PATCH 002/143] optionrom: simplify Makefile Paolo Bonzini
2020-08-06 19:13 ` [PATCH 003/143] pc-bios/s390-ccw: " Paolo Bonzini
2020-08-07 12:58 ` Thomas Huth
2020-08-07 13:55 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 004/143] trace: switch position of headers to what Meson requires Paolo Bonzini
2020-08-06 19:14 ` [PATCH 005/143] meson: rename .inc.c files to .inc Paolo Bonzini
2020-08-07 8:59 ` Peter Maydell
2020-08-07 9:23 ` Paolo Bonzini
2020-08-07 9:30 ` Peter Maydell
2020-08-07 9:49 ` Paolo Bonzini
2020-08-07 10:00 ` Alex Bennée
2020-08-07 10:06 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 006/143] build-sys hack: ensure target directory is there Paolo Bonzini
2020-08-06 19:14 ` [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64 Paolo Bonzini
2020-08-07 13:06 ` Philippe Mathieu-Daudé
2020-08-07 13:21 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 008/143] tests/vm: check for Python YAML parser in the Makefile Paolo Bonzini
2020-08-07 13:11 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 009/143] configure: do not include $(...) variables in config-host.mak Paolo Bonzini
2020-08-07 13:09 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 010/143] configure: expand path variables for meson configure Paolo Bonzini
2020-08-06 19:14 ` [PATCH 011/143] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson Paolo Bonzini
2020-08-06 19:14 ` [PATCH 012/143] configure: integrate Meson in the build system Paolo Bonzini
2020-08-06 19:14 ` [PATCH 013/143] configure: generate Meson cross file Paolo Bonzini
2020-08-06 19:14 ` [PATCH 014/143] build-sys hack: link with whole .fa archives Paolo Bonzini
2020-08-06 19:14 ` [PATCH 015/143] build-sys: add meson submodule Paolo Bonzini
2020-08-07 10:37 ` Alex Bennée
2020-08-07 10:47 ` Paolo Bonzini
2020-08-06 19:14 ` [PATCH 016/143] meson: move summary to meson.build Paolo Bonzini
2020-08-06 19:14 ` [PATCH 017/143] meson: enable pie Paolo Bonzini
2020-08-06 19:14 ` [PATCH 018/143] meson: use coverage option Paolo Bonzini
2020-08-06 19:14 ` [PATCH 019/143] meson: add sparse support Paolo Bonzini
2020-08-06 19:14 ` [PATCH 020/143] meson: add testsuite Makefile generator Paolo Bonzini
2020-08-07 10:48 ` Alex Bennée
2020-08-07 10:49 ` Paolo Bonzini
2020-08-07 11:18 ` Alex Bennée
2020-08-06 19:14 ` [PATCH 021/143] libqemuutil, qapi, trace: convert to meson Paolo Bonzini
2020-08-06 19:14 ` [PATCH 022/143] meson: add remaining generated tcg trace helpers Paolo Bonzini
2020-08-06 19:14 ` [PATCH 023/143] meson: add version.o Paolo Bonzini
2020-08-06 19:14 ` [PATCH 024/143] contrib/libvhost-user: convert to Meson Paolo Bonzini
2020-08-06 19:14 ` [PATCH 025/143] tools/virtiofsd: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 026/143] contrib/vhost-user-blk: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 027/143] contrib/vhost-user-scsi: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 028/143] contrib/rdmacm-mux: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 029/143] contrib/vhost-user-input: convert to meson Paolo Bonzini
2020-08-06 19:14 ` [PATCH 030/143] contrib/vhost-user-gpu: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 031/143] contrib/ivshmem: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 032/143] contrib/elf2dmp: " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 033/143] meson: convert qemu-ga Paolo Bonzini
2020-08-06 19:14 ` [PATCH 034/143] meson: convert vss-win32 Paolo Bonzini
2020-08-06 19:14 ` [PATCH 035/143] meson: add msi generation Paolo Bonzini
2020-08-06 19:14 ` [PATCH 036/143] meson: convert dummy Windows qga/qemu-ga target Paolo Bonzini
2020-08-06 19:14 ` [PATCH 037/143] meson: add qemu-bridge-helper Paolo Bonzini
2020-08-07 13:20 ` Philippe Mathieu-Daudé
2020-08-07 14:26 ` Paolo Bonzini
2020-08-07 14:40 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 038/143] meson: add qemu-keymap Paolo Bonzini
2020-08-06 19:14 ` [PATCH 039/143] meson: add qemu-edid Paolo Bonzini
2020-08-07 13:21 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 040/143] meson: add virtfs-proxy-helper Paolo Bonzini
2020-08-06 19:14 ` [PATCH 041/143] meson: keymap-gen Paolo Bonzini
2020-08-06 19:14 ` [PATCH 042/143] meson: generate qemu-version.h Paolo Bonzini
2020-08-06 19:14 ` [PATCH 043/143] meson: generate shader headers Paolo Bonzini
2020-08-06 19:14 ` [PATCH 044/143] meson: generate hxtool files Paolo Bonzini
2020-08-06 19:14 ` [PATCH 045/143] meson: uncompress edk2 bios Paolo Bonzini
2020-08-07 13:26 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 046/143] meson: convert check-decodetree Paolo Bonzini
2020-08-06 19:14 ` [PATCH 047/143] meson: convert tests/fp and check-softfloat Paolo Bonzini
2020-08-06 19:14 ` [PATCH 048/143] meson: convert check-qapi-schema Paolo Bonzini
2020-08-06 19:14 ` [PATCH 049/143] meson: convert qom directory to Meson (tools part) Paolo Bonzini
2020-08-06 19:14 ` [PATCH 050/143] meson: convert authz directory to Meson Paolo Bonzini
2020-08-06 19:14 ` [PATCH 051/143] meson: convert crypto " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 052/143] meson: convert io " Paolo Bonzini
2020-08-06 19:14 ` [PATCH 053/143] meson: convert target/s390x/gen-features.h Paolo Bonzini
2020-08-06 19:14 ` [PATCH 054/143] meson: infrastructure for building emulators Paolo Bonzini
2020-08-06 19:14 ` [PATCH 055/143] meson: add macos dependencies Paolo Bonzini
2020-08-06 19:14 ` [PATCH 056/143] meson: add modules infrastructure Paolo Bonzini
2020-08-06 19:14 ` [PATCH 057/143] meson: convert chardev directory to Meson (tools part) Paolo Bonzini
2020-08-07 13:29 ` Philippe Mathieu-Daudé
2020-08-06 19:14 ` [PATCH 058/143] meson: convert block Paolo Bonzini
2020-08-06 19:14 ` [PATCH 059/143] meson: qemu-{img,io,nbd} Paolo Bonzini
2020-08-06 19:14 ` [PATCH 060/143] meson: qemu-pr-helper Paolo Bonzini
2020-08-06 19:14 ` [PATCH 061/143] configure, Makefile; remove TOOLS and HELPERS-y variable Paolo Bonzini
2020-08-06 19:14 ` [PATCH 062/143] meson: convert chardev directory to Meson (emulator part) Paolo Bonzini
2020-08-06 19:14 ` [PATCH 063/143] meson: convert tests/qtest to meson Paolo Bonzini
2020-08-07 17:22 ` Alexander Bulekov
2020-08-07 18:22 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 064/143] meson: convert audio directory to Meson Paolo Bonzini
2020-08-06 19:15 ` [PATCH 065/143] meson: convert ui " Paolo Bonzini
2020-08-06 19:15 ` [PATCH 066/143] meson: convert root " Paolo Bonzini
2020-08-06 19:15 ` [PATCH 067/143] meson: convert most of softmmu/ Paolo Bonzini
2020-08-06 19:15 ` [PATCH 068/143] " Paolo Bonzini
2020-08-07 13:36 ` Philippe Mathieu-Daudé
2020-08-07 14:18 ` Paolo Bonzini
2020-08-07 14:39 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 069/143] meson: convert trace/ Paolo Bonzini
2020-08-06 19:15 ` [PATCH 070/143] meson: convert block/ Paolo Bonzini
2020-08-07 13:37 ` Philippe Mathieu-Daudé
2020-08-07 14:21 ` Paolo Bonzini
2020-08-06 19:15 ` [PATCH 071/143] meson: convert dump/ Paolo Bonzini
2020-08-06 19:15 ` [PATCH 072/143] meson: convert common QMP bits for qemu and qemu-storage-daemon Paolo Bonzini
2020-08-06 19:15 ` [PATCH 073/143] meson: convert qemu-storage-daemon Paolo Bonzini
2020-08-06 19:15 ` [PATCH 074/143] meson: convert replay directory to Meson Paolo Bonzini
2020-08-06 19:15 ` [PATCH 075/143] meson: convert migration " Paolo Bonzini
2020-08-06 19:15 ` [PATCH 076/143] meson: convert net " Paolo Bonzini
2020-08-06 19:15 ` [PATCH 077/143] meson: convert backends " Paolo Bonzini
2020-08-06 19:15 ` [PATCH 078/143] meson: convert fsdev/ Paolo Bonzini
2020-08-06 19:15 ` [PATCH 079/143] meson: convert disas directory to Meson Paolo Bonzini
2020-08-06 19:15 ` [PATCH 080/143] meson: convert qapi-specific to meson Paolo Bonzini
2020-08-06 19:15 ` [PATCH 081/143] meson: convert hw/xen Paolo Bonzini
2020-08-06 19:15 ` [PATCH 082/143] meson: convert hw/core Paolo Bonzini
2020-08-06 19:15 ` [PATCH 083/143] meson: convert hw/semihosting Paolo Bonzini
2020-08-06 19:15 ` [PATCH 084/143] meson: convert hw/nubus Paolo Bonzini
2020-08-06 19:15 ` [PATCH 085/143] meson: convert hw/smbios Paolo Bonzini
2020-08-06 19:15 ` [PATCH 086/143] meson: convert hw/mem Paolo Bonzini
2020-08-06 19:15 ` [PATCH 087/143] meson: convert hw/watchdog Paolo Bonzini
2020-08-06 19:15 ` [PATCH 088/143] meson: convert hw/virtio Paolo Bonzini
2020-08-06 19:15 ` [PATCH 089/143] meson: convert hw/vfio Paolo Bonzini
2020-08-06 19:15 ` [PATCH 090/143] meson: convert hw/usb Paolo Bonzini
2020-08-06 19:15 ` [PATCH 091/143] meson: convert hw/tpm Paolo Bonzini
2020-08-06 19:15 ` [PATCH 092/143] meson: convert hw/timer Paolo Bonzini
2020-08-06 19:15 ` [PATCH 093/143] meson: convert hw/rtc Paolo Bonzini
2020-08-06 19:15 ` [PATCH 094/143] meson: convert hw/ssi Paolo Bonzini
2020-08-06 19:15 ` [PATCH 095/143] meson: convert hw/sd Paolo Bonzini
2020-08-06 21:43 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 096/143] meson: convert hw/scsi Paolo Bonzini
2020-08-06 19:15 ` [PATCH 097/143] meson: convert hw/pcmcia Paolo Bonzini
2020-08-06 19:15 ` [PATCH 098/143] meson: convert hw/pci-host Paolo Bonzini
2020-08-06 19:15 ` [PATCH 099/143] meson: convert hw/pci-bridge Paolo Bonzini
2020-08-06 19:15 ` [PATCH 100/143] meson: convert hw/pci Paolo Bonzini
2020-08-06 19:15 ` [PATCH 101/143] meson: convert hw/nvram Paolo Bonzini
2020-08-06 19:15 ` [PATCH 102/143] meson: convert hw/rdma Paolo Bonzini
2020-08-06 19:15 ` [PATCH 103/143] meson: convert hw/net Paolo Bonzini
2020-08-06 19:15 ` [PATCH 104/143] meson: convert hw/misc Paolo Bonzini
2020-08-06 19:15 ` [PATCH 105/143] meson: convert hw/isa Paolo Bonzini
2020-08-06 19:15 ` [PATCH 106/143] meson: convert hw/ipmi Paolo Bonzini
2020-08-07 14:42 ` Corey Minyard
2020-08-06 19:15 ` [PATCH 107/143] meson: convert hw/ipack Paolo Bonzini
2020-08-06 19:15 ` [PATCH 108/143] meson: convert hw/intc Paolo Bonzini
2020-08-06 21:02 ` Peter Maydell
2020-08-06 21:20 ` Paolo Bonzini
2020-08-06 21:42 ` Philippe Mathieu-Daudé
2020-08-06 19:15 ` [PATCH 109/143] meson: convert hw/input Paolo Bonzini
2020-08-06 19:15 ` [PATCH 110/143] meson: convert hw/ide Paolo Bonzini
2020-08-06 19:15 ` [PATCH 111/143] meson: convert hw/i2c Paolo Bonzini
2020-08-07 13:41 ` Philippe Mathieu-Daudé
2020-08-07 14:45 ` Corey Minyard
2020-08-06 19:15 ` [PATCH 112/143] meson: convert hw/hyperv Paolo Bonzini
2020-08-06 19:15 ` [PATCH 113/143] meson: convert hw/gpio Paolo Bonzini
2020-08-06 19:15 ` [PATCH 114/143] meson: convert hw/dma Paolo Bonzini
2020-08-06 19:15 ` [PATCH 115/143] meson: convert hw/display Paolo Bonzini
2020-08-06 19:15 ` [PATCH 116/143] meson: convert hw/cpu Paolo Bonzini
2020-08-06 19:15 ` [PATCH 117/143] meson: convert hw/char Paolo Bonzini
2020-08-06 19:15 ` [PATCH 118/143] meson: convert hw/block Paolo Bonzini
2020-08-06 19:15 ` [PATCH 119/143] meson: convert hw/audio Paolo Bonzini
2020-08-06 19:15 ` [PATCH 120/143] meson: convert hw/adc Paolo Bonzini
2020-08-06 19:15 ` [PATCH 121/143] meson: convert hw/acpi Paolo Bonzini
2020-08-06 19:15 ` [PATCH 122/143] meson: convert hw/9pfs, cleanup Paolo Bonzini
2020-08-06 19:15 ` [PATCH 123/143] meson: convert hw/arch* Paolo Bonzini
2020-08-06 19:16 ` [PATCH 124/143] meson: target Paolo Bonzini
2020-08-07 9:04 ` Peter Maydell
2020-08-07 9:11 ` Paolo Bonzini
2020-08-06 19:16 ` [PATCH 125/143] meson: accel Paolo Bonzini
2020-08-06 19:16 ` [PATCH 126/143] meson: linux-user Paolo Bonzini
2020-08-06 19:16 ` [PATCH 127/143] meson: bsd-user Paolo Bonzini
2020-08-06 19:16 ` [PATCH 128/143] meson: cpu-emu Paolo Bonzini
2020-08-06 19:16 ` [PATCH 129/143] meson: plugins Paolo Bonzini
2020-08-06 19:16 ` [PATCH 130/143] meson: link emulators without Makefile.target Paolo Bonzini
2020-08-06 19:16 ` [PATCH 131/143] meson: convert systemtap files Paolo Bonzini
2020-08-06 19:16 ` [PATCH 132/143] rules.mak: remove version.o Paolo Bonzini
2020-08-06 19:16 ` [PATCH 133/143] remove Makefile.target Paolo Bonzini
2020-08-06 19:16 ` [PATCH 134/143] meson: sphinx-build Paolo Bonzini
2020-08-06 19:16 ` [PATCH 135/143] meson: build texi doc Paolo Bonzini
2020-08-06 19:16 ` [PATCH 136/143] meson: convert check-block Paolo Bonzini
2020-08-06 19:16 ` [PATCH 137/143] rules.mak: drop unneeded macros Paolo Bonzini
2020-08-06 19:16 ` [PATCH 138/143] meson: replace create-config with meson configure_file Paolo Bonzini
2020-08-06 19:16 ` [PATCH 139/143] meson: convert sample plugins Paolo Bonzini
2020-08-06 19:16 ` [PATCH 140/143] meson: move SDL and SDL-image detection to meson Paolo Bonzini
2020-08-06 19:16 ` [PATCH 141/143] meson: convert VNC and dependent libraries " Paolo Bonzini
2020-08-06 19:16 ` [PATCH 142/143] meson: convert po/ Paolo Bonzini
2020-08-06 19:16 ` [PATCH 143/143] meson: update build-system documentation Paolo Bonzini
2020-08-07 6:53 ` [DRAFT PATCH 000/143] Meson integration for 5.2 Cornelia Huck
2020-08-07 7:59 ` Paolo Bonzini
2020-08-07 9:35 ` Cornelia Huck
2020-08-07 12:20 ` Cornelia Huck
2020-08-07 15:18 ` Paolo Bonzini
2020-08-10 9:58 ` Cornelia Huck
2020-08-10 10:04 ` Cornelia Huck
2020-08-10 11:16 ` Paolo Bonzini
2020-08-10 11:54 ` Cornelia Huck
2020-08-07 8:01 ` 罗勇刚(Yonggang Luo)
2020-08-07 8:11 ` Paolo Bonzini
2020-08-07 8:31 ` 罗勇刚(Yonggang Luo)
2020-08-07 8:40 ` Paolo Bonzini
2020-08-07 10:05 ` Alex Bennée
2020-08-07 10:15 ` Paolo Bonzini
2020-08-07 10:29 ` Alex Bennée
2020-08-07 10:53 ` Paolo Bonzini
2020-08-07 7:56 ` Markus Armbruster
2020-08-07 8:22 ` Daniel P. Berrangé
2020-08-07 8:42 ` Philippe Mathieu-Daudé
2020-08-07 9:02 ` Markus Armbruster
2020-08-07 9:06 ` Daniel P. Berrangé
2020-08-07 9:15 ` Philippe Mathieu-Daudé
2020-08-07 9:20 ` Peter Maydell
2020-08-07 9:25 ` Paolo Bonzini
2020-08-07 10:53 ` Alex Bennée
2020-08-07 10:56 ` Peter Maydell
2020-08-07 8:39 ` Paolo Bonzini
2020-08-07 13:55 ` Markus Armbruster
2020-08-07 14:02 ` Peter Maydell
2020-08-07 15:14 ` Paolo Bonzini
2020-08-07 15:26 ` Peter Maydell
2020-08-07 16:01 ` Paolo Bonzini
2020-08-07 15:58 ` Daniel P. Berrangé
2020-08-10 10:32 ` Philippe Mathieu-Daudé
2020-08-07 8:49 ` Peter Maydell
2020-08-07 9:02 ` Paolo Bonzini
2020-08-07 9:06 ` Thomas Huth
2020-08-07 9:18 ` Daniel P. Berrangé
2020-08-07 9:22 ` Peter Maydell
2020-08-07 11:04 ` Alex Bennée
2020-08-07 9:28 ` Paolo Bonzini
2020-08-07 9:21 ` Daniel P. Berrangé
2020-08-07 8:51 ` Thomas Huth
2020-08-07 8:59 ` Paolo Bonzini
2020-08-07 9:31 ` Paolo Bonzini
2020-08-07 9:45 ` Thomas Huth
2020-08-07 9:49 ` Thomas Huth
2020-08-07 9:52 ` Thomas Huth
2020-08-07 10:00 ` Thomas Huth
2020-08-07 10:20 ` Paolo Bonzini
2020-08-07 10:52 ` Thomas Huth
2020-08-07 11:04 ` Paolo Bonzini
2020-08-07 12:20 ` Thomas Huth
2020-08-07 12:40 ` Paolo Bonzini
2020-08-07 12:52 ` Paolo Bonzini
2020-08-07 10:03 ` Paolo Bonzini
2020-08-07 9:51 ` Paolo Bonzini
2020-08-07 10:02 ` Thomas Huth
2020-08-07 10:08 ` Paolo Bonzini
2020-08-07 10:25 ` Cornelia Huck
2020-08-07 10:50 ` Paolo Bonzini
2020-08-07 14:29 ` Daniel P. Berrangé
2020-08-07 15:30 ` Paolo Bonzini
2020-08-10 10:34 ` Philippe Mathieu-Daudé
2020-08-10 11:20 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.