From 856dfd8a035e42cd96ca823f1cbbd18d332e2f84 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:06 +0200 Subject: qemu-common: Move qemu_isalnum() etc. to qemu/ctype.h Signed-off-by: Markus Armbruster Message-Id: <20190523143508.25387-3-armbru@redhat.com> Reviewed-by: Richard Henderson --- tests/libqtest.c | 1 + tests/vhost-user-bridge.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/libqtest.c b/tests/libqtest.c index 9b9b5f3..3c5c3f4 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -22,6 +22,7 @@ #include "libqtest.h" #include "qemu-common.h" +#include "qemu/ctype.h" #include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/qmp/json-parser.h" diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 5b771de..0bb03af 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -30,8 +30,8 @@ #define _FILE_OFFSET_BITS 64 #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/atomic.h" +#include "qemu/ctype.h" #include "qemu/iov.h" #include "standard-headers/linux/virtio_net.h" #include "contrib/libvhost-user/libvhost-user.h" -- cgit v1.1 From 0b8fa32f551e863bb548a11394239239270dd3dc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:07 +0200 Subject: Include qemu/module.h where needed, drop it from qemu-common.h Signed-off-by: Markus Armbruster Message-Id: <20190523143508.25387-4-armbru@redhat.com> [Rebased with conflicts resolved automatically, except for hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c; ui/cocoa.m fixed up] --- tests/ac97-test.c | 1 + tests/e1000-test.c | 1 + tests/e1000e-test.c | 1 + tests/eepro100-test.c | 1 + tests/es1370-test.c | 1 + tests/ipoctal232-test.c | 1 + tests/libqos/aarch64-xlnx-zcu102-machine.c | 1 + tests/libqos/arm-raspi2-machine.c | 1 + tests/libqos/arm-sabrelite-machine.c | 1 + tests/libqos/arm-smdkc210-machine.c | 1 + tests/libqos/arm-virt-machine.c | 1 + tests/libqos/arm-xilinx-zynq-a9-machine.c | 1 + tests/libqos/e1000e.c | 2 +- tests/libqos/pci-pc.c | 2 +- tests/libqos/pci-spapr.c | 2 +- tests/libqos/ppc64_pseries-machine.c | 3 ++- tests/libqos/sdhci.c | 1 + tests/libqos/tpci200.c | 1 + tests/libqos/virtio-9p.c | 1 + tests/libqos/virtio-balloon.c | 1 + tests/libqos/virtio-blk.c | 1 + tests/libqos/virtio-mmio.c | 1 + tests/libqos/virtio-net.c | 1 + tests/libqos/virtio-rng.c | 1 + tests/libqos/virtio-scsi.c | 1 + tests/libqos/virtio-serial.c | 1 + tests/libqos/x86_64_pc-machine.c | 1 + tests/megasas-test.c | 1 + tests/migration-test.c | 1 + tests/ne2000-test.c | 1 + tests/nvme-test.c | 1 + tests/pci-test.c | 1 + tests/pcnet-test.c | 1 + tests/qos-test.c | 1 + tests/sdhci-test.c | 2 ++ tests/spapr-phb-test.c | 1 + tests/test-authz-list.c | 1 + tests/test-authz-listfile.c | 1 + tests/test-authz-pam.c | 1 + tests/test-authz-simple.c | 1 + tests/test-char.c | 1 + tests/test-crypto-block.c | 1 + tests/test-crypto-tlscredsx509.c | 1 + tests/test-crypto-tlssession.c | 1 + tests/test-io-channel-buffer.c | 1 + tests/test-io-channel-command.c | 1 + tests/test-io-channel-file.c | 1 + tests/test-io-channel-socket.c | 1 + tests/test-io-channel-tls.c | 1 + tests/test-io-task.c | 1 + tests/test-qmp-cmds.c | 2 -- tests/test-throttle.c | 1 + tests/test-vmstate.c | 2 +- tests/tpm-crb-swtpm-test.c | 1 + tests/tpm-crb-test.c | 1 + tests/tpm-tis-swtpm-test.c | 1 + tests/tpm-tis-test.c | 1 + tests/usb-hcd-ohci-test.c | 1 + tests/vhost-user-test.c | 1 + tests/virtio-9p-test.c | 1 + tests/virtio-blk-test.c | 1 + tests/virtio-net-test.c | 1 + tests/virtio-rng-test.c | 1 + tests/virtio-scsi-test.c | 1 + tests/virtio-serial-test.c | 1 + tests/virtio-test.c | 1 + tests/vmxnet3-test.c | 1 + 67 files changed, 68 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/ac97-test.c b/tests/ac97-test.c index 532fb1c..b084e31 100644 --- a/tests/ac97-test.c +++ b/tests/ac97-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/e1000-test.c b/tests/e1000-test.c index 9e67916..c387984 100644 --- a/tests/e1000-test.c +++ b/tests/e1000-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c index 6a946c0..781fcbf 100644 --- a/tests/e1000e-test.c +++ b/tests/e1000e-test.c @@ -30,6 +30,7 @@ #include "libqos/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/e1000e.h" diff --git a/tests/eepro100-test.c b/tests/eepro100-test.c index 90b5c1a..8dbffff 100644 --- a/tests/eepro100-test.c +++ b/tests/eepro100-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/es1370-test.c b/tests/es1370-test.c index d845cd0..adccdac 100644 --- a/tests/es1370-test.c +++ b/tests/es1370-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c index 42d5371..53a8c9b 100644 --- a/tests/ipoctal232-test.c +++ b/tests/ipoctal232-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" typedef struct QIpoctal232 QIpoctal232; diff --git a/tests/libqos/aarch64-xlnx-zcu102-machine.c b/tests/libqos/aarch64-xlnx-zcu102-machine.c index 6fff040..1d5de5a 100644 --- a/tests/libqos/aarch64-xlnx-zcu102-machine.c +++ b/tests/libqos/aarch64-xlnx-zcu102-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "sdhci.h" diff --git a/tests/libqos/arm-raspi2-machine.c b/tests/libqos/arm-raspi2-machine.c index 3aff670..12a7cb7 100644 --- a/tests/libqos/arm-raspi2-machine.c +++ b/tests/libqos/arm-raspi2-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "sdhci.h" diff --git a/tests/libqos/arm-sabrelite-machine.c b/tests/libqos/arm-sabrelite-machine.c index c4128d8..e6df437 100644 --- a/tests/libqos/arm-sabrelite-machine.c +++ b/tests/libqos/arm-sabrelite-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "sdhci.h" diff --git a/tests/libqos/arm-smdkc210-machine.c b/tests/libqos/arm-smdkc210-machine.c index 1fb9dfc..215b628 100644 --- a/tests/libqos/arm-smdkc210-machine.c +++ b/tests/libqos/arm-smdkc210-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "sdhci.h" diff --git a/tests/libqos/arm-virt-machine.c b/tests/libqos/arm-virt-machine.c index 2abc431..96ffe3e 100644 --- a/tests/libqos/arm-virt-machine.c +++ b/tests/libqos/arm-virt-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "libqos/virtio-mmio.h" diff --git a/tests/libqos/arm-xilinx-zynq-a9-machine.c b/tests/libqos/arm-xilinx-zynq-a9-machine.c index 4e199fc..5bc95f2 100644 --- a/tests/libqos/arm-xilinx-zynq-a9-machine.c +++ b/tests/libqos/arm-xilinx-zynq-a9-machine.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" #include "sdhci.h" diff --git a/tests/libqos/e1000e.c b/tests/libqos/e1000e.c index 54d3898..1d05929 100644 --- a/tests/libqos/e1000e.c +++ b/tests/libqos/e1000e.c @@ -18,10 +18,10 @@ #include "qemu/osdep.h" #include "libqtest.h" -#include "qemu-common.h" #include "libqos/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" diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index 634fedd..0bc591d 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -16,7 +16,7 @@ #include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" -#include "qemu-common.h" +#include "qemu/module.h" #define ACPI_PCIHP_ADDR 0xae00 #define PCI_EJ_BASE 0x0008 diff --git a/tests/libqos/pci-spapr.c b/tests/libqos/pci-spapr.c index 58ba27a..d6f8c01 100644 --- a/tests/libqos/pci-spapr.c +++ b/tests/libqos/pci-spapr.c @@ -13,8 +13,8 @@ #include "hw/pci/pci_regs.h" -#include "qemu-common.h" #include "qemu/host-utils.h" +#include "qemu/module.h" /* * PCI devices are always little-endian diff --git a/tests/libqos/ppc64_pseries-machine.c b/tests/libqos/ppc64_pseries-machine.c index 2f36400..867f27a 100644 --- a/tests/libqos/ppc64_pseries-machine.c +++ b/tests/libqos/ppc64_pseries-machine.c @@ -16,10 +16,11 @@ * License along with this library; if not, see */ - #include "qemu/osdep.h" +#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/qgraph.h" #include "pci-spapr.h" +#include "qemu/module.h" #include "libqos/malloc-spapr.h" typedef struct QSPAPR_pci_host QSPAPR_pci_host; diff --git a/tests/libqos/sdhci.c b/tests/libqos/sdhci.c index 22c33de..309794b 100644 --- a/tests/libqos/sdhci.c +++ b/tests/libqos/sdhci.c @@ -20,6 +20,7 @@ #include "libqtest.h" #include "libqos/qgraph.h" #include "pci.h" +#include "qemu/module.h" #include "sdhci.h" #include "hw/pci/pci.h" diff --git a/tests/libqos/tpci200.c b/tests/libqos/tpci200.c index 98dc532..ae590a4 100644 --- a/tests/libqos/tpci200.c +++ b/tests/libqos/tpci200.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/libqos/virtio-9p.c b/tests/libqos/virtio-9p.c index a378b56..8c9efce 100644 --- a/tests/libqos/virtio-9p.c +++ b/tests/libqos/virtio-9p.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "standard-headers/linux/virtio_ids.h" #include "libqos/virtio-9p.h" #include "libqos/qgraph.h" diff --git a/tests/libqos/virtio-balloon.c b/tests/libqos/virtio-balloon.c index 7e6e9e9..42a4c58 100644 --- a/tests/libqos/virtio-balloon.c +++ b/tests/libqos/virtio-balloon.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-balloon.h" diff --git a/tests/libqos/virtio-blk.c b/tests/libqos/virtio-blk.c index c17bdf4..726e93c 100644 --- a/tests/libqos/virtio-blk.c +++ b/tests/libqos/virtio-blk.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "standard-headers/linux/virtio_blk.h" #include "libqos/qgraph.h" #include "libqos/virtio-blk.h" diff --git a/tests/libqos/virtio-mmio.c b/tests/libqos/virtio-mmio.c index 213a5f9..5f37b51 100644 --- a/tests/libqos/virtio-mmio.c +++ b/tests/libqos/virtio-mmio.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/virtio.h" #include "libqos/virtio-mmio.h" #include "libqos/malloc.h" diff --git a/tests/libqos/virtio-net.c b/tests/libqos/virtio-net.c index 61c5617..66405b6 100644 --- a/tests/libqos/virtio-net.c +++ b/tests/libqos/virtio-net.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-net.h" #include "hw/virtio/virtio-net.h" diff --git a/tests/libqos/virtio-rng.c b/tests/libqos/virtio-rng.c index a1d2c76..b86349e 100644 --- a/tests/libqos/virtio-rng.c +++ b/tests/libqos/virtio-rng.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-rng.h" diff --git a/tests/libqos/virtio-scsi.c b/tests/libqos/virtio-scsi.c index 482684d..94842ec 100644 --- a/tests/libqos/virtio-scsi.c +++ b/tests/libqos/virtio-scsi.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "standard-headers/linux/virtio_ids.h" #include "libqos/qgraph.h" #include "libqos/virtio-scsi.h" diff --git a/tests/libqos/virtio-serial.c b/tests/libqos/virtio-serial.c index 91cedef..3e5b8b8 100644 --- a/tests/libqos/virtio-serial.c +++ b/tests/libqos/virtio-serial.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-serial.h" diff --git a/tests/libqos/x86_64_pc-machine.c b/tests/libqos/x86_64_pc-machine.c index 8bd0360..6dfa705 100644 --- a/tests/libqos/x86_64_pc-machine.c +++ b/tests/libqos/x86_64_pc-machine.c @@ -20,6 +20,7 @@ #include "libqtest.h" #include "libqos/qgraph.h" #include "pci-pc.h" +#include "qemu/module.h" #include "malloc-pc.h" typedef struct QX86PCMachine QX86PCMachine; diff --git a/tests/megasas-test.c b/tests/megasas-test.c index 1111d33..c3e4ab6 100644 --- a/tests/megasas-test.c +++ b/tests/megasas-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/migration-test.c b/tests/migration-test.c index e040757..0cd014d 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -15,6 +15,7 @@ #include "libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h" #include "qemu/sockets.h" diff --git a/tests/ne2000-test.c b/tests/ne2000-test.c index 097c2ee..3fc0e55 100644 --- a/tests/ne2000-test.c +++ b/tests/ne2000-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/nvme-test.c b/tests/nvme-test.c index b48d3a2..5052993 100644 --- a/tests/nvme-test.c +++ b/tests/nvme-test.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "libqtest.h" #include "libqos/qgraph.h" diff --git a/tests/pci-test.c b/tests/pci-test.c index ff80985..4b2092b 100644 --- a/tests/pci-test.c +++ b/tests/pci-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/pcnet-test.c b/tests/pcnet-test.c index 484448c..900944f 100644 --- a/tests/pcnet-test.c +++ b/tests/pcnet-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/qos-test.c b/tests/qos-test.c index 01b2a22..3c0071b 100644 --- a/tests/qos-test.c +++ b/tests/qos-test.c @@ -22,6 +22,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" +#include "qemu/module.h" #include "qapi/qmp/qlist.h" #include "libqos/malloc.h" #include "libqos/qgraph.h" diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index 2f177e5..6275e76 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -7,9 +7,11 @@ * See the COPYING file in the top-level directory. * SPDX-License-Identifier: GPL-2.0-or-later */ + #include "qemu/osdep.h" #include "hw/registerfields.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/pci-pc.h" #include "hw/pci/pci.h" #include "libqos/qgraph.h" diff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c index 39b5766..093dc22 100644 --- a/tests/spapr-phb-test.c +++ b/tests/spapr-phb-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" /* Tests only initialization so far. TODO: Replace with functional tests, diff --git a/tests/test-authz-list.c b/tests/test-authz-list.c index 24347a6..d80e6a6 100644 --- a/tests/test-authz-list.c +++ b/tests/test-authz-list.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "authz/list.h" +#include "qemu/module.h" static void test_authz_default_deny(void) { diff --git a/tests/test-authz-listfile.c b/tests/test-authz-listfile.c index 1e452fe..26166b6 100644 --- a/tests/test-authz-listfile.c +++ b/tests/test-authz-listfile.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "authz/listfile.h" static char *workdir; diff --git a/tests/test-authz-pam.c b/tests/test-authz-pam.c index 93d5ac8..02bb149 100644 --- a/tests/test-authz-pam.c +++ b/tests/test-authz-pam.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "authz/pamacct.h" #include diff --git a/tests/test-authz-simple.c b/tests/test-authz-simple.c index 2cf14fb..d21d43e 100644 --- a/tests/test-authz-simple.c +++ b/tests/test-authz-simple.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "authz/simple.h" diff --git a/tests/test-char.c b/tests/test-char.c index 95ccfd3..f9440cd 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -2,6 +2,7 @@ #include #include "qemu/config-file.h" +#include "qemu/module.h" #include "qemu/option.h" #include "qemu/sockets.h" #include "chardev/char-fe.h" diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c index d309d04..7c1ab07 100644 --- a/tests/test-crypto-block.c +++ b/tests/test-crypto-block.c @@ -23,6 +23,7 @@ #include "crypto/init.h" #include "crypto/block.h" #include "qemu/buffer.h" +#include "qemu/module.h" #include "crypto/secret.h" #ifndef _WIN32 #include diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c index 940a026..a27efb7 100644 --- a/tests/test-crypto-tlscredsx509.c +++ b/tests/test-crypto-tlscredsx509.c @@ -23,6 +23,7 @@ #include "crypto-tls-x509-helpers.h" #include "crypto/tlscredsx509.h" #include "qapi/error.h" +#include "qemu/module.h" #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c index 15212ec..6560d71 100644 --- a/tests/test-crypto-tlssession.c +++ b/tests/test-crypto-tlssession.c @@ -27,6 +27,7 @@ #include "crypto/tlssession.h" #include "qom/object_interfaces.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "authz/list.h" diff --git a/tests/test-io-channel-buffer.c b/tests/test-io-channel-buffer.c index 64722a2..59d6c64 100644 --- a/tests/test-io-channel-buffer.c +++ b/tests/test-io-channel-buffer.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "io/channel-buffer.h" +#include "qemu/module.h" #include "io-channel-helpers.h" diff --git a/tests/test-io-channel-command.c b/tests/test-io-channel-command.c index 46ce1ff..3bc5266 100644 --- a/tests/test-io-channel-command.c +++ b/tests/test-io-channel-command.c @@ -22,6 +22,7 @@ #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" +#include "qemu/module.h" #ifndef WIN32 static void test_io_channel_command_fifo(bool async) diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c index 2e94f63..bac2b07 100644 --- a/tests/test-io-channel-file.c +++ b/tests/test-io-channel-file.c @@ -23,6 +23,7 @@ #include "io/channel-util.h" #include "io-channel-helpers.h" #include "qapi/error.h" +#include "qemu/module.h" #define TEST_FILE "tests/test-io-channel-file.txt" #define TEST_MASK 0600 diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index c253ae3..d2053c4 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -24,6 +24,7 @@ #include "io-channel-helpers.h" #include "socket-helpers.h" #include "qapi/error.h" +#include "qemu/module.h" static void test_io_channel_set_socket_bufs(QIOChannel *src, diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index 43b707e..3c9ef6f 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -30,6 +30,7 @@ #include "crypto/init.h" #include "crypto/tlscredsx509.h" #include "qapi/error.h" +#include "qemu/module.h" #include "authz/list.h" #include "qom/object_interfaces.h" diff --git a/tests/test-io-task.c b/tests/test-io-task.c index bac1bb4..aa8b653 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -22,6 +22,7 @@ #include "io/task.h" #include "qapi/error.h" +#include "qemu/module.h" #define TYPE_DUMMY "qemu:dummy" diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index 630b1b9..f0b95dc 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -1,10 +1,8 @@ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" -#include "qemu/module.h" #include "qapi/qobject-input-visitor.h" #include "tests/test-qapi-types.h" #include "tests/test-qapi-visit.h" diff --git a/tests/test-throttle.c b/tests/test-throttle.c index 5644cf9..a288122 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -18,6 +18,7 @@ #include "qapi/error.h" #include "qemu/throttle.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "block/throttle-groups.h" #include "sysemu/block-backend.h" diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index fc8ce62..e80c4c61 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" -#include "qemu-common.h" #include "../migration/migration.h" #include "migration/vmstate.h" #include "migration/qemu-file-types.h" @@ -32,6 +31,7 @@ #include "../migration/qemu-file-channel.h" #include "../migration/savevm.h" #include "qemu/coroutine.h" +#include "qemu/module.h" #include "io/channel-file.h" static char temp_file[] = "/tmp/vmst.test.XXXXXX"; diff --git a/tests/tpm-crb-swtpm-test.c b/tests/tpm-crb-swtpm-test.c index 8c0a55f..2c4fb8a 100644 --- a/tests/tpm-crb-swtpm-test.c +++ b/tests/tpm-crb-swtpm-test.c @@ -16,6 +16,7 @@ #include #include "libqtest.h" +#include "qemu/module.h" #include "tpm-tests.h" typedef struct TestState { diff --git a/tests/tpm-crb-test.c b/tests/tpm-crb-test.c index 6fde579..a139caa 100644 --- a/tests/tpm-crb-test.c +++ b/tests/tpm-crb-test.c @@ -16,6 +16,7 @@ #include "hw/acpi/tpm.h" #include "io/channel-socket.h" #include "libqtest.h" +#include "qemu/module.h" #include "tpm-emu.h" #define TPM_CMD "\x80\x01\x00\x00\x00\x0c\x00\x00\x01\x44\x00\x00" diff --git a/tests/tpm-tis-swtpm-test.c b/tests/tpm-tis-swtpm-test.c index 7dcd1d3..9f58a3a 100644 --- a/tests/tpm-tis-swtpm-test.c +++ b/tests/tpm-tis-swtpm-test.c @@ -16,6 +16,7 @@ #include #include "libqtest.h" +#include "qemu/module.h" #include "tpm-tests.h" typedef struct TestState { diff --git a/tests/tpm-tis-test.c b/tests/tpm-tis-test.c index c8ec148..92a7e95 100644 --- a/tests/tpm-tis-test.c +++ b/tests/tpm-tis-test.c @@ -18,6 +18,7 @@ #include "hw/acpi/tpm.h" #include "io/channel-socket.h" #include "libqtest.h" +#include "qemu/module.h" #include "tpm-emu.h" #define TIS_REG(LOCTY, REG) \ diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c index 98af02e..c12b892 100644 --- a/tests/usb-hcd-ohci-test.c +++ b/tests/usb-hcd-ohci-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/usb.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 3817966..6ae8a23 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -19,6 +19,7 @@ #include "qemu/sockets.h" #include "chardev/char-fe.h" #include "qemu/memfd.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "libqos/libqos.h" #include "libqos/pci-pc.h" diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index 16107ad..ac49bca 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "hw/9pfs/9p.h" #include "hw/9pfs/9p-synth.h" #include "libqos/virtio-9p.h" diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index fe1168a..1b02714 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "standard-headers/linux/virtio_blk.h" #include "standard-headers/linux/virtio_pci.h" #include "libqos/qgraph.h" diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 163126c..6a008bb 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qapi/qmp/qdict.h" #include "hw/virtio/virtio-net.h" #include "libqos/qgraph.h" diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c index fcb2248..a38a0d1 100644 --- a/tests/virtio-rng-test.c +++ b/tests/virtio-rng-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/virtio-rng.h" diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 1e535cb..1ad9f75 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "scsi/constants.h" #include "libqos/libqos-pc.h" #include "libqos/libqos-spapr.h" diff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c index 85f35e0..066ca61 100644 --- a/tests/virtio-serial-test.c +++ b/tests/virtio-serial-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/virtio-serial.h" /* Tests only initialization so far. TODO: Replace with functional tests */ diff --git a/tests/virtio-test.c b/tests/virtio-test.c index 804e537..f7c6afd 100644 --- a/tests/virtio-test.c +++ b/tests/virtio-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" diff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c index 35cdea9..a810252 100644 --- a/tests/vmxnet3-test.c +++ b/tests/vmxnet3-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qemu/module.h" #include "libqos/qgraph.h" #include "libqos/pci.h" -- cgit v1.1 From a8d2532645cf5ce4f75981f81dfe363efc35d05c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:08 +0200 Subject: Include qemu-common.h exactly where needed No header includes qemu-common.h after this commit, as prescribed by qemu-common.h's file comment. Signed-off-by: Markus Armbruster Message-Id: <20190523143508.25387-5-armbru@redhat.com> [Rebased with conflicts resolved automatically, except for include/hw/arm/xlnx-zynqmp.h hw/arm/nrf51_soc.c hw/arm/msf2-soc.c block/qcow2-refcount.c block/qcow2-cluster.c block/qcow2-cache.c target/arm/cpu.h target/lm32/cpu.h target/m68k/cpu.h target/mips/cpu.h target/moxie/cpu.h target/nios2/cpu.h target/openrisc/cpu.h target/riscv/cpu.h target/tilegx/cpu.h target/tricore/cpu.h target/unicore32/cpu.h target/xtensa/cpu.h; bsd-user/main.c and net/tap-bsd.c fixed up] --- tests/crypto-tls-psk-helpers.h | 1 - tests/crypto-tls-x509-helpers.h | 1 - tests/e1000e-test.c | 1 + tests/test-filter-mirror.c | 1 + tests/test-filter-redirector.c | 1 + tests/virtio-net-test.c | 1 + 6 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/crypto-tls-psk-helpers.h b/tests/crypto-tls-psk-helpers.h index 9aec29f..7cc81dc 100644 --- a/tests/crypto-tls-psk-helpers.h +++ b/tests/crypto-tls-psk-helpers.h @@ -21,7 +21,6 @@ #include #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT -# include "qemu-common.h" void test_tls_psk_init(const char *keyfile); void test_tls_psk_cleanup(const char *keyfile); diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helpers.h index 88c30d7..0690c61 100644 --- a/tests/crypto-tls-x509-helpers.h +++ b/tests/crypto-tls-x509-helpers.h @@ -29,7 +29,6 @@ #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT # include -# include "qemu-common.h" /* * This contains parameter about how to generate diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c index 781fcbf..445787a 100644 --- a/tests/e1000e-test.c +++ b/tests/e1000e-test.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" +#include "qemu-common.h" #include "libqtest.h" #include "qemu-common.h" #include "libqos/pci-pc.h" diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c index d942c74..1e3ced8 100644 --- a/tests/test-filter-mirror.c +++ b/tests/test-filter-mirror.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "libqtest.h" #include "qapi/qmp/qdict.h" #include "qemu/iov.h" diff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c index 6dc21dd..e4d5322 100644 --- a/tests/test-filter-redirector.c +++ b/tests/test-filter-redirector.c @@ -51,6 +51,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "libqtest.h" #include "qapi/qmp/qdict.h" #include "qemu/iov.h" diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 6a008bb..663cf7e 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "libqtest.h" #include "qemu/iov.h" #include "qemu/module.h" -- cgit v1.1 From 0553d895f98d6ffa7354dee324ff7a65fca3367f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 4 Jun 2019 20:16:15 +0200 Subject: Normalize position of header guard This is the common header guard idiom: /* * File comment */ #ifndef GUARD_SYMBOL_H #define GUARD_SYMBOL_H ... actual contents ... #endif A few of our headers have some #include before the guard. target/tilegx/spr_def_64.h has #ifndef __DOXYGEN__ outside the guard. A few more have the #define elsewhere. Change them to match the common idiom. For spr_def_64.h, that means dropping #ifndef __DOXYGEN__. While there, rename guard symbols to make scripts/clean-header-guards.pl happy. Signed-off-by: Markus Armbruster Message-Id: <20190604181618.19980-2-armbru@redhat.com> [Rebased with conflicts resolved automatically] --- tests/io-channel-helpers.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/io-channel-helpers.h b/tests/io-channel-helpers.h index fedc64f..bb2de6f 100644 --- a/tests/io-channel-helpers.h +++ b/tests/io-channel-helpers.h @@ -15,13 +15,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . - * */ -#include "io/channel.h" +#ifndef TEST_IO_CHANNEL_HELPERS_H +#define TEST_IO_CHANNEL_HELPERS_H -#ifndef TEST_IO_CHANNEL_HELPERS -#define TEST_IO_CHANNEL_HELPERS +#include "io/channel.h" typedef struct QIOChannelTest QIOChannelTest; @@ -39,4 +38,4 @@ void qio_channel_test_run_reader(QIOChannelTest *test, void qio_channel_test_validate(QIOChannelTest *test); -#endif /* TEST_IO_CHANNEL_HELPERS */ +#endif /* TEST_IO_CHANNEL_HELPERS_H */ -- cgit v1.1 From 37677d7db39a3c250ad661d00fb7c3b59d047b1f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 4 Jun 2019 20:16:17 +0200 Subject: Clean up a few header guard symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 58ea30f5145 "Clean up header guards that don't match their file name" messed up contrib/elf2dmp/qemu_elf.h and tests/migration/migration-test.h. It missed target/cris/opcode-cris.h and tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h due to the scripts/clean-header-guards.pl bug fixed in the previous commit. Commit a8b991b52dc "Clean up ill-advised or unusual header guards" missed include/hw/xen/io/ring.h for the same reason. Commit 3979fca4b69 "disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h" neglected to update the guard symbol for the rename. Commit a331c6d7741 "semihosting: implement a semihosting console" created include/hw/semihosting/console.h with an ill-advised guard symbol. Clean them up. Signed-off-by: Markus Armbruster Message-Id: <20190604181618.19980-4-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/migration/migration-test.h | 2 +- .../uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h index aa3c3a9..68512c0 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -32,4 +32,4 @@ */ #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) -#endif /* _MIGRATION_TEST_H */ +#endif /* MIGRATION_TEST_H */ diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h index 7a74c12..0780878 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h +++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h @@ -21,8 +21,8 @@ WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef __BIOS_TABLES_TEST_H__ -#define __BIOS_TABLES_TEST_H__ +#ifndef BIOSTABLESTEST_H +#define BIOSTABLESTEST_H #include @@ -77,4 +77,4 @@ typedef struct { } BIOS_TABLES_TEST; #pragma pack () -#endif // __BIOS_TABLES_TEST_H__ +#endif /* BIOSTABLESTEST_H */ -- cgit v1.1 From f91005e195e7e1485e60cb121731589960f1a3c9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 4 Jun 2019 20:16:18 +0200 Subject: Supply missing header guards Signed-off-by: Markus Armbruster Message-Id: <20190604181618.19980-5-armbru@redhat.com> --- tests/crypto-tls-psk-helpers.h | 5 +++++ tests/crypto-tls-x509-helpers.h | 5 +++++ tests/libqos/virtio-9p.h | 5 +++++ tests/libqos/virtio-balloon.h | 5 +++++ tests/libqos/virtio-blk.h | 5 +++++ tests/libqos/virtio-net.h | 5 +++++ tests/libqos/virtio-rng.h | 5 +++++ tests/libqos/virtio-scsi.h | 5 +++++ tests/libqos/virtio-serial.h | 5 +++++ tests/socket-helpers.h | 6 +++++- 10 files changed, 50 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/crypto-tls-psk-helpers.h b/tests/crypto-tls-psk-helpers.h index 7cc81dc..5aa9951 100644 --- a/tests/crypto-tls-psk-helpers.h +++ b/tests/crypto-tls-psk-helpers.h @@ -18,6 +18,9 @@ * Author: Richard W.M. Jones */ +#ifndef TESTS_CRYPTO_TLS_PSK_HELPERS_H +#define TESTS_CRYPTO_TLS_PSK_HELPERS_H + #include #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT @@ -26,3 +29,5 @@ void test_tls_psk_init(const char *keyfile); void test_tls_psk_cleanup(const char *keyfile); #endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ + +#endif diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helpers.h index 0690c61..08efba4 100644 --- a/tests/crypto-tls-x509-helpers.h +++ b/tests/crypto-tls-x509-helpers.h @@ -18,6 +18,9 @@ * Author: Daniel P. Berrange */ +#ifndef TESTS_CRYPTO_TLS_X509_HELPERS_H +#define TESTS_CRYPTO_TLS_X509_HELPERS_H + #include #include @@ -125,3 +128,5 @@ void test_tls_cleanup(const char *keyfile); extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; #endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ + +#endif diff --git a/tests/libqos/virtio-9p.h b/tests/libqos/virtio-9p.h index dba2277..b54e89b 100644 --- a/tests/libqos/virtio-9p.h +++ b/tests/libqos/virtio-9p.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_9P_H +#define TESTS_LIBQOS_VIRTIO_9P_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -40,3 +43,5 @@ struct QVirtio9PDevice { QOSGraphObject obj; QVirtio9P v9p; }; + +#endif diff --git a/tests/libqos/virtio-balloon.h b/tests/libqos/virtio-balloon.h index e8066c4..52661cc 100644 --- a/tests/libqos/virtio-balloon.h +++ b/tests/libqos/virtio-balloon.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_BALLOON_H +#define TESTS_LIBQOS_VIRTIO_BALLOON_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -37,3 +40,5 @@ struct QVirtioBalloonDevice { QOSGraphObject obj; QVirtioBalloon balloon; }; + +#endif diff --git a/tests/libqos/virtio-blk.h b/tests/libqos/virtio-blk.h index dc25849..c05adc6 100644 --- a/tests/libqos/virtio-blk.h +++ b/tests/libqos/virtio-blk.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_BLK_H +#define TESTS_LIBQOS_VIRTIO_BLK_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -38,3 +41,5 @@ struct QVirtioBlkDevice { QOSGraphObject obj; QVirtioBlk blk; }; + +#endif diff --git a/tests/libqos/virtio-net.h b/tests/libqos/virtio-net.h index 28238a1..a5697d7 100644 --- a/tests/libqos/virtio-net.h +++ b/tests/libqos/virtio-net.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_NET_H +#define TESTS_LIBQOS_VIRTIO_NET_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -39,3 +42,5 @@ struct QVirtioNetDevice { QOSGraphObject obj; QVirtioNet net; }; + +#endif diff --git a/tests/libqos/virtio-rng.h b/tests/libqos/virtio-rng.h index fbba988..9e192f1 100644 --- a/tests/libqos/virtio-rng.h +++ b/tests/libqos/virtio-rng.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_RNG_H +#define TESTS_LIBQOS_VIRTIO_RNG_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -37,3 +40,5 @@ struct QVirtioRngDevice { QOSGraphObject obj; QVirtioRng rng; }; + +#endif diff --git a/tests/libqos/virtio-scsi.h b/tests/libqos/virtio-scsi.h index 17a47be..4ca19a6 100644 --- a/tests/libqos/virtio-scsi.h +++ b/tests/libqos/virtio-scsi.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_SCSI_H +#define TESTS_LIBQOS_VIRTIO_SCSI_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -37,3 +40,5 @@ struct QVirtioSCSIDevice { QOSGraphObject obj; QVirtioSCSI scsi; }; + +#endif diff --git a/tests/libqos/virtio-serial.h b/tests/libqos/virtio-serial.h index b7e2a5d..080fa84 100644 --- a/tests/libqos/virtio-serial.h +++ b/tests/libqos/virtio-serial.h @@ -16,6 +16,9 @@ * License along with this library; if not, see */ +#ifndef TESTS_LIBQOS_VIRTIO_SERIAL_H +#define TESTS_LIBQOS_VIRTIO_SERIAL_H + #include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" @@ -37,3 +40,5 @@ struct QVirtioSerialDevice { QOSGraphObject obj; QVirtioSerial serial; }; + +#endif diff --git a/tests/socket-helpers.h b/tests/socket-helpers.h index 1c07d6d..9de0e6b 100644 --- a/tests/socket-helpers.h +++ b/tests/socket-helpers.h @@ -15,9 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see . - * */ +#ifndef TESTS_SOCKET_HELPERS_H +#define TESTS_SOCKET_HELPERS_H + /* * @hostname: a DNS name or numeric IP address * @@ -40,3 +42,5 @@ int socket_can_bind_connect(const char *hostname); * Returns 0 on success, -1 on fatal error */ int socket_check_protocol_support(bool *has_ipv4, bool *has_ipv6); + +#endif -- cgit v1.1