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 <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Tested-by: Eric Blake <[email protected]>

diff --git a/tests/ac97-test.c b/tests/ac97-test.c
index af30ea1dd6a72bf2d54bd0e31fa75a65fe431041..75cab8f98f9de5447a479a0c1945150a6654a986 100644 (file)
--- a/tests/ac97-test.c
+++ b/tests/ac97-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 75ec330cebde7c32eca174e90e4b31c10436c4ba..7155fecdbf00bd0932c886d8942b174b2b69feec 100644 (file)
--- 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 <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #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 360a6911ebfe8573cdfef54a8ab76adbdb8d3e9b..210964a00c899ef03b66e69eb2ede0cefd89356f 100644 (file)
--- 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 <string.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "libqos/fw_cfg.h"
 #include "libqtest.h"

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index a136f2addf2917a20d78d5eff0293bbfbaabeee1..a43056c5dee7fcec56ade1ac8f7fe2aaddb32c6f 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qint.h"

diff --git a/tests/check-qfloat.c b/tests/check-qfloat.c
index 6404ac8df6013b4c1afaad8c70cf04dcb82bf961..3102608f55a06e63ac8e771e740e72f85528efb5 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qfloat.h"

diff --git a/tests/check-qint.c b/tests/check-qint.c
index 86868844abbfd2ef333d80a8301d46a9f84130de..c86f7dfa38b421fe07bbe2133f3eb1d4552d4b1d 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qint.h"

diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 61e9bfbabf5cfc30a6dd7759af0e1685897ee822..99de6f52527613f7b23e8937f4f1624721371cc1 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qstring.h"

diff --git a/tests/check-qlist.c b/tests/check-qlist.c
index b9c05d43fd6fbfa97f969a0d8dfcc26c7a7e656f..f231d5fa971a5ee8e6c9be4dcb2f3ce40ca21682 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qint.h"

diff --git a/tests/check-qom-interface.c b/tests/check-qom-interface.c
index f06380ef14d810c3743fc7ca8c1b7bb9acc97ed4..09354deb703e65f0bcf4fe7364be0980bddd7f6e 100644 (file)
--- 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 <glib.h>
 
 #include "qom/object.h"

diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index 448d270b68a7526aaee66953a201bd001f25a0a3..a2bb556906d4fcae610f0b5900d28339e66b79ea 100644 (file)
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -18,6 +18,7 @@
  * Author: Daniel P. Berrange <[email protected]>
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "qom/object.h"

diff --git a/tests/check-qstring.c b/tests/check-qstring.c
index 95dc9e3e7b81b4b567fc9989546b8dedfef6573d..9877b42c89d672a691b201670502092efb55f04b 100644 (file)
--- 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 <glib.h>
 
 #include "qapi/qmp/qstring.h"

diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
index 47b4c7ba53fe60ed531f4718f4cd6ef7c8a061f6..64073d3bd3179dc93d9b2cb958530aef0d7f31a5 100644 (file)
--- a/tests/crypto-tls-x509-helpers.c
+++ b/tests/crypto-tls-x509-helpers.c
@@ -18,10 +18,8 @@
  * Author: Daniel P. Berrange <[email protected]>
  */
 
-#include <stdlib.h>
-#include <fcntl.h>
+#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 11d5fea3e2b646c5655e213d4cbe5d6b289c020f..447792601499227968d5ce25d743e49d9b7a07a8 100644 (file)
--- a/tests/device-introspect-test.c
+++ b/tests/device-introspect-test.c
@@ -17,8 +17,8 @@
  * bugs around here.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdarg.h>
 #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 7694344eaf9f8bc61a1ebe2c41e8498d779a45b5..5706d338a18d0c47b01d9bbd5c3984f73bfd677f 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 
 static void pci_cirrus(void)
 {

diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c
index 33909469f11c135d4b43fd1f1b28ecf5830818d4..fe03236f3a7878b7037e2669eda74ee37cac5ea0 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 #include "libqtest.h"
 
 static void drive_add(void)

diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c
index 7d513d89724c273fba27621ff0479953d980f09d..27924158419e479fcafb86f6b045a047af44ca22 100644 (file)
--- a/tests/ds1338-test.c
+++ b/tests/ds1338-test.c
@@ -17,6 +17,7 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "libqtest.h"
 #include "libqos/i2c.h"
 

diff --git a/tests/e1000-test.c b/tests/e1000-test.c
index 7ca6d7e72efbb49db2597652f24389671f70577b..a42b3810c1fee2e1ea05335fbf0716b141d7421a 100644 (file)
--- a/tests/e1000-test.c
+++ b/tests/e1000-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 8bfaccdcbbf5d61c5ec1e82f6a16e667f09d7b2d..e17eed0b7aeb0a408ed218f526872abec7fcd5c7 100644 (file)
--- a/tests/eepro100-test.c
+++ b/tests/eepro100-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 
 static void test_device(gconstpointer data)
 {

diff --git a/tests/endianness-test.c b/tests/endianness-test.c
index 2054338e1839af08acad75fde81ade4a413fad96..cc5bccd88e09813c81c217b7f58d230f87b2e5f6 100644 (file)
--- a/tests/endianness-test.c
+++ b/tests/endianness-test.c
@@ -11,11 +11,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 #include "libqtest.h"
 #include "qemu/bswap.h"

diff --git a/tests/es1370-test.c b/tests/es1370-test.c
index cc23fb5c67a5ce43f2214911d1495db5a0f3f554..824dc31c64a10a9bda5cf62f1f1228a3932a3fe8 100644 (file)
--- a/tests/es1370-test.c
+++ b/tests/es1370-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 dbabf50a9a504aed2d8186b52875119bb8ae69f1..53df1d0d881b791ed417307d70b06f566a4ec428 100644 (file)
--- a/tests/fdc-test.c
+++ b/tests/fdc-test.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 
 #include <glib.h>
 

diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
index b7d4007e32a283fb1b4c898510f2af7c31ff6894..398643aadacbdb9c5e3df64d03955b0f8726a2b5 100644 (file)
--- 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 <string.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "libqtest.h"

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 13b763d6a732c609ff9ec6b0ba03e0a2e90bc0d2..c8e669ac26af655acb8e674dd5f04974ab9fc7ea 100644 (file)
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -15,10 +15,8 @@
  * Improvements welcome.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "qemu-common.h"
 #include "libqtest.h"
 

diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index 0665caf7f55bbf18a600ecdff5b3c212254404fa..05029e90b2be5b47375cddec8db39d489ebc23e7 100644 (file)
--- a/tests/i440fx-test.c
+++ b/tests/i440fx-test.c
@@ -14,12 +14,7 @@
 
 #include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/mman.h>
-#include <stdlib.h>
 
 #include "libqtest.h"
 #include "libqos/pci.h"

diff --git a/tests/i82801b11-test.c b/tests/i82801b11-test.c
index 78d9ce0e6bc44432c158ad8ae2c76fb91c67861f..c3b5ebbca1ed8960b6e75b28214c0b9021f94e27 100644 (file)
--- a/tests/i82801b11-test.c
+++ b/tests/i82801b11-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 d89b407dcc50e21272a25ef4efaf988362a26ced..1be6add9b587d261e0de4962322af8d7a2df3daf 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 78d36dd7038b90d4b442f115d699f8f1c8af850b..844066904bb1251b06d8ade8cc392f0860c92366 100644 (file)
--- 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 c991a5f87343f313a5384c7950e02e708e3514cb..93eb2f7506180d3d23001b700e28a4101116b72f 100644 (file)
--- a/tests/ioh3420-test.c
+++ b/tests/ioh3420-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 5b7eb73949de9a3123aed3ee42dff480d07dfdcb..812907fb7b0c4791b8422597bc845046a929f095 100644 (file)
--- a/tests/ipmi-bt-test.c
+++ b/tests/ipmi-bt-test.c
@@ -22,10 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
index 564c470f55132d6dedb202184d6542041722b8b8..42c4b974c58658676efb44e05024d5461e4d322e 100644 (file)
--- a/tests/ipmi-kcs-test.c
+++ b/tests/ipmi-kcs-test.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 
 #include <glib.h>
 

diff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c
index 3ac1714b483dd6cc64405b3b3d657fe4497cc8f3..846aaf5711cf8950326ff48a582452b3e8ae224f 100644 (file)
--- a/tests/ipoctal232-test.c
+++ b/tests/ipoctal232-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 705fece717b797a74a3c3d6531949b476510a538..e184c67a1dff94c3e282458d151868354d81f1c8 100644 (file)
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -8,17 +8,13 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <errno.h>
-#include <fcntl.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <string.h>
 #include <sys/mman.h>
-#include <unistd.h>
 #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 ef00fedf1a4af7ddeffeb88f9afe65bb261c0019..76894d575938697b35a6976889de707a4483be3d 100644 (file)
--- 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 <glib.h>
 #include "libqos/fw_cfg.h"
 #include "libqtest.h"

diff --git a/tests/libqos/i2c-imx.c b/tests/libqos/i2c-imx.c
index b5cef66b94f356b2506a944314f72747b2ea0868..51c3468f97f470f7032f69f709b6bae841458608 100644 (file)
--- a/tests/libqos/i2c-imx.c
+++ b/tests/libqos/i2c-imx.c
@@ -17,12 +17,11 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "libqos/i2c.h"
 
 #include <glib.h>
-#include <string.h>
 
-#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 3d4d45d848a9dc0b7cc1ae2895f0fedbe98af058..2028f2f14656868c4868db126aa58b77e0e64a00 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 
-#include "qemu/osdep.h"
 #include "qemu/bswap.h"
 #include "libqtest.h"
 

diff --git a/tests/libqos/i2c.c b/tests/libqos/i2c.c
index da7592f713e46f4e3007c204a222b50433d43012..23bc2a3eb2219935fbf51e41ecdd9673ab9f9dd0 100644 (file)
--- 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 14036993778037466205a16c664fba54408c2362..72b5e3ba09beab71bea53d386ad8c2ebd7654361 100644 (file)
--- 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 2d1a802dbeee7793d8cd26d2385052621aa54c4d..79b0b29b4d89a1b8ea67c0c142dfcc8b9439d34d 100644 (file)
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -1,9 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <sys/wait.h>
 
 #include "libqtest.h"

diff --git a/tests/libqos/malloc-generic.c b/tests/libqos/malloc-generic.c
index d30a2f424072bc0e0cc6d743d5776ba148339dad..6000df2b8231af4da2696291c8db4d3b6f5d9cd0 100644 (file)
--- 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 <glib.h>
 #include "libqos/malloc-generic.h"
 #include "libqos/malloc.h"

diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c
index 6e253b6877eb693fb071099c2ac499cd4b31aedd..74f76c59db01b02cfdc9d89a2a765644e77cbd9f 100644 (file)
--- 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 19d05cafa67de733b68eeceb1207ef1d2b32d7d3..c0df52f338907a15d2fdb9d9868388dbaa979c50 100644 (file)
--- 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 <stdio.h>
-#include <inttypes.h>
 #include <glib.h>
 
 typedef QTAILQ_HEAD(MemList, MemBlock) MemList;

diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c
index 6dba0db00ae3de26428a3ff741a3ca131edbc97e..08167c09fe730b746e7380ee055b326581a78bc2 100644 (file)
--- 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 80b1a2117d081a4bb8a8dca2cb35fa27d7382f93..0e104e14ed1533fa2384a11acb4bc73cc564301e 100644 (file)
--- 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 41d89b8487d84f874d8fc8c0a9838df80ac825f8..87efb90782cfc6c9e1734c5e98e8d53d17026ca3 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 b3e62e77d815ceb46247b1f0644496a2c1073feb..a4382f3660859b27fdeef827b85ded4e751099ad 100644 (file)
--- 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 <glib.h>
-#include <stdio.h>
 #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 f9fb924b8ee4a8e10e1c27864763a0550e41219b..fde2ff0bcbf606d45893a3a1befd19e5ff20d063 100644 (file)
--- 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 <glib.h>
-#include <stdio.h>
 #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 3205b88d90107741fd813ae07e9522fd77ebeaab..613decea5ac7760122b61a11bad83aa281046101 100644 (file)
--- 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 <glib.h>
 #include "libqtest.h"
 #include "libqos/virtio.h"

diff --git a/tests/libqtest.c b/tests/libqtest.c
index fa314e1ee7bfea32cb2abd924050322a80c5bde5..b12a9e4ca94d36fd9dffa030578bcbc1caf6452d 100644 (file)
--- 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 <glib.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#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 71b4f280528bbe9258e66bcd68edf71ec60ac5fd..a751fd350e26774e78344b4b017e124f781bf457 100644 (file)
--- a/tests/m48t59-test.c
+++ b/tests/m48t59-test.c
@@ -12,11 +12,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 #include "libqtest.h"
 

diff --git a/tests/ne2000-test.c b/tests/ne2000-test.c
index 61a678ad300e6602ca8038926ca90fa72a4704cb..3727875f2edee1901969989563d6d2557cbeef83 100644 (file)
--- a/tests/ne2000-test.c
+++ b/tests/ne2000-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 ff38b5e48fa1f50b8a0d0418b8a021734e0448d9..ec06893eee2e9c3957bad31c85a3a2bcec093a05 100644 (file)
--- a/tests/nvme-test.c
+++ b/tests/nvme-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 3505c7c43fa4cd78dcc0613c7f4b4e46fee30291..6b34ca588b108a70b7771cd91ea33cc4b9b755fe 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 
 #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 84af4f327a6c34ae293773183b90de0024e998b3..2ddf4965c67aa355a78401cb790c7e96283a25bd 100644 (file)
--- a/tests/pcnet-test.c
+++ b/tests/pcnet-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 5b4e6b9e2d03cb429e989c965fe14dfeed9e79a2..903bc025181dff90173c131264420f28d1d0f63e 100644 (file)
--- 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 <libtasn1.h>
 
 const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {

diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c
index a7ad6b30646e3d8534a024797aad4f404101e89b..d435833f79763dd3afd34d173f050087d6196354 100644 (file)
--- a/tests/pvpanic-test.c
+++ b/tests/pvpanic-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 
 static void test_panic(void)
 {

diff --git a/tests/q35-test.c b/tests/q35-test.c
index 812abe54806ecac2c97b50f69a93e9adca060539..a105f10782f7ee60db00b5219dfbbf3a75ed9ce0 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 #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 81959835ebcdf405d9988fc07d2fd874b6f2d82c..80cadf43bc8fff635be2025423e8f40293fb8232 100644 (file)
--- 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 <stdio.h>
-#include <errno.h>
+#include "qemu/osdep.h"
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 
 /* #define SOCKET_SCM_DEBUG */
 

diff --git a/tests/qom-test.c b/tests/qom-test.c
index 3e5e8730e76d40cb0a11e4480c94bacabf413e87..3c6cfca78856ae30a729a29961e604cd9bd422f6 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 
 #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 d6b304d000dbc8b6542700406e838732512fa1af..244f0f28b261244ca1812d41c9e0f99dd0f92a02 100644 (file)
--- a/tests/rcutorture.c
+++ b/tests/rcutorture.c
@@ -60,13 +60,10 @@
  * Test variables.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #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 4243624de6c85e5e025c7a209d865068f12c1233..fa7029aa8a742af0237899e988818b93ed96e1b1 100644 (file)
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -11,11 +11,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 #include "libqtest.h"
 #include "hw/timer/mc146818rtc_regs.h"

diff --git a/tests/rtl8139-test.c b/tests/rtl8139-test.c
index ba62851caeed641bd567160e9d02f55789bd7fe6..54e5aa7d0ec204afcd75dc4239b48e03566d1cb8 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 #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 b629de475a1598d1b6ff88f13f0105abcfe3809b..f53911d9f7d608fe910e5a979b70dae8e57076cb 100644 (file)
--- 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 <glib.h>
 
 #include "libqtest.h"

diff --git a/tests/tco-test.c b/tests/tco-test.c
index 419f7cf46c25cef6040d8a03ace04eb2da1bee33..ac11175e9003b0093b4d26e2fde2e8a5f0449d5a 100644 (file)
--- 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 <glib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "libqtest.h"
 #include "libqos/pci.h"

diff --git a/tests/test-aio.c b/tests/test-aio.c
index 6ccea9897714a0c3be6864e2dc3dd45edf2f397b..a109bd0c421bc7bfba9c38e877a4f0f343d5641a 100644 (file)
--- 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 <glib.h>
 #include "block/aio.h"
 #include "qemu/timer.h"

diff --git a/tests/test-base64.c b/tests/test-base64.c
index a0ca2d8de82a56f7fe135dcbb7f0975523f5f9c2..ae0c107c7d37cdeb9c1b9605da7a54d8d4dfb402 100644 (file)
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "qemu/base64.h"

diff --git a/tests/test-bitops.c b/tests/test-bitops.c
index 47b5d3ed9aefb9968c681b546af69536abbb3c66..5050950607a6ce6db995313075dc1a22ab2b0216 100644 (file)
--- a/tests/test-bitops.c
+++ b/tests/test-bitops.c
@@ -6,9 +6,8 @@
  *
  */
 
-#include <glib.h>
-#include <stdint.h>
 #include "qemu/osdep.h"
+#include <glib.h>
 #include "qemu/bitops.h"
 
 typedef struct {

diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
index 34747e924d72df26ed7091a0807ee64a27c38cf9..c866da66c884782049f24b73a94757c96b2adfbb 100644 (file)
--- 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 <glib.h>
-#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 f5951cb1f1d3dd005a589b763770ed5ee0a6c01e..dd4ced946c2f9f4bd5d1c11b7402a6b6ee5bc632 100644 (file)
--- a/tests/test-coroutine.c
+++ b/tests/test-coroutine.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qemu/coroutine.h"
 #include "qemu/coroutine_int.h"

diff --git a/tests/test-crypto-cipher.c b/tests/test-crypto-cipher.c
index c687307bcd431766de159dc1306c0d8e781afffe..9f912eccb51c53c87623e5c520fb50322f272451 100644 (file)
--- a/tests/test-crypto-cipher.c
+++ b/tests/test-crypto-cipher.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "crypto/init.h"

diff --git a/tests/test-crypto-hash.c b/tests/test-crypto-hash.c
index 3ec31dde7bb422bbac3b691519aed50745403c06..735d6d7e0b7510ee8e54adddbcc4a09e730339cc 100644 (file)
--- a/tests/test-crypto-hash.c
+++ b/tests/test-crypto-hash.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "crypto/init.h"

diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c
index a49c8e31e884c0d307765993244c09cfbd3c2f13..2bbc4d9e3ca8f3fb2db6726e66038b35d6f43a93 100644 (file)
--- a/tests/test-crypto-secret.c
+++ b/tests/test-crypto-secret.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "crypto/init.h"

diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c
index c70aa5563a111dc6747ee60b48661110366ce3c6..7ca387db65ad8569e58e3c0d441001c27d4a0091 100644 (file)
--- a/tests/test-crypto-tlscredsx509.c
+++ b/tests/test-crypto-tlscredsx509.c
@@ -18,10 +18,8 @@
  * Author: Daniel P. Berrange <[email protected]>
  */
 
-#include <stdlib.h>
-#include <fcntl.h>
+#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 4524128fca195b13bf23a12983b41d8e1588b8d9..036a86b0c386579d94039b4c76cfa4534e86ffd1 100644 (file)
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -18,10 +18,8 @@
  * Author: Daniel P. Berrange <[email protected]>
  */
 
-#include <stdlib.h>
-#include <fcntl.h>
+#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 a3de6ab870cecc640cf9585987a396bbc3a15e25..398700df45ab6edeb2bf2a559db177931ec41ffa 100644 (file)
--- a/tests/test-cutils.c
+++ b/tests/test-cutils.c
@@ -25,9 +25,8 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <errno.h>
-#include <string.h>
 
 #include "qemu-common.h"
 

diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c
index abcea0cda6a1339cc45a0ded0874ca4ab37977a3..abe1427917fd313a48c43969fee0f9c044844dd3 100644 (file)
--- 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 <glib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <sys/types.h>
 #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 0772ef7538c9d8ebea3295f0925f2e34ef416ba7..cacf6beac80cbcb911c961052cf87cc517cf93ea 100644 (file)
--- a/tests/test-int128.c
+++ b/tests/test-int128.c
@@ -6,10 +6,9 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdio.h>
 #include "qemu/int128.h"
-#include "qemu/osdep.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 6637501b41f721ddc24aac1d921f6b05117c6b12..64722a214bd17b3703580b3e346cbb785b252861 100644 (file)
--- 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 03cac36a3f16173e65615de55a38e5e331a4c0ba..885543760a534fa0a5a75e98019e738f260db4ea 100644 (file)
--- 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 f276a32de0a4a908aa48dfe2928a6369cfb904cf..c5d3d3c251bd51f2b59b3ae3983e4af0e8de9e68 100644 (file)
--- 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 1a36a3c69626a972fffec1cd81757b3d9df470da..f0872b26f20853c7f0940c1336bb54784091e86f 100644 (file)
--- 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 3c11a5097c6f67fcde97f753b89fb7324d072e08..3c361a7bef046e0a9fa0f0243304b170ce2f5152 100644 (file)
--- a/tests/test-io-channel-tls.c
+++ b/tests/test-io-channel-tls.c
@@ -21,10 +21,8 @@
  */
 
 
-#include <stdlib.h>
-#include <fcntl.h>
+#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 3344382c7f88dd90ec6817ec9b9117df40fb56ac..ae46c56a471e455e6472a16048905572ba4dafc8 100644 (file)
--- a/tests/test-io-task.c
+++ b/tests/test-io-task.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "io/task.h"

diff --git a/tests/test-iov.c b/tests/test-iov.c
index 46e4dddc5557d060ef9e47afac057ec534b870b6..3f25268dd45ebe487dc745a7c8ea996909d9a647 100644 (file)
--- a/tests/test-iov.c
+++ b/tests/test-iov.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qemu-common.h"
 #include "qemu/iov.h"

diff --git a/tests/test-mul64.c b/tests/test-mul64.c
index a0a17f77755cde501bf5868cf4e1950a15f9dd37..1282ec5a22134d4a80b8cc038da172721c509fae 100644 (file)
--- a/tests/test-mul64.c
+++ b/tests/test-mul64.c
@@ -6,10 +6,9 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdint.h>
 #include "qemu/host-utils.h"
-#include "qemu/osdep.h"
 
 
 typedef struct {

diff --git a/tests/test-netfilter.c b/tests/test-netfilter.c
index 303deb7e090ab4419e1fab0f6bdc967d52f3071f..7d105c32327feccdd9648255307d7744f2d32242 100644 (file)
--- 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 <glib.h>
 #include "libqtest.h"
 

diff --git a/tests/test-opts-visitor.c b/tests/test-opts-visitor.c
index 9600b970126aee6129ac85fac847d85f04319d87..b7acf7d294ec0050769f8d224515769b04db45a2 100644 (file)
--- 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 <glib.h>
 
 #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 07c182338b92135ab0b25610022628578705d4bc..f0cc31e113848764645866f1f7e5ae6146487ac9 100644 (file)
--- 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 <glib.h>
-#include <stdint.h>
 
 #include "hw/qdev.h"
 #include "qom/object.h"

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 0c1136d1b2aceb976964d8b464585c94cf702f51..848374e2bd078facae637a70ad8799ae3dc455cb 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 
 static QemuOptsList opts_list_01 = {
     .name = "opts_list_01",

diff --git a/tests/test-qga.c b/tests/test-qga.c
index e6a84d17f0626e0521ce5e252be0c393fb438dfb..0973b487d21c60a5071d93c9ffeba9ff2ce6b3f5 100644 (file)
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -1,18 +1,11 @@
+#include "qemu/osdep.h"
 #include <locale.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
-#include <inttypes.h>
 
 #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 4d267b6a8372949ceef7d2d795f817c6a01a6ccf..d6171f2d44fd01aaca531ae882443342bf0b1f37 100644 (file)
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qemu-common.h"
 #include "qapi/qmp/types.h"

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 035c65cfdfad5458264346dcf60d2c684eefd4f7..a296fdbac218e552b9d81a247dc9f481d67f36b0 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -11,8 +11,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdarg.h>
 
 #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 775ad39d937826d8dd79ffbf0f2ef957849db1f0..6a33aa41e552bfa711ba86f35296f6e6e91a66a7 100644 (file)
--- 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 <glib.h>
-#include <stdarg.h>
 
 #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 f6bd408db3bf661589ee72d982b27144c1729ab3..c72cdad563d15476fde22eebe856a3c24a4cb99a 100644 (file)
--- 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 <glib.h>
-#include <stdarg.h>
 
 #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 26dc752b81df5858651825fe920e18a6c521fdce..965f298e1117c75039b0041a618e2d9d53775428 100644 (file)
--- 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 <glib.h>
 
 #include "qemu-common.h"

diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
index daa8bf41db39604d18a096d51e157498c61b2a28..79d375014451002da876c144c370d13c57d712d1 100644 (file)
--- 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 <glib.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #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 0572ebb42a8d9b8ec0680cf5ef80bfaf38281c3b..9a3cb243baea48179f34985b3bdb56ce2636a57f 100644 (file)
--- 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 <glib.h>
 #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 d99498d098a0a4293d85e0463a1c93b0f13ad208..4b48ec25d31c3192298f1609dc3d2b52363578fb 100644 (file)
--- 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 <glib.h>
-#include <stdarg.h>
 
 #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 4f4450fe7072dbe8e58d4726e6e7e26535c98e2f..0beccf98c729d5e0adc3e26fd1aef975ffa09b18 100644 (file)
--- 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 <glib.h>
 
 #include "qemu-common.h"

diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
index ccdee3999309ca87a9be120724db9316eb143dd2..40600b40bb92dc993061edaf2f75725d19f1bc48 100644 (file)
--- a/tests/test-thread-pool.c
+++ b/tests/test-thread-pool.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qemu-common.h"
 #include "block/aio.h"

diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index a95039fdbfdc727123b33ab697c492efe65456fb..858f1aa43f6336de35e9db2399242a1fe102dc95 100644 (file)
--- 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 <glib.h>
 #include <math.h>
 #include "block/aio.h"

diff --git a/tests/test-timed-average.c b/tests/test-timed-average.c
index a049799b80422e5d568b3ed5c7f0990481d7fa13..1cc4ab302740dd97d5880558c86310b2d5fdc869 100644 (file)
--- 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 <glib.h>
-#include <unistd.h>
 
 #include "qemu/timed-average.h"
 

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index f74a6df97b95d7ba72a67cb7831d0c66fb253715..ef4dac5e01c6fb1523847167d6bb8392106a8e3a 100644 (file)
--- 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 <glib.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <float.h>
 
 #include "qemu-common.h"

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 4d13bd09b327efcc0d2a20c5460e961aa9aa1d2f..713d4443b2d82f483fab2b15809aa6b8d9f3fb2f 100644 (file)
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "qemu-common.h"

diff --git a/tests/test-write-threshold.c b/tests/test-write-threshold.c
index faffa7b855a9b5c1036506b39a3cd5a0c90471cb..fdbc8020fdf12ef66369483b56e823c6c4b23289 100644 (file)
--- a/tests/test-write-threshold.c
+++ b/tests/test-write-threshold.c
@@ -6,8 +6,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdint.h>
 #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 6cd20d4a231453b552bd2f0b73af4305c7d864cf..8eb0bc6ad53d0c1f118b0de02bc33be8fcfc6c2a 100644 (file)
--- a/tests/test-x86-cpuid.c
+++ b/tests/test-x86-cpuid.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "hw/i386/topology.h"

diff --git a/tests/test-xbzrle.c b/tests/test-xbzrle.c
index 1cd8cb7d788bc8a121f2cf1d2909908f8477af48..abd309d4181143faa690ab649c6f02b7d3de095f 100644 (file)
--- a/tests/test-xbzrle.c
+++ b/tests/test-xbzrle.c
@@ -10,11 +10,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
+#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 99db5381917993e0512364c4866272cde464b8f0..235cae0137cbc02739ef4ae72762fbfff3e7ff54 100644 (file)
--- 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 <glib.h>
 
 #include "libqtest.h"

diff --git a/tests/tpci200-test.c b/tests/tpci200-test.c
index 9ae01277ee57484d0cf7c2625a72b2dcc5277eef..cb2b00ca8b6dbd409c921483ab68df3db8afe787 100644 (file)
--- a/tests/tpci200-test.c
+++ b/tests/tpci200-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 9fb09f1df463bdfcd3a4486e647973ace2e06358..9a1ad5a1bbf474844061e2f2380ae63617cb1902 100644 (file)
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -29,23 +29,13 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#include <stddef.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/unistd.h>
 #include <sys/mman.h>
 #include <sys/eventfd.h>
 #include <arpa/inet.h>
-#include <ctype.h>
 #include <netdb.h>
 
 #include <linux/vhost.h>

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index e30b7f4abc0806895832eacc1d906d7f18a0db6a..69615968ce39bdef6f8df01ddf474397f2d47d05 100644 (file)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "libqtest.h"

diff --git a/tests/virtio-balloon-test.c b/tests/virtio-balloon-test.c
index becebb51a755abc98e45b59622d1a7c911f55558..b010ce98e803126baceaf5359d8afb2a5b73b222 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 4078321a20c47cb575b4d6db658d2362301e323a..3a66630d79b11169425e85b2a617bbbbc3c437f5 100644 (file)
--- 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 <glib.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
 #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 6be96e8c64e42d9055b25030a3b19dffe4de2ce3..0b9c2a55efde2f0229b4e3e99b6368cdce9004e9 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 982d77a14bf4511e721307dbd2b68a84e36c4183..04cfcd594e3ad2152b7cc531ea3e9573bb02d8f3 100644 (file)
--- 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 <glib.h>
-#include <string.h>
 #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 41c1cdb1aa2e7701b382ccd280d42fefc0ee228a..771dbd73af43357ee7c58809913743fcdcc3852b 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 66d8491e9dfcb5c3bd6d5d4798b1622d1231653d..d78747a466abffe46768179e0417641003e73a1d 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
-#include <stdio.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 bf030a616214954642b5addd4781f2a7c8725974..480d4abb2d91473d4bd145df2a3c057f205e0a6d 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 a2ebed39cc43bc061eb09fd78a0f474d454bb918..6ef0e2f043e67f77fc58a6c975c9edb605c9a406 100644 (file)
--- a/tests/vmxnet3-test.c
+++ b/tests/vmxnet3-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.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 82ca597252720f73d1eaa03e9669e3b5900bd732..efe3370453996a3bb2e7564fa67fd225064170bc 100644 (file)
--- 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 "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 #include "qemu/timer.h"
 
 static void qmp_check_no_event(void)