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 <[email protected]>
Reviewed-by: Martin Kletzander <[email protected]>

Author: janotomko

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"

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"

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"

tools/virsh-host.h

@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 extern const vshCmdDef hostAndHypervisorCmds[];

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

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"

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"

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"

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"

tools/virsh-secret.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 struct virshSecretEventCallback {
     const char *name;

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"

tools/virsh-snapshot.h

@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "virsh.h"
+#include "vsh.h"
 
 extern const vshCmdDef snapshotCmds[];

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"

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"

tools/virt-admin-completer.c

@@ -24,7 +24,6 @@
 #include "internal.h"
 #include "virt-admin.h"
 #include "viralloc.h"
-#include "virstring.h"
 
 
 char **

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"

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"

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' */
 

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"
 

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