From: Thomas Huth <thuth@redhat.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Li Zhijian" <lizhijian@fujitsu.com>,
"Havard Skinnemoen" <hskinnemoen@google.com>,
"Klaus Jensen" <its@irrelevant.dk>,
"Su Hang" <suhang16@mails.ucas.ac.cn>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Zhang Chen" <chen.zhang@intel.com>,
"Ani Sinha" <ani@anisinha.ca>, "Hannes Reinecke" <hare@suse.com>,
"Vikram Garhwal" <fnu.vikram@xilinx.com>,
"open list:IDE" <qemu-block@nongnu.org>,
"Juan Quintela" <quintela@redhat.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Qiuhao Li" <Qiuhao.Li@outlook.com>,
"Joel Stanley" <joel@jms.id.au>,
"Laurent Vivier" <lvivier@redhat.com>,
"Amit Shah" <amit@kernel.org>,
"Michael Roth" <michael.roth@amd.com>,
"Greg Kurz" <groug@kaod.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Bandan Das" <bsd@redhat.com>,
"open list:ARM TCG CPUs" <qemu-arm@nongnu.org>,
"Cédric Le Goater" <clg@kaod.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Keith Busch" <kbusch@kernel.org>, "John Snow" <jsnow@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Francisco Iglesias" <francisco.iglesias@xilinx.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Markus Armbruster" <armbru@redhat.com>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Tyrone Ting" <kfting@nuvoton.com>,
"open list:sPAPR (pseries)" <qemu-ppc@nongnu.org>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: Re: [PATCH 04/10] tests: move libqtest.h back under qtest/
Date: Mon, 25 Apr 2022 21:32:51 +0200 [thread overview]
Message-ID: <f7b7845b-c93e-a396-a1c4-a7767fda6911@redhat.com> (raw)
In-Reply-To: <20220422083639.3156978-5-marcandre.lureau@redhat.com>
On 22/04/2022 10.36, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Since commit a2ce7dbd917 ("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>
> ---
> docs/devel/qtest.rst | 2 +-
> tests/qtest/acpi-utils.h | 2 +-
> tests/qtest/boot-sector.h | 2 +-
> tests/qtest/fuzz/fuzz.h | 2 +-
> tests/qtest/libqos/fw_cfg.h | 2 +-
> tests/qtest/libqos/i2c.h | 2 +-
> tests/qtest/libqos/libqos.h | 2 +-
> tests/qtest/libqos/malloc.h | 2 +-
> tests/qtest/libqos/pci.h | 2 +-
> tests/qtest/libqos/sdhci-cmd.h | 2 +-
> tests/qtest/libqtest-single.h | 2 +-
> tests/qtest/{libqos => }/libqtest.h | 0
> tests/qtest/migration-helpers.h | 2 +-
> tests/qtest/tpm-emu.h | 2 +-
> tests/qtest/ac97-test.c | 2 +-
> tests/qtest/ahci-test.c | 2 +-
> tests/qtest/am53c974-test.c | 2 +-
> tests/qtest/arm-cpu-features.c | 2 +-
> tests/qtest/aspeed_hace-test.c | 2 +-
> tests/qtest/boot-order-test.c | 2 +-
> tests/qtest/boot-sector.c | 2 +-
> tests/qtest/boot-serial-test.c | 2 +-
> tests/qtest/cdrom-test.c | 2 +-
> tests/qtest/dbus-display-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/erst-test.c | 2 +-
> tests/qtest/es1370-test.c | 2 +-
> tests/qtest/fuzz-e1000e-test.c | 2 +-
> tests/qtest/fuzz-lsi53c895a-test.c | 2 +-
> tests/qtest/fuzz-megasas-test.c | 2 +-
> tests/qtest/fuzz-sb16-test.c | 2 +-
> tests/qtest/fuzz-sdcard-test.c | 2 +-
> tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
> tests/qtest/fuzz-xlnx-dp-test.c | 2 +-
> tests/qtest/fuzz/fuzz.c | 2 +-
> tests/qtest/fuzz/generic_fuzz.c | 2 +-
> tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
> tests/qtest/fuzz/qos_fuzz.c | 2 +-
> tests/qtest/fuzz/virtio_blk_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 | 2 +-
> tests/qtest/libqos/ahci.c | 2 +-
> tests/qtest/libqos/arm-imx25-pdk-machine.c | 2 +-
> tests/qtest/libqos/arm-n800-machine.c | 2 +-
> tests/qtest/libqos/arm-raspi2-machine.c | 2 +-
> tests/qtest/libqos/arm-sabrelite-machine.c | 2 +-
> tests/qtest/libqos/arm-smdkc210-machine.c | 2 +-
> tests/qtest/libqos/arm-virt-machine.c | 2 +-
> tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c | 2 +-
> tests/qtest/libqos/e1000e.c | 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/libqos.c | 2 +-
> tests/qtest/libqos/pci-pc.c | 2 +-
> tests/qtest/libqos/pci-spapr.c | 2 +-
> tests/qtest/libqos/ppc64_pseries-machine.c | 2 +-
> tests/qtest/libqos/qgraph.c | 2 +-
> tests/qtest/libqos/qos_external.c | 2 +-
> tests/qtest/libqos/rtas.c | 2 +-
> tests/qtest/libqos/sdhci-cmd.c | 2 +-
> tests/qtest/libqos/sdhci.c | 2 +-
> tests/qtest/libqos/tpci200.c | 2 +-
> tests/qtest/libqos/usb.c | 2 +-
> tests/qtest/libqos/vhost-user-blk.c | 2 +-
> tests/qtest/libqos/virtio-9p.c | 2 +-
> tests/qtest/libqos/virtio-balloon.c | 2 +-
> tests/qtest/libqos/virtio-blk.c | 2 +-
> tests/qtest/libqos/virtio-iommu.c | 2 +-
> tests/qtest/libqos/virtio-mmio.c | 2 +-
> tests/qtest/libqos/virtio-net.c | 2 +-
> tests/qtest/libqos/virtio-pci.c | 2 +-
> tests/qtest/libqos/virtio-rng.c | 2 +-
> tests/qtest/libqos/virtio-scsi.c | 2 +-
> tests/qtest/libqos/virtio-serial.c | 2 +-
> tests/qtest/libqos/virtio.c | 2 +-
> tests/qtest/libqos/x86_64_pc-machine.c | 2 +-
> tests/qtest/libqtest.c | 2 +-
> tests/qtest/lpc-ich9-test.c | 2 +-
> tests/qtest/m48t59-test.c | 2 +-
> tests/qtest/machine-none-test.c | 2 +-
> tests/qtest/megasas-test.c | 2 +-
> tests/qtest/microbit-test.c | 2 +-
> tests/qtest/migration-test.c | 2 +-
> tests/qtest/modules-test.c | 2 +-
> tests/qtest/ne2000-test.c | 2 +-
> tests/qtest/npcm7xx_adc-test.c | 2 +-
> tests/qtest/npcm7xx_pwm-test.c | 2 +-
> tests/qtest/npcm7xx_sdhci-test.c | 2 +-
> tests/qtest/npcm7xx_smbus-test.c | 2 +-
> tests/qtest/npcm7xx_watchdog_timer-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-pci-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-net-failover.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/qtest/xlnx-can-test.c | 2 +-
> tests/unit/test-qga.c | 2 +-
> scripts/oss-fuzz/output_reproducer.py | 2 +-
> 142 files changed, 141 insertions(+), 141 deletions(-)
> rename tests/qtest/{libqos => }/libqtest.h (100%)
>
> diff --git a/docs/devel/qtest.rst b/docs/devel/qtest.rst
> index add293d39700..0455aa06ab28 100644
> --- 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
> diff --git a/tests/qtest/acpi-utils.h b/tests/qtest/acpi-utils.h
> index 261784d25189..0c8678068931 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 "libqos/libqtest.h"
> +#include "libqtest.h"
>
> /* DSDT and SSDTs format */
> typedef struct {
> diff --git a/tests/qtest/boot-sector.h b/tests/qtest/boot-sector.h
> index b339fdee4c84..6ee6bb4d97f4 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 "libqos/libqtest.h"
> +#include "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/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h
> index 3a8570e84c79..c5f0b7227a10 100644
> --- 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
> diff --git a/tests/qtest/libqos/fw_cfg.h b/tests/qtest/libqos/fw_cfg.h
> index c6a7cf8cf053..b0456a15df19 100644
> --- 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"
Thank you very much for tackling this!
For the files in the tests/qtest/libqos/ directory, I think it should also
be fine if you keep the #include "libqtest.h" there since the tests/qtest/
folder is in the header search path already?
Anyway, I'm also fine with spelling out the "../" explicitly.
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2022-04-25 19:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 8:36 [PATCH 00/10] Misc cleanups marcandre.lureau
2022-04-22 8:36 ` [PATCH 01/10] Use QEMU_SANITIZE_THREAD marcandre.lureau
2022-04-22 8:36 ` [PATCH 02/10] Use QEMU_SANITIZE_ADDRESS marcandre.lureau
2022-04-22 8:36 ` [PATCH 03/10] include: move qemu_*_exec_dir() to cutils marcandre.lureau
2022-04-22 8:36 ` [PATCH 04/10] tests: move libqtest.h back under qtest/ marcandre.lureau
2022-04-25 19:32 ` Thomas Huth [this message]
2022-04-22 8:36 ` [PATCH 05/10] libqtest: split QMP part in libqmp marcandre.lureau
2022-04-25 19:39 ` Thomas Huth
2022-04-22 8:36 ` [PATCH 06/10] Replace qemu_pipe() with g_unix_open_pipe() marcandre.lureau
2022-04-22 8:59 ` Daniel P. Berrangé
2022-04-22 9:09 ` Marc-André Lureau
2022-04-22 8:36 ` [PATCH 07/10] tests: make libqmp buildable for win32 marcandre.lureau
2022-04-22 8:36 ` [PATCH 08/10] Use g_unix_set_fd_nonblocking() marcandre.lureau
2022-04-22 8:56 ` Daniel P. Berrangé
2022-04-22 9:06 ` Marc-André Lureau
2022-04-22 14:24 ` Eric Blake
2022-04-22 14:27 ` Marc-André Lureau
2022-04-22 8:36 ` [PATCH 09/10] block: move fcntl_setfl() marcandre.lureau
2022-04-22 12:20 ` Richard Henderson
2022-04-22 8:36 ` [PATCH 10/10] util/win32: simplify qemu_get_local_state_dir() marcandre.lureau
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=f7b7845b-c93e-a396-a1c4-a7767fda6911@redhat.com \
--to=thuth@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=Qiuhao.Li@outlook.com \
--cc=alxndr@bu.edu \
--cc=amit@kernel.org \
--cc=andrew@aj.id.au \
--cc=ani@anisinha.ca \
--cc=armbru@redhat.com \
--cc=bin.meng@windriver.com \
--cc=bsd@redhat.com \
--cc=chen.zhang@intel.com \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=darren.kenny@oracle.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=dmitry.fleytman@gmail.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=fnu.vikram@xilinx.com \
--cc=francisco.iglesias@xilinx.com \
--cc=groug@kaod.org \
--cc=hare@suse.com \
--cc=hskinnemoen@google.com \
--cc=imammedo@redhat.com \
--cc=its@irrelevant.dk \
--cc=joel@jms.id.au \
--cc=jsnow@redhat.com \
--cc=kbusch@kernel.org \
--cc=kfting@nuvoton.com \
--cc=kraxel@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
--cc=suhang16@mails.ucas.ac.cn \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).