From 681c28a33e305923a717815808056d2d5a89c8f9 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 8 Feb 2016 18:08:51 +0000 Subject: [PATCH] tests: Clean up includes Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Tested-by: Eric Blake --- tests/ac97-test.c | 5 ++--- tests/bios-tables-test.c | 4 +--- tests/boot-order-test.c | 2 +- tests/check-qdict.c | 1 + tests/check-qfloat.c | 1 + tests/check-qint.c | 1 + tests/check-qjson.c | 1 + tests/check-qlist.c | 1 + tests/check-qom-interface.c | 1 + tests/check-qom-proplist.c | 1 + tests/check-qstring.c | 1 + tests/crypto-tls-x509-helpers.c | 4 +--- tests/device-introspect-test.c | 2 +- tests/display-vga-test.c | 5 ++--- tests/drive_del-test.c | 2 +- tests/ds1338-test.c | 1 + tests/e1000-test.c | 5 ++--- tests/eepro100-test.c | 5 ++--- tests/endianness-test.c | 5 +---- tests/es1370-test.c | 5 ++--- tests/fdc-test.c | 4 +--- tests/fw_cfg-test.c | 2 +- tests/hd-geo-test.c | 4 +--- tests/i440fx-test.c | 5 ----- tests/i82801b11-test.c | 5 ++--- tests/intel-hda-test.c | 5 ++--- tests/io-channel-helpers.c | 1 + tests/ioh3420-test.c | 5 ++--- tests/ipmi-bt-test.c | 5 +---- tests/ipmi-kcs-test.c | 4 +--- tests/ipoctal232-test.c | 5 ++--- tests/ivshmem-test.c | 6 +----- tests/libqos/fw_cfg.c | 1 + tests/libqos/i2c-imx.c | 3 +-- tests/libqos/i2c-omap.c | 3 +-- tests/libqos/i2c.c | 1 + tests/libqos/libqos-pc.c | 1 + tests/libqos/libqos.c | 6 +----- tests/libqos/malloc-generic.c | 1 + tests/libqos/malloc-pc.c | 1 + tests/libqos/malloc.c | 3 +-- tests/libqos/pci-pc.c | 1 + tests/libqos/pci.c | 1 + tests/libqos/usb.c | 5 ++--- tests/libqos/virtio-mmio.c | 2 +- tests/libqos/virtio-pci.c | 2 +- tests/libqos/virtio.c | 1 + tests/libqtest.c | 10 +--------- tests/m48t59-test.c | 5 +---- tests/ne2000-test.c | 5 ++--- tests/nvme-test.c | 5 ++--- tests/pc-cpu-test.c | 3 +-- tests/pcnet-test.c | 5 ++--- tests/pkix_asn1_tab.c | 1 + tests/pvpanic-test.c | 5 ++--- tests/q35-test.c | 3 +-- tests/qemu-iotests/socket_scm_helper.c | 8 +------- tests/qom-test.c | 3 +-- tests/rcutorture.c | 5 +---- tests/rtc-test.c | 5 +---- tests/rtl8139-test.c | 3 +-- tests/spapr-phb-test.c | 1 + tests/tco-test.c | 4 +--- tests/test-aio.c | 1 + tests/test-base64.c | 1 + tests/test-bitops.c | 3 +-- tests/test-blockjob-txn.c | 2 +- tests/test-coroutine.c | 1 + tests/test-crypto-cipher.c | 1 + tests/test-crypto-hash.c | 1 + tests/test-crypto-secret.c | 1 + tests/test-crypto-tlscredsx509.c | 4 +--- tests/test-crypto-tlssession.c | 4 +--- tests/test-cutils.c | 3 +-- tests/test-hbitmap.c | 4 +--- tests/test-int128.c | 5 ++--- 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 | 4 +--- tests/test-io-task.c | 1 + tests/test-iov.c | 1 + tests/test-mul64.c | 5 ++--- tests/test-netfilter.c | 1 + tests/test-opts-visitor.c | 1 + tests/test-qdev-global-props.c | 2 +- tests/test-qemu-opts.c | 3 +-- tests/test-qga.c | 9 +-------- tests/test-qmp-commands.c | 1 + tests/test-qmp-event.c | 2 +- tests/test-qmp-input-strict.c | 2 +- tests/test-qmp-input-visitor.c | 2 +- tests/test-qmp-output-visitor.c | 1 + tests/test-rcu-list.c | 6 +----- tests/test-rfifolock.c | 1 + tests/test-string-input-visitor.c | 2 +- tests/test-string-output-visitor.c | 1 + tests/test-thread-pool.c | 1 + tests/test-throttle.c | 1 + tests/test-timed-average.c | 2 +- tests/test-visitor-serialization.c | 3 +-- tests/test-vmstate.c | 1 + tests/test-write-threshold.c | 2 +- tests/test-x86-cpuid.c | 1 + tests/test-xbzrle.c | 6 +----- tests/tmp105-test.c | 1 + tests/tpci200-test.c | 5 ++--- tests/vhost-user-bridge.c | 12 +----------- tests/vhost-user-test.c | 1 + tests/virtio-balloon-test.c | 5 ++--- tests/virtio-blk-test.c | 5 +---- tests/virtio-console-test.c | 5 ++--- tests/virtio-net-test.c | 3 +-- tests/virtio-rng-test.c | 5 ++--- tests/virtio-scsi-test.c | 6 ++---- tests/virtio-serial-test.c | 5 ++--- tests/vmxnet3-test.c | 5 ++--- tests/wdt_ib700-test.c | 5 ++--- 119 files changed, 142 insertions(+), 225 deletions(-) diff --git a/tests/ac97-test.c b/tests/ac97-test.c index af30ea1dd6..75cab8f98f 100644 --- a/tests/ac97-test.c +++ b/tests/ac97-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 75ec330ceb..7155fecdbf 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -10,13 +10,11 @@ * See the COPYING file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include #include #include "qemu-common.h" #include "libqtest.h" -#include "qemu/compiler.h" #include "hw/acpi/acpi-defs.h" #include "hw/smbios/smbios.h" #include "qemu/bitmap.h" diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index 360a6911eb..210964a00c 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory. */ -#include +#include "qemu/osdep.h" #include #include "libqos/fw_cfg.h" #include "libqtest.h" diff --git a/tests/check-qdict.c b/tests/check-qdict.c index a136f2addf..a43056c5de 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qint.h" diff --git a/tests/check-qfloat.c b/tests/check-qfloat.c index 6404ac8df6..3102608f55 100644 --- a/tests/check-qfloat.c +++ b/tests/check-qfloat.c @@ -10,6 +10,7 @@ * See the COPYING.LIB file in the top-level directory. * */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qfloat.h" diff --git a/tests/check-qint.c b/tests/check-qint.c index 86868844ab..c86f7dfa38 100644 --- a/tests/check-qint.c +++ b/tests/check-qint.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qint.h" diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 61e9bfbabf..99de6f5252 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -10,6 +10,7 @@ * See the COPYING.LIB file in the top-level directory. * */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qstring.h" diff --git a/tests/check-qlist.c b/tests/check-qlist.c index b9c05d43fd..f231d5fa97 100644 --- a/tests/check-qlist.c +++ b/tests/check-qlist.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qint.h" diff --git a/tests/check-qom-interface.c b/tests/check-qom-interface.c index f06380ef14..09354deb70 100644 --- a/tests/check-qom-interface.c +++ b/tests/check-qom-interface.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qom/object.h" diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 448d270b68..a2bb556906 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -18,6 +18,7 @@ * Author: Daniel P. Berrange */ +#include "qemu/osdep.h" #include #include "qom/object.h" diff --git a/tests/check-qstring.c b/tests/check-qstring.c index 95dc9e3e7b..9877b42c89 100644 --- a/tests/check-qstring.c +++ b/tests/check-qstring.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qapi/qmp/qstring.h" diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c index 47b4c7ba53..64073d3bd3 100644 --- a/tests/crypto-tls-x509-helpers.c +++ b/tests/crypto-tls-x509-helpers.c @@ -18,10 +18,8 @@ * Author: Daniel P. Berrange */ -#include -#include +#include "qemu/osdep.h" -#include "config-host.h" #include "crypto-tls-x509-helpers.h" #include "qemu/sockets.h" diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c index 11d5fea3e2..4477926014 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -17,8 +17,8 @@ * bugs around here. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "qapi/qmp/qstring.h" #include "libqtest.h" diff --git a/tests/display-vga-test.c b/tests/display-vga-test.c index 7694344eaf..5706d338a1 100644 --- a/tests/display-vga-test.c +++ b/tests/display-vga-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" static void pci_cirrus(void) { diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 33909469f1..fe03236f3a 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -10,8 +10,8 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" static void drive_add(void) diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c index 7d513d8972..2792415841 100644 --- a/tests/ds1338-test.c +++ b/tests/ds1338-test.c @@ -17,6 +17,7 @@ * with this program; if not, see . */ +#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/i2c.h" diff --git a/tests/e1000-test.c b/tests/e1000-test.c index 7ca6d7e72e..a42b3810c1 100644 --- a/tests/e1000-test.c +++ b/tests/e1000-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void test_device(gconstpointer data) diff --git a/tests/eepro100-test.c b/tests/eepro100-test.c index 8bfaccdcbb..e17eed0b7a 100644 --- a/tests/eepro100-test.c +++ b/tests/eepro100-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" static void test_device(gconstpointer data) { diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 2054338e18..cc5bccd88e 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -11,11 +11,8 @@ * */ +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include "libqtest.h" #include "qemu/bswap.h" diff --git a/tests/es1370-test.c b/tests/es1370-test.c index cc23fb5c67..824dc31c64 100644 --- a/tests/es1370-test.c +++ b/tests/es1370-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index dbabf50a9a..53df1d0d88 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -22,9 +22,7 @@ * THE SOFTWARE. */ -#include -#include -#include +#include "qemu/osdep.h" #include diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index b7d4007e32..398643aada 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory. */ -#include +#include "qemu/osdep.h" #include #include "libqtest.h" diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 13b763d6a7..c8e669ac26 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -15,10 +15,8 @@ * Improvements welcome. */ +#include "qemu/osdep.h" #include -#include -#include -#include #include "qemu-common.h" #include "libqtest.h" diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index 0665caf7f5..05029e90b2 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -14,12 +14,7 @@ #include "qemu/osdep.h" #include -#include -#include -#include -#include #include -#include #include "libqtest.h" #include "libqos/pci.h" diff --git a/tests/i82801b11-test.c b/tests/i82801b11-test.c index 78d9ce0e6b..c3b5ebbca1 100644 --- a/tests/i82801b11-test.c +++ b/tests/i82801b11-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/intel-hda-test.c b/tests/intel-hda-test.c index d89b407dcc..1be6add9b5 100644 --- a/tests/intel-hda-test.c +++ b/tests/intel-hda-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" #define HDA_ID "hda0" #define CODEC_DEVICES " -device hda-output,bus=" HDA_ID ".0" \ diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c index 78d36dd703..844066904b 100644 --- a/tests/io-channel-helpers.c +++ b/tests/io-channel-helpers.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io-channel-helpers.h" struct QIOChannelTest { diff --git a/tests/ioh3420-test.c b/tests/ioh3420-test.c index c991a5f873..93eb2f7506 100644 --- a/tests/ioh3420-test.c +++ b/tests/ioh3420-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c index 5b7eb73949..812907fb7b 100644 --- a/tests/ipmi-bt-test.c +++ b/tests/ipmi-bt-test.c @@ -22,10 +22,7 @@ * THE SOFTWARE. */ -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c index 564c470f55..42c4b974c5 100644 --- a/tests/ipmi-kcs-test.c +++ b/tests/ipmi-kcs-test.c @@ -22,9 +22,7 @@ * THE SOFTWARE. */ -#include -#include -#include +#include "qemu/osdep.h" #include diff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c index 3ac1714b48..846aaf5711 100644 --- a/tests/ipoctal232-test.c +++ b/tests/ipoctal232-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index 705fece717..e184c67a1d 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -8,17 +8,13 @@ * See the COPYING file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include #include -#include #include -#include #include "contrib/ivshmem-server/ivshmem-server.h" #include "libqos/pci-pc.h" #include "libqtest.h" -#include "qemu/osdep.h" #include "qemu-common.h" #define TMPSHMSIZE (1 << 20) diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index ef00fedf1a..76894d5759 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -12,6 +12,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqos/fw_cfg.h" #include "libqtest.h" diff --git a/tests/libqos/i2c-imx.c b/tests/libqos/i2c-imx.c index b5cef66b94..51c3468f97 100644 --- a/tests/libqos/i2c-imx.c +++ b/tests/libqos/i2c-imx.c @@ -17,12 +17,11 @@ * with this program; if not, see . */ +#include "qemu/osdep.h" #include "libqos/i2c.h" #include -#include -#include "qemu/osdep.h" #include "libqtest.h" #include "hw/i2c/imx_i2c.h" diff --git a/tests/libqos/i2c-omap.c b/tests/libqos/i2c-omap.c index 3d4d45d848..2028f2f146 100644 --- a/tests/libqos/i2c-omap.c +++ b/tests/libqos/i2c-omap.c @@ -6,12 +6,11 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqos/i2c.h" #include -#include -#include "qemu/osdep.h" #include "qemu/bswap.h" #include "libqtest.h" diff --git a/tests/libqos/i2c.c b/tests/libqos/i2c.c index da7592f713..23bc2a3eb2 100644 --- a/tests/libqos/i2c.c +++ b/tests/libqos/i2c.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqos/i2c.h" #include "libqtest.h" diff --git a/tests/libqos/libqos-pc.c b/tests/libqos/libqos-pc.c index 1403699377..72b5e3ba09 100644 --- a/tests/libqos/libqos-pc.c +++ b/tests/libqos/libqos-pc.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "libqos/libqos-pc.h" #include "libqos/malloc-pc.h" diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 2d1a802dbe..79b0b29b4d 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -1,9 +1,5 @@ -#include -#include -#include +#include "qemu/osdep.h" #include -#include -#include #include #include "libqtest.h" diff --git a/tests/libqos/malloc-generic.c b/tests/libqos/malloc-generic.c index d30a2f4240..6000df2b82 100644 --- a/tests/libqos/malloc-generic.c +++ b/tests/libqos/malloc-generic.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqos/malloc-generic.h" #include "libqos/malloc.h" diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c index 6e253b6877..74f76c59db 100644 --- a/tests/libqos/malloc-pc.c +++ b/tests/libqos/malloc-pc.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqos/malloc-pc.h" #include "libqos/fw_cfg.h" diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c index 19d05cafa6..c0df52f338 100644 --- a/tests/libqos/malloc.c +++ b/tests/libqos/malloc.c @@ -10,10 +10,9 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqos/malloc.h" #include "qemu-common.h" -#include -#include #include typedef QTAILQ_HEAD(MemList, MemBlock) MemList; diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index 6dba0db00a..08167c09fe 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/pci-pc.h" diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c index 80b1a2117d..0e104e14ed 100644 --- a/tests/libqos/pci.c +++ b/tests/libqos/pci.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqos/pci.h" #include "hw/pci/pci_regs.h" diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c index 41d89b8487..87efb90782 100644 --- a/tests/libqos/usb.c +++ b/tests/libqos/usb.c @@ -11,10 +11,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" #include "hw/usb/uhci-regs.h" #include "libqos/usb.h" diff --git a/tests/libqos/virtio-mmio.c b/tests/libqos/virtio-mmio.c index b3e62e77d8..a4382f3660 100644 --- a/tests/libqos/virtio-mmio.c +++ b/tests/libqos/virtio-mmio.c @@ -7,8 +7,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" #include "libqos/virtio.h" #include "libqos/virtio-mmio.h" diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index f9fb924b8e..fde2ff0bcb 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -7,8 +7,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c index 3205b88d90..613decea5a 100644 --- a/tests/libqos/virtio.c +++ b/tests/libqos/virtio.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqtest.h" #include "libqos/virtio.h" diff --git a/tests/libqtest.c b/tests/libqtest.c index fa314e1ee7..b12a9e4ca9 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -14,22 +14,14 @@ * See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include "libqtest.h" #include -#include #include #include #include -#include -#include -#include -#include -#include -#include -#include "qemu/compiler.h" -#include "qemu/osdep.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index 71b4f28052..a751fd350e 100644 --- a/tests/m48t59-test.c +++ b/tests/m48t59-test.c @@ -12,11 +12,8 @@ * */ +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include "libqtest.h" diff --git a/tests/ne2000-test.c b/tests/ne2000-test.c index 61a678ad30..3727875f2e 100644 --- a/tests/ne2000-test.c +++ b/tests/ne2000-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void pci_nop(void) diff --git a/tests/nvme-test.c b/tests/nvme-test.c index ff38b5e48f..ec06893eee 100644 --- a/tests/nvme-test.c +++ b/tests/nvme-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index 3505c7c43f..6b34ca588b 100644 --- a/tests/pc-cpu-test.c +++ b/tests/pc-cpu-test.c @@ -7,12 +7,11 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "libqtest.h" -#include "qemu/osdep.h" #include "qapi/qmp/types.h" struct PCTestData { diff --git a/tests/pcnet-test.c b/tests/pcnet-test.c index 84af4f327a..2ddf4965c6 100644 --- a/tests/pcnet-test.c +++ b/tests/pcnet-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void pci_nop(void) diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c index 5b4e6b9e2d..903bc02518 100644 --- a/tests/pkix_asn1_tab.c +++ b/tests/pkix_asn1_tab.c @@ -3,6 +3,7 @@ * and is under copyright of various GNUTLS contributors. */ +#include "qemu/osdep.h" #include const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c index a7ad6b3064..d435833f79 100644 --- a/tests/pvpanic-test.c +++ b/tests/pvpanic-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" static void test_panic(void) { diff --git a/tests/q35-test.c b/tests/q35-test.c index 812abe5480..a105f10782 100644 --- a/tests/q35-test.c +++ b/tests/q35-test.c @@ -9,12 +9,11 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" -#include "qemu/osdep.h" #include "hw/pci-host/q35.h" static void smram_set_bit(QPCIDevice *pcidev, uint8_t mask, bool enabled) diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c index 81959835eb..80cadf43bc 100644 --- a/tests/qemu-iotests/socket_scm_helper.c +++ b/tests/qemu-iotests/socket_scm_helper.c @@ -10,15 +10,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include #include -#include -#include -#include -#include -#include /* #define SOCKET_SCM_DEBUG */ diff --git a/tests/qom-test.c b/tests/qom-test.c index 3e5e8730e7..3c6cfca788 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -7,12 +7,11 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "libqtest.h" -#include "qemu/osdep.h" #include "qapi/qmp/types.h" static const char *blacklist_x86[] = { diff --git a/tests/rcutorture.c b/tests/rcutorture.c index d6b304d000..244f0f28b2 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -60,13 +60,10 @@ * Test variables. */ +#include "qemu/osdep.h" #include -#include -#include -#include #include "qemu/atomic.h" #include "qemu/rcu.h" -#include "qemu/compiler.h" #include "qemu/thread.h" long long n_reads = 0LL; diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 4243624de6..fa7029aa8a 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -11,11 +11,8 @@ * */ +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include "libqtest.h" #include "hw/timer/mc146818rtc_regs.h" diff --git a/tests/rtl8139-test.c b/tests/rtl8139-test.c index ba62851cae..54e5aa7d0e 100644 --- a/tests/rtl8139-test.c +++ b/tests/rtl8139-test.c @@ -7,11 +7,10 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" #include "libqos/pci-pc.h" -#include "qemu/osdep.h" #include "qemu/timer.h" #include "qemu-common.h" diff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c index b629de475a..f53911d9f7 100644 --- a/tests/spapr-phb-test.c +++ b/tests/spapr-phb-test.c @@ -7,6 +7,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqtest.h" diff --git a/tests/tco-test.c b/tests/tco-test.c index 419f7cf46c..ac11175e90 100644 --- a/tests/tco-test.c +++ b/tests/tco-test.c @@ -6,10 +6,8 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include -#include -#include #include "libqtest.h" #include "libqos/pci.h" diff --git a/tests/test-aio.c b/tests/test-aio.c index 6ccea98977..a109bd0c42 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -10,6 +10,7 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "block/aio.h" #include "qemu/timer.h" diff --git a/tests/test-base64.c b/tests/test-base64.c index a0ca2d8de8..ae0c107c7d 100644 --- a/tests/test-base64.c +++ b/tests/test-base64.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include #include "qemu/base64.h" diff --git a/tests/test-bitops.c b/tests/test-bitops.c index 47b5d3ed9a..5050950607 100644 --- a/tests/test-bitops.c +++ b/tests/test-bitops.c @@ -6,9 +6,8 @@ * */ -#include -#include #include "qemu/osdep.h" +#include #include "qemu/bitops.h" typedef struct { diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 34747e924d..c866da66c8 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -10,8 +10,8 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include "qapi/error.h" #include "qemu/main-loop.h" #include "block/blockjob.h" diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c index f5951cb1f1..dd4ced946c 100644 --- a/tests/test-coroutine.c +++ b/tests/test-coroutine.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include #include "qemu/coroutine.h" #include "qemu/coroutine_int.h" diff --git a/tests/test-crypto-cipher.c b/tests/test-crypto-cipher.c index c687307bcd..9f912eccb5 100644 --- a/tests/test-crypto-cipher.c +++ b/tests/test-crypto-cipher.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include #include "crypto/init.h" diff --git a/tests/test-crypto-hash.c b/tests/test-crypto-hash.c index 3ec31dde7b..735d6d7e0b 100644 --- a/tests/test-crypto-hash.c +++ b/tests/test-crypto-hash.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include #include "crypto/init.h" diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c index a49c8e31e8..2bbc4d9e3c 100644 --- a/tests/test-crypto-secret.c +++ b/tests/test-crypto-secret.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include #include "crypto/init.h" diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c index c70aa5563a..7ca387db65 100644 --- a/tests/test-crypto-tlscredsx509.c +++ b/tests/test-crypto-tlscredsx509.c @@ -18,10 +18,8 @@ * Author: Daniel P. Berrange */ -#include -#include +#include "qemu/osdep.h" -#include "config-host.h" #include "crypto-tls-x509-helpers.h" #include "crypto/tlscredsx509.h" diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c index 4524128fca..036a86b0c3 100644 --- a/tests/test-crypto-tlssession.c +++ b/tests/test-crypto-tlssession.c @@ -18,10 +18,8 @@ * Author: Daniel P. Berrange */ -#include -#include +#include "qemu/osdep.h" -#include "config-host.h" #include "crypto-tls-x509-helpers.h" #include "crypto/tlscredsx509.h" #include "crypto/tlssession.h" diff --git a/tests/test-cutils.c b/tests/test-cutils.c index a3de6ab870..398700df45 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -25,9 +25,8 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include -#include -#include #include "qemu-common.h" diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c index abcea0cda6..abe1427917 100644 --- a/tests/test-hbitmap.c +++ b/tests/test-hbitmap.c @@ -9,10 +9,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include -#include -#include #include "qemu/hbitmap.h" #define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6) diff --git a/tests/test-int128.c b/tests/test-int128.c index 0772ef7538..cacf6beac8 100644 --- a/tests/test-int128.c +++ b/tests/test-int128.c @@ -6,10 +6,9 @@ * */ -#include -#include -#include "qemu/int128.h" #include "qemu/osdep.h" +#include +#include "qemu/int128.h" /* clang doesn't support __noclone__ but it does have a mechanism for * telling us this. We assume that if we don't have __has_attribute() diff --git a/tests/test-io-channel-buffer.c b/tests/test-io-channel-buffer.c index 6637501b41..64722a214b 100644 --- a/tests/test-io-channel-buffer.c +++ b/tests/test-io-channel-buffer.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-buffer.h" #include "io-channel-helpers.h" diff --git a/tests/test-io-channel-command.c b/tests/test-io-channel-command.c index 03cac36a3f..885543760a 100644 --- a/tests/test-io-channel-command.c +++ b/tests/test-io-channel-command.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-command.h" #include "io-channel-helpers.h" diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c index f276a32de0..c5d3d3c251 100644 --- a/tests/test-io-channel-file.c +++ b/tests/test-io-channel-file.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-file.h" #include "io-channel-helpers.h" diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index 1a36a3c696..f0872b26f2 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-socket.h" #include "io-channel-helpers.h" #ifdef HAVE_IFADDRS_H diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index 3c11a5097c..3c361a7bef 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -21,10 +21,8 @@ */ -#include -#include +#include "qemu/osdep.h" -#include "config-host.h" #include "crypto-tls-x509-helpers.h" #include "io/channel-tls.h" #include "io/channel-socket.h" diff --git a/tests/test-io-task.c b/tests/test-io-task.c index 3344382c7f..ae46c56a47 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include #include "io/task.h" diff --git a/tests/test-iov.c b/tests/test-iov.c index 46e4dddc55..3f25268dd4 100644 --- a/tests/test-iov.c +++ b/tests/test-iov.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include #include "qemu-common.h" #include "qemu/iov.h" diff --git a/tests/test-mul64.c b/tests/test-mul64.c index a0a17f7775..1282ec5a22 100644 --- a/tests/test-mul64.c +++ b/tests/test-mul64.c @@ -6,10 +6,9 @@ * */ -#include -#include -#include "qemu/host-utils.h" #include "qemu/osdep.h" +#include +#include "qemu/host-utils.h" typedef struct { diff --git a/tests/test-netfilter.c b/tests/test-netfilter.c index 303deb7e09..7d105c3232 100644 --- a/tests/test-netfilter.c +++ b/tests/test-netfilter.c @@ -8,6 +8,7 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqtest.h" diff --git a/tests/test-opts-visitor.c b/tests/test-opts-visitor.c index 9600b97012..b7acf7d294 100644 --- a/tests/test-opts-visitor.c +++ b/tests/test-opts-visitor.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qemu/config-file.h" /* qemu_add_opts() */ diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 07c182338b..f0cc31e113 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include -#include #include "hw/qdev.h" #include "qom/object.h" diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 0c1136d1b2..848374e2bd 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -7,12 +7,11 @@ * See the COPYING.LIB file in the top-level directory. */ -#include "qapi/error.h" +#include "qemu/osdep.h" #include "qapi/qmp/qstring.h" #include "qemu/config-file.h" #include -#include static QemuOptsList opts_list_01 = { .name = "opts_list_01", diff --git a/tests/test-qga.c b/tests/test-qga.c index e6a84d17f0..0973b487d2 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -1,18 +1,11 @@ +#include "qemu/osdep.h" #include #include #include -#include -#include -#include -#include -#include #include #include -#include -#include #include "libqtest.h" -#include "config-host.h" #include "qga/guest-agent-core.h" typedef struct { diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 4d267b6a83..d6171f2d44 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include #include "qemu-common.h" #include "qapi/qmp/types.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 035c65cfdf..a296fdbac2 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -11,8 +11,8 @@ * */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "test-qapi-types.h" diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c index 775ad39d93..6a33aa41e5 100644 --- a/tests/test-qmp-input-strict.c +++ b/tests/test-qmp-input-strict.c @@ -11,8 +11,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "qapi/qmp-input-visitor.h" diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c index f6bd408db3..c72cdad563 100644 --- a/tests/test-qmp-input-visitor.c +++ b/tests/test-qmp-input-visitor.c @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "qapi/qmp-input-visitor.h" diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c index 26dc752b81..965f298e11 100644 --- a/tests/test-qmp-output-visitor.c +++ b/tests/test-qmp-output-visitor.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qemu-common.h" diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c index daa8bf41db..79d3750144 100644 --- a/tests/test-rcu-list.c +++ b/tests/test-rcu-list.c @@ -20,14 +20,10 @@ * Copyright (c) 2013 Mike D. Day, IBM Corporation. */ +#include "qemu/osdep.h" #include -#include -#include -#include #include "qemu/atomic.h" #include "qemu/rcu.h" -#include "qemu/compiler.h" -#include "qemu/osdep.h" #include "qemu/thread.h" #include "qemu/rcu_queue.h" diff --git a/tests/test-rfifolock.c b/tests/test-rfifolock.c index 0572ebb42a..9a3cb243ba 100644 --- a/tests/test-rfifolock.c +++ b/tests/test-rfifolock.c @@ -10,6 +10,7 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qemu-common.h" #include "qemu/rfifolock.h" diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c index d99498d098..4b48ec25d3 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu-common.h" #include "qapi/string-input-visitor.h" diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index 4f4450fe70..0beccf98c7 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qemu-common.h" diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c index ccdee39993..40600b40bb 100644 --- a/tests/test-thread-pool.c +++ b/tests/test-thread-pool.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include #include "qemu-common.h" #include "block/aio.h" diff --git a/tests/test-throttle.c b/tests/test-throttle.c index a95039fdbf..858f1aa43f 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -12,6 +12,7 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include #include #include "block/aio.h" diff --git a/tests/test-timed-average.c b/tests/test-timed-average.c index a049799b80..1cc4ab3027 100644 --- a/tests/test-timed-average.c +++ b/tests/test-timed-average.c @@ -10,8 +10,8 @@ * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "qemu/timed-average.h" diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index f74a6df97b..ef4dac5e01 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -11,9 +11,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include -#include #include #include "qemu-common.h" diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 4d13bd09b3..713d4443b2 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include "qemu-common.h" diff --git a/tests/test-write-threshold.c b/tests/test-write-threshold.c index faffa7b855..fdbc8020fd 100644 --- a/tests/test-write-threshold.c +++ b/tests/test-write-threshold.c @@ -6,8 +6,8 @@ * */ +#include "qemu/osdep.h" #include -#include #include "block/block_int.h" #include "block/write-threshold.h" diff --git a/tests/test-x86-cpuid.c b/tests/test-x86-cpuid.c index 6cd20d4a23..8eb0bc6ad5 100644 --- a/tests/test-x86-cpuid.c +++ b/tests/test-x86-cpuid.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include "hw/i386/topology.h" diff --git a/tests/test-xbzrle.c b/tests/test-xbzrle.c index 1cd8cb7d78..abd309d418 100644 --- a/tests/test-xbzrle.c +++ b/tests/test-xbzrle.c @@ -10,11 +10,7 @@ * See the COPYING file in the top-level directory. * */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "qemu-common.h" #include "include/migration/migration.h" diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index 99db538191..235cae0137 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "libqtest.h" diff --git a/tests/tpci200-test.c b/tests/tpci200-test.c index 9ae01277ee..cb2b00ca8b 100644 --- a/tests/tpci200-test.c +++ b/tests/tpci200-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 9fb09f1df4..9a1ad5a1bb 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -29,23 +29,13 @@ #define _FILE_OFFSET_BITS 64 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include #include #include #include #include -#include #include #include diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index e30b7f4abc..69615968ce 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -8,6 +8,7 @@ * */ +#include "qemu/osdep.h" #include #include "libqtest.h" diff --git a/tests/virtio-balloon-test.c b/tests/virtio-balloon-test.c index becebb51a7..b010ce98e8 100644 --- a/tests/virtio-balloon-test.c +++ b/tests/virtio-balloon-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void pci_nop(void) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 4078321a20..3a66630d79 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -8,11 +8,8 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include "libqtest.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" diff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c index 6be96e8c64..0b9c2a55ef 100644 --- a/tests/virtio-console-test.c +++ b/tests/virtio-console-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void console_pci_nop(void) diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 982d77a14b..04cfcd594e 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -7,12 +7,11 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include "libqtest.h" #include "qemu-common.h" #include "qemu/sockets.h" -#include "qemu/osdep.h" #include "qemu/iov.h" #include "libqos/pci-pc.h" #include "libqos/virtio.h" diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c index 41c1cdb1aa..771dbd73af 100644 --- a/tests/virtio-rng-test.c +++ b/tests/virtio-rng-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" #include "libqos/pci.h" #define PCI_SLOT_HP 0x06 diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 66d8491e9d..d78747a466 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -8,11 +8,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" -#include +#include +#include "libqtest.h" #include "block/scsi.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" diff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c index bf030a6162..480d4abb2d 100644 --- a/tests/virtio-serial-test.c +++ b/tests/virtio-serial-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void pci_nop(void) diff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c index a2ebed39cc..6ef0e2f043 100644 --- a/tests/vmxnet3-test.c +++ b/tests/vmxnet3-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop(void) diff --git a/tests/wdt_ib700-test.c b/tests/wdt_ib700-test.c index 82ca597252..efe3370453 100644 --- a/tests/wdt_ib700-test.c +++ b/tests/wdt_ib700-test.c @@ -7,10 +7,9 @@ * See the COPYING file in the top-level directory. */ -#include -#include -#include "libqtest.h" #include "qemu/osdep.h" +#include +#include "libqtest.h" #include "qemu/timer.h" static void qmp_check_no_event(void)