tests: move libqtest.h back under qtest/

Since commit a2ce7dbd91 ("meson: convert tests/qtest to meson"), libqtest.h is under libqos/ directory, while libqtest.c is still in qtest/. Move back to its original location to avoid mixing with libqos/. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
4 years ago · 907b5105f1
142 changed files with 141 additions and 141 deletions
--- a/docs/devel/qtest.rst
+++ b/docs/devel/qtest.rst
@ -88,4 +88,4 @@ QTest Protocol
 libqtest API reference
 ----------------------

-.. kernel-doc:: tests/qtest/libqos/libqtest.h
+.. kernel-doc:: tests/qtest/libqtest.h
--- a/scripts/oss-fuzz/output_reproducer.py
+++ b/scripts/oss-fuzz/output_reproducer.py
@ -36,7 +36,7 @@ def c_header(owner):

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

    """.format(date=date.today().year, owner=owner)

--- a/tests/qtest/ac97-test.c
+++ b/tests/qtest/ac97-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 /* DSDT and SSDTs format */
 typedef struct {
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include <getopt.h>

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/libqos-pc.h"
 #include "libqos/ahci.h"
 #include "libqos/pci-pc.h"
--- a/tests/qtest/am53c974-test.c
+++ b/tests/qtest/am53c974-test.c
@ -9,7 +9,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"


 static void test_cmdfifo_underflow_ok(void)
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"

--- a/tests/qtest/aspeed_hace-test.c
+++ b/tests/qtest/aspeed_hace-test.c
@ -7,7 +7,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/bitops.h"

 #define HACE_CMD                 0x10
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qapi/qmp/qdict.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"

--- a/tests/qtest/boot-sector.c
+++ b/tests/qtest/boot-sector.c
@ -12,7 +12,7 @@
 */
 #include "qemu/osdep.h"
 #include "boot-sector.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 #define LOW(x) ((x) & 0xff)
 #define HIGH(x) ((x) >> 8)
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 /* Create boot disk file. fname must be a suitable string for mkstemp() */
 int boot_sector_init(char *fname);
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@ -14,7 +14,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/libqos-spapr.h"

 static const uint8_t bios_avr[] = {
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@ -11,7 +11,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "boot-sector.h"
 #include "qapi/qmp/qdict.h"

--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@ -2,7 +2,7 @@
 #include "qemu/dbus.h"
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "dbus-display1.h"

 static GDBusConnection*
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"
 #include "dbus-vmstate1.h"
 #include "migration-helpers.h"

--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@ -21,7 +21,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 const char common_args[] = "-nodefaults -machine none";

--- a/tests/qtest/device-plug-test.c
+++ b/tests/qtest/device-plug-test.c
@ -11,7 +11,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

--- a/tests/qtest/drive_del-test.c
+++ b/tests/qtest/drive_del-test.c
@ -11,7 +11,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/virtio.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
--- a/tests/qtest/ds1338-test.c
+++ b/tests/qtest/ds1338-test.c
@ -18,7 +18,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/i2c.h"

 #define DS1338_ADDR 0x68
--- a/tests/qtest/e1000-test.c
+++ b/tests/qtest/e1000-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
--- a/tests/qtest/eepro100-test.c
+++ b/tests/qtest/eepro100-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
--- a/tests/qtest/endianness-test.c
+++ b/tests/qtest/endianness-test.c
@ -13,7 +13,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/bswap.h"

 typedef struct TestCase TestCase;
--- a/tests/qtest/erst-test.c
+++ b/tests/qtest/erst-test.c
@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "libqos/libqos-pc.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 #include "hw/pci/pci.h"

--- a/tests/qtest/es1370-test.c
+++ b/tests/qtest/es1370-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
--- a/tests/qtest/fuzz-e1000e-test.c
+++ b/tests/qtest/fuzz-e1000e-test.c
@ -8,7 +8,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * https://bugs.launchpad.net/qemu/+bug/1879531
--- a/tests/qtest/fuzz-lsi53c895a-test.c
+++ b/tests/qtest/fuzz-lsi53c895a-test.c
@ -6,7 +6,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * This used to trigger the assert in lsi_do_dma()
--- a/tests/qtest/fuzz-megasas-test.c
+++ b/tests/qtest/fuzz-megasas-test.c
@ -9,7 +9,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * This used to trigger the assert in scsi_dma_complete
--- a/tests/qtest/fuzz-sb16-test.c
+++ b/tests/qtest/fuzz-sb16-test.c
@ -7,7 +7,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * This used to trigger the assert in audio_calloc
--- a/tests/qtest/fuzz-sdcard-test.c
+++ b/tests/qtest/fuzz-sdcard-test.c
@ -7,7 +7,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * https://gitlab.com/qemu-project/qemu/-/issues/450
--- a/tests/qtest/fuzz-virtio-scsi-test.c
+++ b/tests/qtest/fuzz-virtio-scsi-test.c
@ -9,7 +9,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * Here a MemoryRegionCache pointed to an MMIO region but had a
--- a/tests/qtest/fuzz-xlnx-dp-test.c
+++ b/tests/qtest/fuzz-xlnx-dp-test.c
@ -7,7 +7,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 /*
 * This used to trigger the out-of-bounds read in xlnx_dp_read
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@ -21,7 +21,7 @@
 #include "sysemu/runstate.h"
 #include "qemu/main-loop.h"
 #include "qemu/rcu.h"
-#include "tests/qtest/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/qgraph.h"
 #include "fuzz.h"

--- a/tests/qtest/fuzz/fuzz.h
+++ b/tests/qtest/fuzz/fuzz.h
@ -17,7 +17,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"

-#include "tests/qtest/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"

 /**
 * A libfuzzer fuzzing target
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@ -15,7 +15,7 @@
 #include <wordexp.h>

 #include "hw/core/cpu.h"
-#include "tests/qtest/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/pci-pc.h"
 #include "fuzz.h"
 #include "fork_fuzz.h"
--- 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/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/pci.h"
 #include "tests/qtest/libqos/pci-pc.h"
 #include "fuzz.h"
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@ -22,7 +22,7 @@
 #include "exec/memory.h"
 #include "qemu/main-loop.h"

-#include "tests/qtest/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/malloc.h"
 #include "tests/qtest/libqos/qgraph.h"
 #include "tests/qtest/libqos/qgraph_internal.h"
--- a/tests/qtest/fuzz/virtio_blk_fuzz.c
+++ b/tests/qtest/fuzz/virtio_blk_fuzz.c
@ -11,7 +11,7 @@

 #include "qemu/osdep.h"

-#include "tests/qtest/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/virtio-blk.h"
 #include "tests/qtest/libqos/virtio.h"
 #include "tests/qtest/libqos/virtio-pci.h"
--- 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/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/virtio-net.h"
 #include "fuzz.h"
 #include "fork_fuzz.h"
--- 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/libqos/libqtest.h"
+#include "tests/qtest/libqtest.h"
 #include "tests/qtest/libqos/virtio-scsi.h"
 #include "tests/qtest/libqos/virtio.h"
 #include "tests/qtest/libqos/virtio-pci.h"
--- a/tests/qtest/fw_cfg-test.c
+++ b/tests/qtest/fw_cfg-test.c
@ -12,7 +12,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"
 #include "libqos/fw_cfg.h"
 #include "qemu/bswap.h"
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
 #include "qapi/qmp/qlist.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/fw_cfg.h"
 #include "libqos/libqos.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"
--- a/tests/qtest/hexloader-test.c
+++ b/tests/qtest/hexloader-test.c
@ -10,7 +10,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "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
--- a/tests/qtest/ide-test.c
+++ b/tests/qtest/ide-test.c
@ -25,7 +25,7 @@
 #include "qemu/osdep.h"


-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "libqos/libqos.h"
 #include "libqos/pci-pc.h"
 #include "libqos/malloc-pc.h"
--- a/tests/qtest/ipoctal232-test.c
+++ b/tests/qtest/ipoctal232-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"

--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 #define TMPSHMSIZE (1 << 20)
 static char *tmpshm;
--- a/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
+++ b/tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/ahci.c
+++ b/tests/qtest/libqos/ahci.c
@ -24,7 +24,7 @@

 #include "qemu/osdep.h"

-#include "libqtest.h"
+#include "../libqtest.h"
 #include "ahci.h"
 #include "pci-pc.h"

--- a/tests/qtest/libqos/arm-imx25-pdk-machine.c
+++ b/tests/qtest/libqos/arm-imx25-pdk-machine.c
@ -19,7 +19,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "malloc.h"
 #include "qgraph.h"
 #include "i2c.h"
--- a/tests/qtest/libqos/arm-n800-machine.c
+++ b/tests/qtest/libqos/arm-n800-machine.c
@ -19,7 +19,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "malloc.h"
 #include "qgraph.h"
 #include "i2c.h"
--- a/tests/qtest/libqos/arm-raspi2-machine.c
+++ b/tests/qtest/libqos/arm-raspi2-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/arm-sabrelite-machine.c
+++ b/tests/qtest/libqos/arm-sabrelite-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/arm-smdkc210-machine.c
+++ b/tests/qtest/libqos/arm-smdkc210-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/arm-virt-machine.c
+++ b/tests/qtest/libqos/arm-virt-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
+++ b/tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "malloc.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/e1000e.c
+++ b/tests/qtest/libqos/e1000e.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "pci-pc.h"
 #include "qemu/sockets.h"
 #include "qemu/iov.h"
--- a/tests/qtest/libqos/fw_cfg.c
+++ b/tests/qtest/libqos/fw_cfg.c
@ -14,7 +14,7 @@

 #include "qemu/osdep.h"
 #include "fw_cfg.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/bswap.h"
 #include "hw/nvram/fw_cfg.h"

--- a/tests/qtest/libqos/fw_cfg.h
+++ b/tests/qtest/libqos/fw_cfg.h
@ -13,7 +13,7 @@
 #ifndef LIBQOS_FW_CFG_H
 #define LIBQOS_FW_CFG_H

-#include "libqtest.h"
+#include "../libqtest.h"

 typedef struct QFWCFG QFWCFG;

--- a/tests/qtest/libqos/i2c-imx.c
+++ b/tests/qtest/libqos/i2c-imx.c
@ -21,7 +21,7 @@
 #include "i2c.h"


-#include "libqtest.h"
+#include "../libqtest.h"

 #include "hw/i2c/imx_i2c.h"

--- a/tests/qtest/libqos/i2c-omap.c
+++ b/tests/qtest/libqos/i2c-omap.c
@ -11,7 +11,7 @@


 #include "qemu/bswap.h"
-#include "libqtest.h"
+#include "../libqtest.h"

 enum OMAPI2CRegisters {
    OMAP_I2C_REV  = 0x00,
--- a/tests/qtest/libqos/i2c.c
+++ b/tests/qtest/libqos/i2c.c
@ -8,7 +8,7 @@
 */
 #include "qemu/osdep.h"
 #include "i2c.h"
-#include "libqtest.h"
+#include "../libqtest.h"

 void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
 {
--- a/tests/qtest/libqos/i2c.h
+++ b/tests/qtest/libqos/i2c.h
@ -9,7 +9,7 @@
 #ifndef LIBQOS_I2C_H
 #define LIBQOS_I2C_H

-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qgraph.h"

 typedef struct I2CAdapter I2CAdapter;
--- a/tests/qtest/libqos/libqos.c
+++ b/tests/qtest/libqos/libqos.c
@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include <sys/wait.h>

-#include "libqtest.h"
+#include "../libqtest.h"
 #include "libqos.h"
 #include "pci.h"
 #include "qapi/qmp/qdict.h"
--- a/tests/qtest/libqos/libqos.h
+++ b/tests/qtest/libqos/libqos.h
@ -1,7 +1,7 @@
 #ifndef LIBQOS_H
 #define LIBQOS_H

-#include "libqtest.h"
+#include "../libqtest.h"
 #include "pci.h"
 #include "malloc.h"

--- a/tests/qtest/libqos/malloc.h
+++ b/tests/qtest/libqos/malloc.h
@ -14,7 +14,7 @@
 #define LIBQOS_MALLOC_H

 #include "qemu/queue.h"
-#include "libqtest.h"
+#include "../libqtest.h"

 typedef enum {
    ALLOC_NO_FLAGS    = 0x00,
--- a/tests/qtest/libqos/pci-pc.c
+++ b/tests/qtest/libqos/pci-pc.c
@ -11,7 +11,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "pci-pc.h"
 #include "qapi/qmp/qdict.h"
 #include "hw/pci/pci_regs.h"
--- a/tests/qtest/libqos/pci-spapr.c
+++ b/tests/qtest/libqos/pci-spapr.c
@ -6,7 +6,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "pci-spapr.h"
 #include "rtas.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/pci.h
+++ b/tests/qtest/libqos/pci.h
@ -13,7 +13,7 @@
 #ifndef LIBQOS_PCI_H
 #define LIBQOS_PCI_H

-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qgraph.h"

 #define QPCI_PIO_LIMIT    0x10000
--- a/tests/qtest/libqos/ppc64_pseries-machine.c
+++ b/tests/qtest/libqos/ppc64_pseries-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qgraph.h"
 #include "pci-spapr.h"
 #include "qemu/module.h"
--- a/tests/qtest/libqos/qgraph.c
+++ b/tests/qtest/libqos/qgraph.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/queue.h"
 #include "qgraph_internal.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/qos_external.c
+++ b/tests/qtest/libqos/qos_external.c
@ -18,7 +18,7 @@

 #include "qemu/osdep.h"
 #include <getopt.h>
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qstring.h"
--- a/tests/qtest/libqos/rtas.c
+++ b/tests/qtest/libqos/rtas.c
@ -4,7 +4,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "rtas.h"

 static void qrtas_copy_args(QTestState *qts, uint64_t target_args,
--- a/tests/qtest/libqos/sdhci-cmd.c
+++ b/tests/qtest/libqos/sdhci-cmd.c
@ -16,7 +16,7 @@

 #include "qemu/osdep.h"
 #include "sdhci-cmd.h"
-#include "libqtest.h"
+#include "../libqtest.h"

 static ssize_t read_fifo(QTestState *qts, uint64_t reg, char *msg, size_t count)
 {
--- a/tests/qtest/libqos/sdhci-cmd.h
+++ b/tests/qtest/libqos/sdhci-cmd.h
@ -14,7 +14,7 @@
 * for more details.
 */

-#include "libqtest.h"
+#include "../libqtest.h"

 /* more details at hw/sd/sdhci-internal.h */
 #define SDHC_BLKSIZE 0x04
--- a/tests/qtest/libqos/sdhci.c
+++ b/tests/qtest/libqos/sdhci.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qgraph.h"
 #include "pci.h"
 #include "qemu/module.h"
--- a/tests/qtest/libqos/tpci200.c
+++ b/tests/qtest/libqos/tpci200.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "pci.h"
--- a/tests/qtest/libqos/usb.c
+++ b/tests/qtest/libqos/usb.c
@ -12,7 +12,7 @@
 * See the COPYING file in the top-level directory.
 */
 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "hw/usb/uhci-regs.h"
 #include "usb.h"

--- a/tests/qtest/libqos/vhost-user-blk.c
+++ b/tests/qtest/libqos/vhost-user-blk.c
@ -21,7 +21,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "standard-headers/linux/virtio_blk.h"
 #include "vhost-user-blk.h"
--- a/tests/qtest/libqos/virtio-9p.c
+++ b/tests/qtest/libqos/virtio-9p.c
@ -22,7 +22,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "virtio-9p.h"
--- a/tests/qtest/libqos/virtio-balloon.c
+++ b/tests/qtest/libqos/virtio-balloon.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "virtio-balloon.h"
--- a/tests/qtest/libqos/virtio-blk.c
+++ b/tests/qtest/libqos/virtio-blk.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "standard-headers/linux/virtio_blk.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/virtio-iommu.c
+++ b/tests/qtest/libqos/virtio-iommu.c
@ -12,7 +12,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "virtio-iommu.h"
--- a/tests/qtest/libqos/virtio-mmio.c
+++ b/tests/qtest/libqos/virtio-mmio.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "virtio.h"
 #include "virtio-mmio.h"
--- a/tests/qtest/libqos/virtio-net.c
+++ b/tests/qtest/libqos/virtio-net.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "virtio-net.h"
--- a/tests/qtest/libqos/virtio-pci.c
+++ b/tests/qtest/libqos/virtio-pci.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "virtio.h"
 #include "virtio-pci.h"
 #include "pci.h"
--- a/tests/qtest/libqos/virtio-rng.c
+++ b/tests/qtest/libqos/virtio-rng.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "virtio-rng.h"
--- a/tests/qtest/libqos/virtio-scsi.c
+++ b/tests/qtest/libqos/virtio-scsi.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "qgraph.h"
--- a/tests/qtest/libqos/virtio-serial.c
+++ b/tests/qtest/libqos/virtio-serial.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qemu/module.h"
 #include "qgraph.h"
 #include "virtio-serial.h"
--- a/tests/qtest/libqos/virtio.c
+++ b/tests/qtest/libqos/virtio.c
@ -9,7 +9,7 @@

 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "virtio.h"
 #include "standard-headers/linux/virtio_config.h"
 #include "standard-headers/linux/virtio_ring.h"
--- a/tests/qtest/libqos/x86_64_pc-machine.c
+++ b/tests/qtest/libqos/x86_64_pc-machine.c
@ -17,7 +17,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqtest.h"
+#include "../libqtest.h"
 #include "qgraph.h"
 #include "pci-pc.h"
 #include "qemu/module.h"
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 QTestState *global_qtest __attribute__((common, weak));

--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@ -20,7 +20,7 @@
 #include <sys/wait.h>
 #include <sys/un.h>

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
--- a/tests/qtest/libqos/libqtest.h
+++ b/tests/qtest/libqos/libqtest.h
--- a/tests/qtest/lpc-ich9-test.c
+++ b/tests/qtest/lpc-ich9-test.c
@ -9,7 +9,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

 static void test_lp1878642_pci_bus_get_irq_level_assert(void)
 {
--- a/tests/qtest/m48t59-test.c
+++ b/tests/qtest/m48t59-test.c
@ -14,7 +14,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"

 #define RTC_SECONDS             0x9
 #define RTC_MINUTES             0xa
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@ -13,7 +13,7 @@
 #include "qemu/osdep.h"

 #include "qemu/cutils.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qapi/qmp/qdict.h"


--- a/tests/qtest/megasas-test.c
+++ b/tests/qtest/megasas-test.c
@ -8,7 +8,7 @@
 */

 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qemu/bswap.h"
 #include "qemu/module.h"
 #include "libqos/qgraph.h"
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 #include "hw/arm/nrf51.h"
 #include "hw/char/nrf51_uart.h"
--- 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 "libqos/libqtest.h"
+#include "libqtest.h"

 extern bool got_stop;

--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@ -12,7 +12,7 @@

 #include "qemu/osdep.h"

-#include "libqos/libqtest.h"
+#include "libqtest.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/module.h"
--- a/tests/qtest/modules-test.c
+++ b/tests/qtest/modules-test.c
@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "libqos/libqtest.h"
+#include "libqtest.h"

 const char common_args[] = "-nodefaults -machine none";