From: Paolo Bonzini <pbonzini@redhat.com>
To: Alexander Bulekov <alxndr@bu.edu>
Cc: "Thomas Huth" <thuth@redhat.com>,
qemu-devel <qemu-devel@nongnu.org>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Bandan Das" <bsd@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: Re: [PATCH 063/143] meson: convert tests/qtest to meson
Date: Fri, 7 Aug 2020 20:22:55 +0200 [thread overview]
Message-ID: <CABgObfb9LroZBOW=dfEFWoVumugNi0CyTnzD72MqSG8Qt+s=hQ@mail.gmail.com> (raw)
In-Reply-To: <20200807172225.bd5i7dhacq64c6td@mozz.bu.edu>
[-- 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 --]
next prev parent reply other threads:[~2020-08-07 18:24 UTC|newest]
Thread overview: 250+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABgObfb9LroZBOW=dfEFWoVumugNi0CyTnzD72MqSG8Qt+s=hQ@mail.gmail.com' \
--to=pbonzini@redhat.com \
--cc=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.