tests: Remove unused includes

Signed-off-by: Peng Liang <tcx4c70@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/commandtest.c b/tests/commandtest.c
index 74e60a072b3b1ddbf8cd24a3085447327b028157..95d1bfa91b274024058b233199e38925e40e4ca5 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -35,8 +35,6 @@
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virerror.h"
-#include "virthread.h"
-#include "virstring.h"
 #include "virprocess.h"
 #include "virutil.h"
 

diff --git a/tests/cputest.c b/tests/cputest.c
index ddf05b779b4f9981bce3a2ef8ce04e7bd9848d67..b7ec79dfc6e1ae308d684a6e8299431cce57b4f4 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -33,8 +33,6 @@
 #include "cpu_conf.h"
 #include "cpu/cpu.h"
 #include "cpu/cpu_x86.h"
-#include "cpu/cpu_map.h"
-#include "virstring.h"
 
 #if WITH_QEMU
 # include "testutilsqemu.h"

diff --git a/tests/domainconftest.c b/tests/domainconftest.c
index 14d84b0071a8078feea827f8db174cc26d10da55..b483e1221ad6774784e6d9031bc78a742ec8a05b 100644 (file)
--- a/tests/domainconftest.c
+++ b/tests/domainconftest.c
@@ -19,8 +19,6 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 
 #include "domain_conf.h"

diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index db49dcd6e0691608713c8d7db028948acf0d6029..4591cf49dbc4b224f19aaf264157fe3a14b38056 100644 (file)
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -7,7 +7,6 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "viralloc.h"
 # include "vmx/vmx.h"
 # include "esx/esx_util.h"
 # include "esx/esx_vi_types.h"

diff --git a/tests/eventtest.c b/tests/eventtest.c
index 1e93c70e7482b6465448d0a7a16fa993f3987d80..470de4c6304945629daeab888eda3859a9d21bfe 100644 (file)
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -31,10 +31,8 @@
 #include "testutils.h"
 #include "internal.h"
 #include "virfile.h"
-#include "virthread.h"
 #include "virlog.h"
 #include "virutil.h"
-#include "virevent.h"
 
 VIR_LOG_INIT("tests.eventtest");
 

diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index dc1503e9a76a216dcfcb52a4dd1521c0f22a6a69..d050458a5842b531bee02584789dd4aa6d08449b 100644 (file)
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include "virlog.h"
-#include "virstring.h"
 #include "virvhba.h"
 #include "testutils.h"
 

diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 96519e91c28ddd115d055c6902f2db956d2b7e90..5e6b347949c0547b38b0d4bbe3f4c3b95860902a 100644 (file)
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -24,10 +24,7 @@
 
 #include "virfdstream.h"
 #include "datatypes.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 87014e3e531f3f9222bd8cdfa58730d3b6f767c5..b83367cb4b05930cca7f552dd7b311dd744a3b07 100644 (file)
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -7,7 +7,6 @@
 
 #include "testutils.h"
 #include "internal.h"
-#include "virstring.h"
 #include "conf/backup_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 15fab8810798fac16a48745586eadaadfbc64848..b23e0f589b7455fc760c20bad601d4a269a2b17f 100644 (file)
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "interface_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/libxlmock.c b/tests/libxlmock.c
index a52d4bc2ede3086d1acfbaf77fdc67b306cffb1b..0e4bf7df52d632e583a7a615f401898062a37178 100644 (file)
--- a/tests/libxlmock.c
+++ b/tests/libxlmock.c
@@ -28,8 +28,6 @@
 # include <xenstore.h>
 # include <xenctrl.h>
 
-# include "virfile.h"
-# include "virsocket.h"
 # include "libxl/libxl_capabilities.h"
 
 VIR_MOCK_IMPL_RET_VOID(xs_daemon_open,

diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 015597eb440e60c2b3e116a7f1fe8f6fe2e16d0f..a7080e0fa2e74fc69a862abb1cb68ac390114d98 100644 (file)
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -31,12 +31,7 @@
 #if defined(WITH_LIBXL) && defined(WITH_YAJL)
 
 # include "internal.h"
-# include "viralloc.h"
 # include "libxl/libxl_conf.h"
-# include "datatypes.h"
-# include "virstring.h"
-# include "virmock.h"
-# include "virjson.h"
 # include "testutilsxen.h"
 
 # define VIR_FROM_THIS VIR_FROM_LIBXL

diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c
index 8ab32acf42a0e725f7630f4adeb91cf8064e7075..2c5d294f18b801bda1ce158ccdc232cc48e9aa21 100644 (file)
--- a/tests/lxcxml2xmltest.c
+++ b/tests/lxcxml2xmltest.c
@@ -12,7 +12,6 @@
 # include "internal.h"
 # include "lxc/lxc_conf.h"
 # include "testutilslxc.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a062ff9c3c6244738a03aa023a6be2e689e4e278..bbeb849a3957476402fe2ba0351e4f6873edb86c 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -8,10 +8,8 @@
 #include "internal.h"
 #include "testutils.h"
 #include "network_conf.h"
-#include "vircommand.h"
 #include "viralloc.h"
 #include "network/bridge_driver.h"
-#include "virstring.h"
 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"
 

diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index 11be85e06f2e9d051e0c4976e5897a685a34207b..2648115a1224bb2d3b5fe18b52f7e527de7b2478 100644 (file)
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "viralloc.h"
 
 #if defined (__linux__)
 
@@ -31,7 +30,6 @@
 # include "network/bridge_driver_platform.h"
 # include "virbuffer.h"
 # include "virmock.h"
-# include "virfirewall.h"
 
 # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"

diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 9e8d675a10bf5e691700f30dbbfe36c999e1eae9..5f39162ef15e81ce8cd2e3b160191c393549d0da 100644 (file)
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "network_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 #include "network/bridge_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index 4471b4dd9e2da9d8e29347a10462fbf3ae555c4e..c50c6c85585de54e9703fe63d988cb693e69461a 100644 (file)
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "network_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c
index d660d4cc2169c1348501c0402bb5173f8810ca75..dee4639922a34d13950112e5ca4c7c987de6ff2b 100644 (file)
--- a/tests/nodedevmdevctltest.c
+++ b/tests/nodedevmdevctltest.c
@@ -2,7 +2,6 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "datatypes.h"
 #include "node_device/node_device_driver.h"
 #include "vircommand.h"
 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW

diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index ad9562cc8222c9274971be6c848a3a646209decd..f82027fb87b322e509445dce2efeac9444b2de05 100644 (file)
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "node_device_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/nssmock.c b/tests/nssmock.c
index b1c1aba957a345427b63f5a4bd3be9325fd8b068..9ead6d8f976fded9e0486cf867e72ad0284b8b47 100644 (file)
--- a/tests/nssmock.c
+++ b/tests/nssmock.c
@@ -27,8 +27,6 @@
 # include <unistd.h>
 
 # include "configmake.h"
-# include "virstring.h"
-# include "viralloc.h"
 
 static int (*real_open)(const char *path, int flags, ...);
 static DIR * (*real_opendir)(const char *name);

diff --git a/tests/nsstest.c b/tests/nsstest.c
index a03f230452be40dc1a4cd6d731e428297bf59121..615b06311837c600e326586dd4bebcf35d503c9a 100644 (file)
--- a/tests/nsstest.c
+++ b/tests/nsstest.c
@@ -23,7 +23,6 @@
 #ifdef WITH_NSS
 
 # include "libvirt_nss.h"
-# include "virsocket.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c
index 35c1c772ae15fb48b96f8a86217144e8e72b4acc..f76f13fd25e0f69181a59baa3253acbedae49b7f 100644 (file)
--- a/tests/nwfilterebiptablestest.c
+++ b/tests/nwfilterebiptablestest.c
@@ -24,7 +24,6 @@
 #include "testutils.h"
 #include "nwfilter/nwfilter_ebiptables_driver.h"
 #include "virbuffer.h"
-#include "virfirewall.h"
 
 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"

diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index ec37a4ae1158bab0beb8528cf26a9a24df71709a..1514002b8fc2083f6ad37d5f8552b8550f2fa9b0 100644 (file)
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -26,7 +26,6 @@
 # include "testutils.h"
 # include "nwfilter/nwfilter_ebiptables_driver.h"
 # include "virbuffer.h"
-# include "virfirewall.h"
 
 # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"

diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 7a7e05965bcb2e8c4579d21756491dc9b9b69343..c2b6dc575bbcc7ffe1d19556d91d7ea18b9cb8d3 100644 (file)
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -7,12 +7,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "virxml.h"
-#include "virthread.h"
-#include "nwfilter_params.h"
 #include "nwfilter_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index 5f63f6f5cbcb9294863cb72bbb25b398709ce92b..7110f541393e491404b0ef330c8e0c3eee6bb054 100644 (file)
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -23,9 +23,6 @@
 
 #include "testutils.h"
 
-#include "virerror.h"
-#include "virxml.h"
-
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 

diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 7e6c0b60bb7d89f7f2ce95cd91846cc7bfc2e2e6..77e086e3902cb74364a5c9018129f9cf9f13ef78 100644 (file)
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -7,9 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "viralloc.h"
 # include "openvz/openvz_conf.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_OPENVZ
 

diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index b23177385cb1f4f005cae3aebfcd1619ecf40c89..dd2d4984e207ed1c786fdb69dd448e5ff18b9610 100644 (file)
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -24,9 +24,7 @@
 #include "qemumonitortestutils.h"
 #include "qemu/qemu_conf.h"
 #include "qemu/qemu_agent.h"
-#include "virthread.h"
 #include "virerror.h"
-#include "virstring.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 6329096a683b5a8d57f0cfb3c5fa189e02373216..57116c930b6506b2bcbcc2b302a1639f4c223a74 100644 (file)
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -21,8 +21,6 @@
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "testutilsqemuschema.h"
-#include "virstoragefile.h"
-#include "virstring.h"
 #include "virlog.h"
 #include "qemu/qemu_block.h"
 #include "qemu/qemu_qapi.h"
@@ -31,8 +29,6 @@
 #include "qemu/qemu_checkpoint.h"
 #include "qemu/qemu_validate.h"
 
-#include "qemu/qemu_command.h"
-
 #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW
 #include "conf/snapshot_conf_priv.h"
 

diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 2717ed5d84de968bb71e748214fe227f7c0bfc89..0263b0ad01ddb35dcdd9090eae2c8830b6cfda51 100644 (file)
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -20,7 +20,6 @@
 #include <dlfcn.h>
 
 #include "internal.h"
-#include "viralloc.h"
 #include "virjson.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_monitor_json.h"

diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index ae86ef9ea098f0e98d0931df97d007417621e796..f92fb8f1778dcbb01983b205c20ad3bf60a49dc0 100644 (file)
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -22,7 +22,6 @@
 #include "util/virjson.h"
 #include "util/virqemu.h"
 #include "testutils.h"
-#include "testutilsqemu.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c
index e84a0294d40846ae2188deb2c1aaeb6dcd2b755b..5a63308347a22b9a4fb954709bb04b455c418e25 100644 (file)
--- a/tests/qemucpumock.c
+++ b/tests/qemucpumock.c
@@ -18,7 +18,6 @@
 
 
 #include "conf/cpu_conf.h"
-#include "cpu/cpu.h"
 #include "qemu/qemu_capabilities.h"
 #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 #include "qemu/qemu_capspriv.h"

diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c
index 25613c845275e253f95b98b1f0da94901e9cfb39..d49dcd91431b747472c3cfa0bc6cb69088509d47 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmltest.c
+++ b/tests/qemudomaincheckpointxml2xmltest.c
@@ -14,10 +14,8 @@
 
 # include "internal.h"
 # include "qemu/qemu_conf.h"
-# include "qemu/qemu_domain.h"
 # include "checkpoint_conf.h"
 # include "testutilsqemu.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c
index 3fa932e755aea6c050e5cd460cd51c5f3ae903ac..2f66839ae808953193640994395c6c9d44e87866 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmltest.c
+++ b/tests/qemudomainsnapshotxml2xmltest.c
@@ -11,9 +11,7 @@
 
 # include "internal.h"
 # include "qemu/qemu_conf.h"
-# include "qemu/qemu_domain.h"
 # include "testutilsqemu.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c
index d618ff9d0634ab7dcab0efc14bacdb4164797587..89d287945aaba82b5146138f409cfa39e67b4cce 100644 (file)
--- a/tests/qemuhotplugmock.c
+++ b/tests/qemuhotplugmock.c
@@ -24,7 +24,6 @@
 #include "testutilsqemu.h"
 #include "conf/domain_conf.h"
 #include "virdevmapper.h"
-#include "virutil.h"
 #include "virmock.h"
 #include <fcntl.h>
 

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 21123b88ed1eb73327a8b66d6756a8d2889c97ea..e98d9845e8a7fd1ff791ca5ea97b1aedcae3eec0 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -27,9 +27,6 @@
 #include "testutilsqemu.h"
 #include "testutilsqemuschema.h"
 #include "virhostdev.h"
-#include "virerror.h"
-#include "virstring.h"
-#include "virthread.h"
 #include "virfile.h"
 
 #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW

diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index 86057e9a3a9bf9cf8d10cb0631f49010561993b0..b303f70e9da73e0c2dd36316f8410aa89ca9c2cb 100644 (file)
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -9,9 +9,7 @@
 
 #ifdef WITH_QEMU
 
-# include "datatypes.h"
 # include "internal.h"
-# include "virstring.h"
 # include "conf/domain_conf.h"
 # include "qemu/qemu_domain.h"
 

diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c
index ae59ff67570da81c7014d43aba0ea643d8d9d2b8..bcdee5f32b6982cf57b5bba33d0f142a68a5c863 100644 (file)
--- a/tests/qemumigparamstest.c
+++ b/tests/qemumigparamstest.c
@@ -22,7 +22,6 @@
 #include "virjson.h"
 #include "virbuffer.h"
 #include "virxml.h"
-#include "virhash.h"
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "tests/testutilsqemuschema.h"

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 1019661aa1aa2ae1d141730ec0817bfbba0b8f57..ca1b8c30008594a4569d38db33414e58d00753f7 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -28,9 +28,7 @@
 #include "qemu/qemu_monitor_json.h"
 #include "qemu/qemu_qapi.h"
 #include "qemu/qemu_alias.h"
-#include "virthread.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "cpu/cpu.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_migration_params.h"

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index ddd7d91b1312508f9416e927de746980e69407cd..a5d716deeed4b66da2a0c040d8300c1142ea927a 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -30,12 +30,10 @@
 #include "qemu/qemu_processpriv.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_agent.h"
-#include "qemu/qemu_qapi.h"
 #include "rpc/virnetsocket.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "vireventthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index 935f9d1e1adebd956c25882a4f81c356949f452d..ffcb32a5cc0be53fbd27766ae1ab9bd134c7ed8c 100644 (file)
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include "domain_conf.h"
 #include "qemu/qemu_conf.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_agent.h"

diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index 03c818d8a3298bf7065b6e1d3e73d537f044d3f5..a6f9d6b917b085b54439b4f8fd2d76dc7acfb814 100644 (file)
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -33,8 +33,6 @@
 #include "virfile.h"
 #include "virthread.h"
 #include "virhash.h"
-#include "virstring.h"
-#include "viralloc.h"
 #include "qemusecuritytest.h"
 #include "security/security_manager.h"
 #include "virhostuptime.h"

diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index bb14f775f3eb7519ba509623fed3e2272e5470c2..85bd76c315f394646b9d55221f4c5745e4b0c687 100644 (file)
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -23,25 +23,19 @@
 #include "internal.h"
 #include "viralloc.h"
 #include "vircommand.h"
-#include "vircrypto.h"
 #include "viridentitypriv.h"
 #include "virmock.h"
-#include "virlog.h"
 #include "virnetdev.h"
 #include "virnetdevbandwidth.h"
 #include "virnetdevip.h"
 #include "virnetdevtap.h"
 #include "virnetdevopenvswitch.h"
 #include "virnuma.h"
-#include "virrandom.h"
-#include "virscsi.h"
 #include "virscsivhost.h"
-#include "virstring.h"
 #include "virtpm.h"
 #include "virutil.h"
 #include "qemu/qemu_interface.h"
 #include "qemu/qemu_command.h"
-#include <time.h>
 #include <unistd.h>
 #include <fcntl.h>
 

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 9404511f4c5a5fb6cdd1dba5126da44f8c27030e..48dd20458e780ad990f14253d9f015e92ad0b57d 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,24 +12,16 @@
 # include "internal.h"
 # include "viralloc.h"
 # include "viridentity.h"
-# include "qemu/qemu_alias.h"
 # include "qemu/qemu_capabilities.h"
-# include "qemu/qemu_command.h"
 # include "qemu/qemu_domain.h"
 # include "qemu/qemu_migration.h"
 # include "qemu/qemu_process.h"
 # include "qemu/qemu_slirp.h"
-# include "qemu/qemu_qapi.h"
 # include "datatypes.h"
 # include "conf/storage_conf.h"
-# include "cpu/cpu_map.h"
-# include "virstring.h"
-# include "storage/storage_driver.h"
-# include "virmock.h"
 # include "virfilewrapper.h"
 # include "configmake.h"
 # include "testutilsqemuschema.h"
-# include "qemu/qemu_monitor_json.h"
 
 # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # include "qemu/qemu_capspriv.h"

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a5cfad8787813f2f6c42697fa08165578a5715d4..4ad6b4dac160376c901beb69140e7faee8d4b4df 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -8,10 +8,7 @@
 #include "testutils.h"
 
 #include "internal.h"
-#include "qemu/qemu_domain_address.h"
-#include "qemu/qemu_domain.h"
 #include "testutilsqemu.h"
-#include "virstring.h"
 #include "virfilewrapper.h"
 #include "configmake.h"
 

diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index cb66a479e38da415e2edc6bc735c398878c9965e..28ad59f39dcbe61b2062386821cc294aa52cdf5f 100644 (file)
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -26,8 +26,6 @@
 # include <fcntl.h>
 # include <sys/stat.h>
 # include <unistd.h>
-# include "virstring.h"
-# include "virerror.h"
 # include "virlog.h"
 # include "virscsihost.h"
 

diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index b2a11b278c9de52ee8e5df66cec664e73a78e344..769d6e1f2987ccc6819673b3634bc636d5a9d9a3 100644 (file)
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -2,7 +2,6 @@
 
 #include <unistd.h>
 #include "security/security_driver.h"
-#include "virrandom.h"
 #include "testutils.h"
 
 static int

diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c
index c3d6505ef2637e0fbae2aa1e8d04be500be565ef..24c9f3841c4fa63d36b90e57712ec72248d2ef20 100644 (file)
--- a/tests/securityselinuxhelper.c
+++ b/tests/securityselinuxhelper.c
@@ -39,7 +39,6 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 #include "viralloc.h"
-#include "virstring.h"
 
 static int (*real_statfs)(const char *path, struct statfs *buf);
 static int (*real_security_get_boolean_active)(const char *name);

diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index dfe9d38d34329e35d69ae02d3fff2aeec97ad8b6..4f97edad179888475557bdd92134260801793910 100644 (file)
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -30,13 +30,11 @@
 #include "internal.h"
 #include "testutils.h"
 #include "testutilsqemu.h"
-#include "qemu/qemu_domain.h"
 #include "viralloc.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "security/security_manager.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 4912cc34838a074b055d8e899e80113dcceb3923..6a0f1617ae80dc07f0d3b187b53c05bf90a3af6c 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -27,10 +27,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "viralloc.h"
 #include "virlog.h"
-#include "virerror.h"
-#include "virfile.h"
 #include "security/security_manager.h"
 #include "virstring.h"
 

diff --git a/tests/sockettest.c b/tests/sockettest.c
index 2a35b6a829df427584346630e4b9a4e6f7278d8e..f2b75a2e5334164766e7b2e1e2361b1239449eb2 100644 (file)
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -25,7 +25,6 @@
 #include "virsocketaddr.h"
 #include "testutils.h"
 #include "virlog.h"
-#include "viralloc.h"
 
 VIR_LOG_INIT("tests.sockettest");
 

diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index c7dabd976b846c1ef7282dddecf2f2fc6ab3770d..8f27e40d4637965a06c8f2940eeefc23d4722bf3 100644 (file)
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -29,7 +29,6 @@
 #include "testutils.h"
 #define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
 #include "storage/storage_backend_sheepdog_priv.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c
index 449b745519e69f457effe7a8c521d6b8056904fe..487481b7ee301f2d603a3f59b3e0de1b35ce077e 100644 (file)
--- a/tests/storagepoolxml2argvtest.c
+++ b/tests/storagepoolxml2argvtest.c
@@ -2,10 +2,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "datatypes.h"
 #include "storage/storage_util.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index f21f20357a6a62229db387b93cc2d4a1973c7a30..2bad858033053148a763c58833521000fecd19e8 100644 (file)
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "storage_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #include "storage/storage_util.h"
 

diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 94e2de1730dd20ca7d580cca32afc25142dce26b..6f1fc7b38c2124a5fe6da855deb52915ab5e8b50 100644 (file)
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -2,10 +2,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "datatypes.h"
 #include "storage/storage_util.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index be38f50a511b19b9ffb9e7cbd22542d3e17b2f1f..5d06821cd0c9223d2b949e25282198883aeb77ab 100644 (file)
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -8,8 +8,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "storage_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 973b8317b5bda8ad44303eb441135c406fca3e6d..287c40c6f99fe7b70d3a23c02d673516ed889e8e 100644 (file)
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -29,7 +29,6 @@
 #include "virsysinfo.h"
 #include "testutils.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW
 #include "virsysinfopriv.h"

diff --git a/tests/testutils.c b/tests/testutils.c
index 9d454c23bc8b9589302575d9a3c1a98ef2a2c771..30f91dcd286a6aeb67e82d0406c9faf2d363a6f5 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -29,13 +29,9 @@
 #include "testutils.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "virthread.h"
 #include "virerror.h"
 #include "virbuffer.h"
 #include "virlog.h"
-#include "vircommand.h"
-#include "virrandom.h"
-#include "virprocess.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/testutils.h b/tests/testutils.h
index ff5661bb3f2f93dcc9811b70499f452891092ffe..869b58bd1e5c1dbb75c7008ce8081ce9daefcd88 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -24,7 +24,6 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "virjson.h"
-#include "capabilities.h"
 #include "domain_conf.h"
 
 #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */

diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index ac7a01a4e8ee92db9bfe2e95d8c6410fd9b5c97f..356c1186462ef59e73d8354d025e0e351603ed9b 100644 (file)
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -3,7 +3,6 @@
 
 # include "testutilslxc.h"
 # include "testutils.h"
-# include "viralloc.h"
 # include "domain_conf.h"
 
 # define VIR_FROM_THIS VIR_FROM_LXC

diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h
index 0f7345b1c16d109ac31b6020e1358c45ac844c47..c8f2ad6dffd4425fcf2f0b00224ca73af7d0a0e5 100644 (file)
--- a/tests/testutilslxc.h
+++ b/tests/testutilslxc.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "capabilities.h"
-
 #include "lxc/lxc_conf.h"
 
 #define FAKEDEVDIR0 "/fakedevdir0/bla/fasl"

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6211b2a8712e21ab8a3ddc93eea4374bad539d06..d26caba5fb2830b232afdff3aca3d018ecda697d 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -6,7 +6,6 @@
 # include "testutils.h"
 # include "viralloc.h"
 # include "cpu_conf.h"
-# include "qemu/qemu_driver.h"
 # include "qemu/qemu_domain.h"
 # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # include "qemu/qemu_capspriv.h"

diff --git a/tests/utiltest.c b/tests/utiltest.c
index 419dfea91343ce2efbc568a334838641d03c3870..e7a79f808f197df10c01bbb3e7e0a1990b39567a 100644 (file)
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "viralloc.h"
 #include "testutils.h"
 #include "virutil.h"
 

diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 6fd7407b9746922b6b1505daef85fc8742b54af4..5301fd9dea3f5bb59e6b23be2bde8ac05d31e62a 100644 (file)
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -21,8 +21,6 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 
 #include "virauthconfig.h"

diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 79bd0cae8e1a19be9bed879b7f1d5bceb53355c8..0ca7927c3fc391470ed3939de4c7fa619571d338 100644 (file)
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -4,8 +4,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "virbuffer.h"
-#include "viralloc.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index b143f873a1400c1a30af95bdaabf8fabcb0f930a..26a512e87f8491e510539dea78c7452e51948d36 100644 (file)
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -20,7 +20,6 @@
 
 #include "testutils.h"
 #include "capabilities.h"
-#include "virbitmap.h"
 #include "virfilewrapper.h"
 
 

diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index a213c8e68642a0ec31d6f3742b35893569e620df..8a0e3aec0f3fb576dead59d9867513414af9201a 100644 (file)
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -26,8 +26,6 @@
 # include <sys/sysmacros.h>
 # include <stdarg.h>
 # include "testutilslxc.h"
-# include "virstring.h"
-# include "virfile.h"
 # include "viralloc.h"
 # include "vircgroupv2devices.h"
 

diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 7d54df1a853ae69d0759db8281eb040a87ab25b5..e29bc094b135597b2de3eb25e010bae3d1783796 100644 (file)
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -25,7 +25,6 @@
 
 # define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 # include "vircgrouppriv.h"
-# include "virstring.h"
 # include "virerror.h"
 # include "virlog.h"
 # include "virfile.h"

diff --git a/tests/virconftest.c b/tests/virconftest.c
index 3b203b6ae6201d71f8ef1a74ecfc86bef95fc737..34a8232790113df0f7b6da5e2cdf6cc10b329fa8 100644 (file)
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -23,7 +23,6 @@
 
 #include <unistd.h>
 #include "virconf.h"
-#include "viralloc.h"
 #include "testutils.h"
 
 

diff --git a/tests/virdriverconnvalidatetest.c b/tests/virdriverconnvalidatetest.c
index 6f4cefb61ec71bcc4ccb81031c01310b723c668b..6d10628a73da99d217aca9346903b575dd48e7fd 100644 (file)
--- a/tests/virdriverconnvalidatetest.c
+++ b/tests/virdriverconnvalidatetest.c
@@ -19,8 +19,6 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index e7930d3453783c8e8b98dfa30de0b0ca3c09e3fa..27d0f15ac50e3b23320305b779ab9b22a1265836 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -19,8 +19,6 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 

diff --git a/tests/virfilemock.c b/tests/virfilemock.c
index d4863bd12c01c58cea0b75c9c45c4b965af75c35..093a8d7cf00c615a541fdab120aad517129ed45f 100644 (file)
--- a/tests/virfilemock.c
+++ b/tests/virfilemock.c
@@ -26,8 +26,6 @@
 #endif
 
 #include "virmock.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index 1e95c77d063fc0df781bbd53926eb38f01cbc00c..9fbfc37e56c915fb792cb7d965f6d6e4ac424c13 100644 (file)
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -23,7 +23,6 @@
 
 #include "testutils.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #ifdef __linux__
 # include <linux/falloc.h>

diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c
index aaff39866d7d8648aa94fc090899768c54125101..9cdfcfdc3fa557f8790854ea52a4c5e45396e082 100644 (file)
--- a/tests/virfilewrapper.c
+++ b/tests/virfilewrapper.c
@@ -23,10 +23,8 @@
 # include <fcntl.h>
 
 # include "viralloc.h"
-# include "virfile.h"
 # include "virfilewrapper.h"
 # include "virmock.h"
-# include "virstring.h"
 
 
 /* Mapping for prefix overrides */

diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
index 8a0ca6be070e1ec3815390eff4a7f7bef95e707b..e3d15fb67bc1f4a57c7464a9d47bd5434f050b39 100644 (file)
--- a/tests/virfirewalltest.c
+++ b/tests/virfirewalltest.c
@@ -31,7 +31,6 @@
 # include "vircommandpriv.h"
 # define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
 # include "virfirewalldpriv.h"
-# include "virmock.h"
 
 # define VIR_FROM_THIS VIR_FROM_FIREWALL
 

diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 746e65727f61ab8b454a4c62e5554ae43bed3c4a..196f4c29b90e45519b3981d1953e645ed71c05ca 100644 (file)
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -8,7 +8,6 @@
 #define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW
 #include "virhostcpupriv.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "virfilewrapper.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 99c7899ed763ccb8a66505060cc4a5ec7f535562..73ed9f73dfc6fc341acc9fed8ebbe3360d469107 100644 (file)
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -28,12 +28,8 @@
 #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW
 
 #include "viridentitypriv.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 
-#include "virlockspace.h"
-
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 VIR_LOG_INIT("tests.identitytest");

diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index 0f0c7b17da113b1c096ef1835586a32ba48fa98d..cd1ea1c81aeff1c497681171696f47b1528cea9e 100644 (file)
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -22,12 +22,8 @@
 #include "testutils.h"
 
 #include "virkeycode.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 
-#include "virlockspace.h"
-
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 VIR_LOG_INIT("tests.keycodetest");

diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index d2df3bdb042bc2b3c53a2439f9f8fcf4bbd2a679..0e662878b2f2143439ce2b5a9f40bcb6b34a3422 100644 (file)
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -25,7 +25,6 @@
 # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
 # include "virkmod.h"
-# include "virstring.h"
 
 # define MODNAME "vfio-pci"
 

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 109edf34d5cf20d0e4683da1a59cc963a8269446..711164265d5d453dff547370743668c4265a4e91 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -23,8 +23,6 @@
 #include <sys/stat.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "virutil.h"

diff --git a/tests/virmigtest.c b/tests/virmigtest.c
index af6643397e903f86287a9749172ea8347c5ddf66..adc123b802fc2f6efe2cb23be3968040281e99fb 100644 (file)
--- a/tests/virmigtest.c
+++ b/tests/virmigtest.c
@@ -22,7 +22,6 @@
 
 #include "testutils.h"
 #include "virlog.h"
-#include "viruri.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c
index ecb39bb4f7f1461c1627c15536ea322d91e60151..39e270eaac28f9538ac9d1be7e7d6b6404fff3f8 100644 (file)
--- a/tests/virmockstathelpers.c
+++ b/tests/virmockstathelpers.c
@@ -21,7 +21,6 @@
  */
 
 #include "virmock.h"
-#include "viralloc.h"
 
 #include <sys/stat.h>
 #include <unistd.h>

diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c
index f26991a48c6d98408a1fc33c0b0336a3b21f6c51..910009d80c101eafabfc5a78bab28dc03a193fae 100644 (file)
--- a/tests/virnetdevmock.c
+++ b/tests/virnetdevmock.c
@@ -20,7 +20,6 @@
 
 #ifdef __linux__
 # include "internal.h"
-# include "virstring.h"
 # include "virnetdev.h"
 
 # define NET_DEV_TEST_DATA_PREFIX abs_srcdir "/virnetdevtestdata/sys/class/net"

diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c
index 3fd7b70ad0ec6c13a8732715d73c3a75f1662f89..aec84c6c35f1f8d560083fe1ce5b9b3cd1d4c751 100644 (file)
--- a/tests/virnetdevtest.c
+++ b/tests/virnetdevtest.c
@@ -21,8 +21,6 @@
 #include "internal.h"
 #include "testutils.h"
 
-#include "virnetlink.h"
-
 #define LIBVIRT_VIRNETDEVPRIV_H_ALLOW
 
 #ifdef __linux__

diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 386c339c2c7ddb491e62e7e4d5d43836a03b9931..14790c0ece0fb46837b6dd47eaa102cc832d2116 100644 (file)
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -21,10 +21,8 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "rpc/virnetmessage.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 4e8edb05c34225f8bbd9ae18dc2b50d9427879a5..396005899a29c7c1eaf22665d1eb862f76667f0a 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -29,7 +29,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #include "rpc/virnetsocket.h"
 #include "rpc/virnetclient.h"

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 0ad42a77ed1a93275ffb2078e3ab58fe60ab1215..403cd8d0acf4d16a3f77b7d8ecdaecc6cdf18739 100644 (file)
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -23,12 +23,7 @@
 
 #include "testutils.h"
 #include "virnettlshelpers.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
-#include "virfile.h"
-#include "vircommand.h"
-#include "virsocket.h"
 
 #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
 

diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
index 9e0d6a46e669310b85779d421f7a5049dd71f823..5b98a6de3e835ed57e2b4dcd35298bd31cc7ac0b 100644 (file)
--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
@@ -23,12 +23,8 @@
 #include "testutils.h"
 #include "virnettlshelpers.h"
 #include "virutil.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "vircommand.h"
-#include "virsocket.h"
 
 #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
 

diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c
index 176f52d675da3ccac16b2885a7898112cd538cf8..237624a7521546fef73145e030b48188341ed725 100644 (file)
--- a/tests/virnetworkportxml2xmltest.c
+++ b/tests/virnetworkportxml2xmltest.c
@@ -28,7 +28,6 @@
 #include "internal.h"
 #include "testutils.h"
 #include "virnetworkportdef.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/virnumamock.c b/tests/virnumamock.c
index 7f2653cb53d7cfa28d7a6b565af90db689339858..87c9a58c6f6717401b4ab6c2d6e1374fbc54f223 100644 (file)
--- a/tests/virnumamock.c
+++ b/tests/virnumamock.c
@@ -19,11 +19,8 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virmock.h"
 #include "virnuma.h"
 #include "virfile.h"
-#include "viralloc.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c
index ccdad3daa5363fa7a7751417a4849f27c12d1e95..0c93b58a0c12f519538fe80aa1bb35b33021416e 100644 (file)
--- a/tests/virnwfilterbindingxml2xmltest.c
+++ b/tests/virnwfilterbindingxml2xmltest.c
@@ -28,10 +28,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "virxml.h"
 #include "virnwfilterbindingdef.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index 77d46f0952280eaf1279caafdbd68f3dea6bea45..b2111794e601564048a2b33a3e57c7ca789d76ef 100644 (file)
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -31,7 +31,6 @@
 # include <stdarg.h>
 # include <dirent.h>
 # include "viralloc.h"
-# include "virstring.h"
 # include "virfile.h"
 
 static int (*real_access)(const char *path, int mode);

diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 5c0a76de6f6e97bce6c6781f969748896bef52b3..9e17a88eb5a019dd48ea116b93ef4b456ad17bc0 100644 (file)
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -26,11 +26,8 @@
 
 #if defined(__linux__) && defined(RTLD_NEXT)
 
-# include "virerror.h"
-# include "viralloc.h"
 # include "virlog.h"
 # include "virportallocator.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/tests/virrandommock.c b/tests/virrandommock.c
index 6dd15213e3455733c9a2a8dea9abcb966b48315c..e295f744461aa11a4368fcc98ac91c5067537b08 100644 (file)
--- a/tests/virrandommock.c
+++ b/tests/virrandommock.c
@@ -23,7 +23,6 @@
 # include <gnutls/gnutls.h>
 
 # include "internal.h"
-# include "virstring.h"
 # include "virrandom.h"
 # include "virmock.h"
 

diff --git a/tests/virschematest.c b/tests/virschematest.c
index 29a5546418494d4d69b3bf73a8ff395258a888f2..dd13d82c62d32f603f0f5a94ecedbb7edd8acc99 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -21,8 +21,6 @@
 
 #include "testutils.h"
 
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virxml.h"
 

diff --git a/tests/virshtest.c b/tests/virshtest.c
index c2c892c60d6b99afa0b44db9c9f8ef857a5bd97e..a53a6273b90e9fb5e04c1fe3297f450bb4f401fc 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -3,10 +3,8 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "virxml.h"
 #include "testutils.h"
 #include "vircommand.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index ccfc9f700138656956e70bc716b279000e944478..11f7abbda6b2f4e69936b0909d15aec46182761f 100644 (file)
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -23,11 +23,8 @@
 #include "storage_source.h"
 #include "testutils.h"
 #include "vircommand.h"
-#include "virerror.h"
 #include "virfile.h"
 #include "virlog.h"
-#include "virstoragefile.h"
-#include "virstring.h"
 
 #include "storage/storage_driver.h"
 

diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c
index d4ab818f5f0d6d181d1daf05a5cf85ea67be7854..ba92ec8bcc2a64ac3673490b66bb0f2a71806d0f 100644 (file)
--- a/tests/virstorageutiltest.c
+++ b/tests/virstorageutiltest.c
@@ -18,10 +18,7 @@
 
 
 #include "testutils.h"
-#include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #include "storage/storage_util.h"
 

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index b40607602075cd36cd0d1b86d5e23b3fbd871502..7d8d9204cce03871cf2bff0201f304c649d1b458 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -20,9 +20,6 @@
 
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virstring.h"
 

diff --git a/tests/virtestmock.c b/tests/virtestmock.c
index 7951f3d00ff39eeda892201131e97bf08cf1ca40..19559aee7a5d1bfb99741982c5195008cb5ca97b 100644 (file)
--- a/tests/virtestmock.c
+++ b/tests/virtestmock.c
@@ -26,8 +26,6 @@
 
 #include "virsocket.h"
 #include "configmake.h"
-#include "virstring.h"
-#include "viralloc.h"
 #include "virfile.h"
 
 static int (*real_open)(const char *path, int flags, ...);

diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index f98165b106d30871e6e93ae325677d3cfa8db68b..5972ce585ec9ce958765088fdc3d7c25131a4f38 100644 (file)
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -21,8 +21,6 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 
 #include "virtime.h"

diff --git a/tests/viruritest.c b/tests/viruritest.c
index 96f29aafc08732590cc61dd0c11a1651ade6f375..94c8aa806d517ed44f82c8fbab089537b340fcbb 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -21,7 +21,6 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virusbmock.c b/tests/virusbmock.c
index 5b09895197e2dcc3d1aff9f8fdc197274d2f5438..971d98aa9a682aa67efdc164ab66a70df5a07693 100644 (file)
--- a/tests/virusbmock.c
+++ b/tests/virusbmock.c
@@ -24,9 +24,6 @@
 #include <dlfcn.h>
 #include <fcntl.h>
 
-#include "viralloc.h"
-#include "virfile.h"
-#include "virstring.h"
 #include "virusb.h"
 
 #define USB_SYSFS "/sys/bus/usb"

diff --git a/tests/virusbtest.c b/tests/virusbtest.c
index 65050d5e5f3fe219cfe9fa0252a6f2676cf137cc..870e1363218b3c813d62fe3dfbeba2b1df2f9c42 100644 (file)
--- a/tests/virusbtest.c
+++ b/tests/virusbtest.c
@@ -18,9 +18,7 @@
 
 #include <config.h>
 
-#include "viralloc.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virusb.h"
 
 #include "testutils.h"

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 257bda3b0eed1ca100a8ec3523200b4d99f2a9d9..dbd771017bf39992154dee4a0f56301bf7b87a38 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -7,9 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "viralloc.h"
 # include "vmx/vmx.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_VMWARE
 

diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index 83d7f9b5abf19935f90895feffd3cb2d2a8dea53..bb75a41418ce4e5cf0375e80d4c3935a9e4f94c3 100644 (file)
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "viralloc.h"
 #include "../tools/vsh-table.h"
 
 static int

diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index d6505f9e12031506803a92cb9702ac74d9da393f..962a1f2c4bbc806fd52c98f47989b6b45201a972 100644 (file)
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -28,7 +28,6 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "libxl/xen_xl.h"
-#include "viralloc.h"
 #include "virstring.h"
 #include "testutils.h"
 #include "testutilsxen.h"

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index c99d1f2bd922be405e450c5d26155cdab5779b23..dbf9f7a4c7a2c15988e3e7db8b9d19cc84f8702e 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -28,8 +28,6 @@
 #include "libxl/xen_xm.h"
 #include "testutils.h"
 #include "testutilsxen.h"
-#include "viralloc.h"
-#include "virstring.h"
 #include "libxl/libxl_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index cd6d81947b4b3db880a4ad03d26f12ce2174e224..1a7f2e4f3390df336f23a9ec17b00e7352950c5d 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -9,7 +9,6 @@
 # include "internal.h"
 # include "viralloc.h"
 # include "vmx/vmx.h"
-# include "virstring.h"
 
 # define VIR_FROM_THIS VIR_FROM_VMWARE