tools: remove unnecessary includes

After the split of virsh to multiple files, and the subsequent
split to vsh/virt-admin, there are quite a few leftovers.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index d8333a2f44661618c157b0ba4d5071ced3cc127b..0111116885ac183b7dfc9f62bcafbb406270e746 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -23,9 +23,7 @@
 #include "virsh-util.h"
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
 #include "conf/virdomainobjlist.h"

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 97d64276386d008d555a1a337a2088fcb4511665..afe0b0f2e01bdbd86347c98fe84af7d25469e9e9 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -24,12 +24,9 @@
 
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/time.h>
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
 #include "virbitmap.h"
@@ -50,7 +47,6 @@
 #include "virtime.h"
 #include "virtypedparam.h"
 #include "virxml.h"
-#include "virsh-nodedev.h"
 #include "viruri.h"
 #include "vsh-table.h"
 #include "virenum.h"

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 0fd77cbae59577c3d44fecdb603b61c440d2199b..dab0b92229767182d82534792040f5d42790eba0 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -20,18 +20,15 @@
 
 #include <config.h>
 #include "virsh-host.h"
+#include "virsh.h"
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virxml.h"
-#include "virtypedparam.h"
 #include "virstring.h"
 #include "virfile.h"
 #include "virenum.h"

diff --git a/tools/virsh-host.h b/tools/virsh-host.h
index f4c2aa316da6f15f7c3316cda24443a4f749c220..92328c7deb35ff34d8b7b4328e0b8d398aa54b14 100644 (file)
--- a/tools/virsh-host.h
+++ b/tools/virsh-host.h
@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 extern const vshCmdDef hostAndHypervisorCmds[];

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index d754998d5295b63fda8de433fc26e01f6fc5c988..b8e424091da66ebc8e4bc7baa8e3ae140742ec9f 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -31,17 +31,13 @@
 #include "virsh-interface.h"
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virmacaddr.h"
 #include "virxml.h"
-#include "virstring.h"
 #include "vsh-table.h"
 
 virInterfacePtr

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index b10cd03bccab5df32c57c00d397af2ea537d1e82..f2a5d0973294093cf77c7b91aae21f38bedce715 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -22,10 +22,8 @@
 #include "virsh-network.h"
 
 #include "internal.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "virtime.h"
 #include "conf/network_conf.h"
 #include "vsh-table.h"

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 7f091d7cf821d08fec1521174aad0476211194e0..ff028d377e8e36a841d728bc86cf46ce2630153d 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -22,7 +22,6 @@
 #include "virsh-nodedev.h"
 
 #include "internal.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virstring.h"

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 6e5213dea3ae5c829f2486a7a47dc0501d1a1594..38790b0081170d238f9a1e4a8990dcb3da474310 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -22,7 +22,6 @@
 #include "virsh-nwfilter.h"
 
 #include "internal.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "vsh-table.h"

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 7bd0acda58e94ce80de6c5e8f9c1d099b4a638ee..7f1df3009092a79535a002603db8a6f7f7f9fade 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -28,7 +28,6 @@
 #include "virfile.h"
 #include "virutil.h"
 #include "virsecret.h"
-#include "virstring.h"
 #include "virtime.h"
 #include "vsh-table.h"
 #include "virenum.h"

diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h
index 6ebe573f8726e6a7f7374995a1024f2089a3c380..eea542c0effca0ca8adc314d486dcfc190929244 100644 (file)
--- a/tools/virsh-secret.h
+++ b/tools/virsh-secret.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 struct virshSecretEventCallback {
     const char *name;

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 4ac6cb1dcd429fab0a9c69cbd0749b7089f896fd..e3599a3535ca20c0e08e0f5defed90340f0953ba 100644 (file)
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -24,9 +24,7 @@
 #include <assert.h>
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
 #include "virbuffer.h"

diff --git a/tools/virsh-snapshot.h b/tools/virsh-snapshot.h
index 49517a423595299e9637892533726e2fde8ae2cc..66ebc071753dec204a5a1f8e068bfefe18071c38 100644 (file)
--- a/tools/virsh-snapshot.h
+++ b/tools/virsh-snapshot.h
@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 extern const vshCmdDef snapshotCmds[];

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index fec8278a5dc320a687988633865be34eec2408bf..e04e2db09624b506a2db3e58badf60298c379611 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -25,9 +25,7 @@
 #include <fcntl.h>
 
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
 
 #include "internal.h"
 #include "virbuffer.h"

diff --git a/tools/virsh.h b/tools/virsh.h
index ef18c7f4218665b0ccf6496f381184795111d052..1b896cd5351689b56e34ff3af4143ae23aac24b2 100644 (file)
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -20,9 +20,7 @@
 
 #pragma once
 
-#include <stdarg.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include "internal.h"
 #include "virerror.h"

diff --git a/tools/virt-admin-completer.c b/tools/virt-admin-completer.c
index 25dacf51d8e8db9dbeeab829d5340da06b6b0370..7201bb71ebf46e41159d2afcdad30a1906f76f51 100644 (file)
--- a/tools/virt-admin-completer.c
+++ b/tools/virt-admin-completer.c
@@ -24,7 +24,6 @@
 #include "internal.h"
 #include "virt-admin.h"
 #include "viralloc.h"
-#include "virstring.h"
 
 
 char **

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 563415ef1f3b6258163fc3b47d0ecfaa3e4ecfc1..774661b2ca87b85988bc875dcaa320e61ad7c2b7 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -19,8 +19,9 @@
  */
 
 #include <config.h>
-#include "virt-admin.h"
 
+#include <stdio.h>
+#include <unistd.h>
 #include <getopt.h>
 
 #if WITH_READLINE
@@ -29,6 +30,7 @@
 #endif
 
 #include "internal.h"
+#include "virt-admin.h"
 #include "viralloc.h"
 #include "virerror.h"
 #include "virfile.h"

diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c
index ea7f172790ec9fe96e3ab078220cd1ae0d4c4665..f9432f522d39feb982434bf96f532a56736cc234 100644 (file)
--- a/tools/virt-host-validate-qemu.c
+++ b/tools/virt-host-validate-qemu.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <unistd.h>
 
 #include "virt-host-validate-qemu.h"
 #include "virt-host-validate-common.h"

diff --git a/tools/vsh-table.c b/tools/vsh-table.c
index 60554b7b2f17c39466a7096ee0a3cbf356591ef6..a727ac17b548f3edd0208afe35b8992bf4e5d912 100644 (file)
--- a/tools/vsh-table.c
+++ b/tools/vsh-table.c
@@ -28,8 +28,6 @@
 
 #include "viralloc.h"
 #include "virbuffer.h"
-#include "virstring.h"
-#include "virsh-util.h"
 
 #define HEX_ENCODE_LENGTH 4 /* represents length of '\xNN' */
 

diff --git a/tools/vsh.c b/tools/vsh.c
index 9701613924b2017951c269ee51146b6c6bd7515c..d34b429c22d0ec3fb4e496c1897eb7f5e24fabbf 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -24,9 +24,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <fcntl.h>
-#include <time.h>
 #include <sys/stat.h>
 #include <inttypes.h>
 #include <signal.h>
@@ -42,7 +40,6 @@
 #include "virfile.h"
 #include "virthread.h"
 #include "vircommand.h"
-#include "virtypedparam.h"
 #include "virstring.h"
 #include "virutil.h"
 

diff --git a/tools/vsh.h b/tools/vsh.h
index 174116b36910172cd9e5bc6db48dc54487707a92..290bb71f3e8cfa1191ecf62bf6d6cf2489681ba9 100644 (file)
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -21,8 +21,6 @@
 #pragma once
 
 #include <stdarg.h>
-#include <unistd.h>
-#include <sys/stat.h>
 #ifndef WIN32
 # include <termios.h>
 #endif