util: Remove unused includes

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

src/util/iohelper.c

@@ -31,11 +31,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "virthread.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virerror.h"
-#include "virrandom.h"
 #include "virstring.h"
 #include "virgettext.h"
 

src/util/virarptable.c

@@ -27,11 +27,9 @@
 #include "viralloc.h"
 #include "virarptable.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virnetlink.h"
 #include "virsocketaddr.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virauth.c

@@ -31,7 +31,6 @@
 #include "virerror.h"
 #include "configmake.h"
 #include "virauthconfig.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_AUTH
 

src/util/virauthconfig.c

@@ -24,7 +24,6 @@
 
 #include "virlog.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 struct _virAuthConfig {

src/util/virbpf.c

@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include "virlog.h"
-#include "virerror.h"
 #include "virbpf.h"
 
 VIR_LOG_INIT("util.bpf");

src/util/virbuffer.c

@@ -23,8 +23,6 @@
 #include <stdarg.h>
 
 #include "virbuffer.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/vircgroup.c

@@ -35,19 +35,16 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
-#include "virutil.h"
 #include "viralloc.h"
 #include "vircgroupbackend.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virgdbus.h"
-#include "virhash.h"
 #include "virstring.h"
 #include "virsystemd.h"
 #include "virtypedparam.h"
 #include "virhostcpu.h"
-#include "virthread.h"
 
 VIR_LOG_INIT("util.cgroup");
 

src/util/vircgroupv2devices.c

@@ -30,7 +30,6 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
-#include "viralloc.h"
 #include "virbpf.h"
 #include "vircgroup.h"
 #include "vircgroupv2devices.h"

src/util/virconf.c

@@ -32,7 +32,6 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "configmake.h"
 
 #define VIR_FROM_THIS VIR_FROM_CONF

src/util/vircrypto.c

@@ -23,8 +23,6 @@
 #include "vircrypto.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "viralloc.h"
-#include "virrandom.h"
 #include "virsecureerase.h"
 
 #include <gnutls/gnutls.h>

src/util/virdnsmasq.c

@@ -31,8 +31,6 @@
 #include <signal.h>
 
 #include "internal.h"
-#include "datatypes.h"
-#include "virbitmap.h"
 #include "virdnsmasq.h"
 #include "vircommand.h"
 #include "viralloc.h"

src/util/virebtables.c

@@ -23,10 +23,7 @@
 
 #include "internal.h"
 #include "virebtables.h"
-#include "viralloc.h"
-#include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virfirewall.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virenum.c

@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include "virenum.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virerror.c

@@ -27,7 +27,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virthread.h"
-#include "virstring.h"
 #include "virbuffer.h"
 
 #define LIBVIRT_VIRERRORPRIV_H_ALLOW

src/util/vireventglib.c

@@ -27,7 +27,6 @@
 
 #include "vireventglib.h"
 #include "vireventglibwatch.h"
-#include "virerror.h"
 #include "virlog.h"
 #include "virprobe.h"
 

src/util/virfcp.c

@@ -22,10 +22,8 @@
 
 #include "internal.h"
 
-#include "viralloc.h"
 #include "virfile.h"
 #include "virerror.h"
-#include "virstring.h"
 
 #include "virfcp.h"
 

src/util/virfdstream.c

@@ -39,7 +39,6 @@
 #include "configmake.h"
 #include "virstring.h"
 #include "virtime.h"
-#include "virprocess.h"
 #include "virsocket.h"
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS

src/util/virfilecache.c

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 
-#include "viralloc.h"
 #include "virbuffer.h"
 #include "vircrypto.h"
 #include "virerror.h"
@@ -33,7 +32,6 @@
 #include "virhash.h"
 #include "virlog.h"
 #include "virobject.h"
-#include "virstring.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>

src/util/virfirewall.c

@@ -26,7 +26,6 @@
 #include "virfirewalld.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "vircommand.h"
 #include "virlog.h"
 #include "virfile.h"

src/util/virfirmware.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include "viralloc.h"
 #include "virerror.h"
 #include "virfirmware.h"
 #include "virlog.h"

src/util/virhook.c

@@ -27,9 +27,7 @@
 
 #include "virerror.h"
 #include "virhook.h"
-#include "virutil.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "configmake.h"
 #include "vircommand.h"

src/util/virhostcpu.c

@@ -45,9 +45,7 @@
 #include "virerror.h"
 #include "virarch.h"
 #include "virfile.h"
-#include "virtypedparam.h"
 #include "virstring.h"
-#include "virnuma.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virhostmem.c

@@ -36,10 +36,8 @@
 # include <windows.h>
 #endif
 
-#include "viralloc.h"
 #include "virhostmem.h"
 #include "virerror.h"
-#include "virarch.h"
 #include "virfile.h"
 #include "virtypedparam.h"
 #include "virstring.h"

src/util/virhostuptime.c

@@ -25,7 +25,6 @@
 #endif
 
 #include "virhostuptime.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "virstring.h"

src/util/viridentity.c

@@ -30,15 +30,12 @@
 #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW
 
 #include "internal.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "viridentitypriv.h"
 #include "virlog.h"
-#include "virobject.h"
 #include "virrandom.h"
 #include "virthread.h"
 #include "virutil.h"
-#include "virstring.h"
 #include "virprocess.h"
 #include "virtypedparam.h"
 #include "virfile.h"

src/util/virinitctl.c

@@ -26,10 +26,7 @@
 #include "internal.h"
 #include "virinitctl.h"
 #include "virerror.h"
-#include "virutil.h"
-#include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_INITCTL
 

src/util/viriptables.c

@@ -29,14 +29,8 @@
 #include "internal.h"
 #include "viriptables.h"
 #include "virfirewalld.h"
-#include "vircommand.h"
-#include "viralloc.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
-#include "virthread.h"
-#include "virstring.h"
-#include "virutil.h"
 #include "virhash.h"
 
 VIR_LOG_INIT("util.iptables");

src/util/viriscsi.c

@@ -27,10 +27,8 @@
 #include "viralloc.h"
 #include "vircommand.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virrandom.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virjson.c

@@ -28,7 +28,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virenum.h"
 #include "virbitmap.h"

src/util/virkmod.c

@@ -23,7 +23,6 @@
 #include "viralloc.h"
 #include "virkmod.h"
 #include "vircommand.h"
-#include "virstring.h"
 
 static int
 doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf)

src/util/virlease.c

@@ -29,8 +29,6 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "virerror.h"
-#include "viralloc.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 

src/util/virlockspace.c

@@ -29,7 +29,6 @@
 #include "virfile.h"
 #include "virhash.h"
 #include "virthread.h"
-#include "virstring.h"
 
 #include <fcntl.h>
 #include <unistd.h>

src/util/virmacaddr.c

@@ -23,7 +23,6 @@
 
 #include "virmacaddr.h"
 #include "virrandom.h"
-#include "viralloc.h"
 
 static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =
     { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

src/util/virmacmap.c

@@ -26,8 +26,6 @@
 #include "virjson.h"
 #include "virfile.h"
 #include "virhash.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 

src/util/virnetdevbandwidth.c

@@ -24,7 +24,6 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virnetdevbridge.c

@@ -22,10 +22,8 @@
 #include "virnetdev.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virsocket.h"
 
 #ifdef WITH_NET_IF_H
 # include <net/if.h>

src/util/virnetdevmacvlan.c

@@ -24,8 +24,6 @@
 #include "virnetdevmacvlan.h"
 #include "virmacaddr.h"
 #include "virerror.h"
-#include "virthread.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 

src/util/virnetdevmacvlan.h

@@ -21,8 +21,6 @@
 
 #include "internal.h"
 #include "virmacaddr.h"
-#include "virsocketaddr.h"
-#include "virnetdevbandwidth.h"
 #include "virnetdevvportprofile.h"
 #include "virnetdevvlan.h"
 #include "virenum.h"

src/util/virnetdevmidonet.c

@@ -20,7 +20,6 @@
 
 #include "virnetdevmidonet.h"
 #include "vircommand.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "viruuid.h"
 

src/util/virnetdevtap.c

@@ -29,7 +29,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "datatypes.h"
 
 #include <unistd.h>
 #include <sys/types.h>

src/util/virnetdevveth.c

@@ -24,8 +24,6 @@
 #include "virlog.h"
 #include "vircommand.h"
 #include "virerror.h"
-#include "virfile.h"
-#include "virstring.h"
 #include "virnetdev.h"
 #include "virnetlink.h"
 

src/util/virnetdevvlan.c

@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virerror.h"
 #include "virnetdevvlan.h"
 #include "viralloc.h"
 

src/util/virnetlink.c

@@ -30,7 +30,6 @@
 #include "virmacaddr.h"
 #include "virerror.h"
 #include "viralloc.h"
-#include "virsocket.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 

src/util/virnvme.c

@@ -23,7 +23,6 @@
 #include "virpci.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 
 VIR_LOG_INIT("util.nvme");
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virobject.c

@@ -24,11 +24,9 @@
 #define VIR_PARENT_REQUIRED /* empty, to allow virObject to have no parent */
 #include "virobject.h"
 #include "virthread.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virprobe.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virpci.c

@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "virlog.h"
-#include "vircommand.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virkmod.h"

src/util/virpcivpd.c

@@ -30,7 +30,6 @@
 #include "virpcivpdpriv.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virperf.c

@@ -30,8 +30,6 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "virtypedparam.h"
-#include "viralloc.h"
 
 VIR_LOG_INIT("util.perf");
 

src/util/virpidfile.c

@@ -29,7 +29,6 @@
 
 #include "virpidfile.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virbuffer.h"
 #include "virutil.h"
 #include "virlog.h"

src/util/virpolkit.c

@@ -26,8 +26,6 @@
 #include "virpolkit.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
-#include "virprocess.h"
 #include "viralloc.h"
 #include "virgdbus.h"
 #include "virfile.h"

src/util/virportallocator.c

@@ -24,13 +24,10 @@
 #include <unistd.h>
 
 #include "virsocket.h"
-#include "viralloc.h"
 #include "virbitmap.h"
 #include "virportallocator.h"
 #include "virthread.h"
 #include "virerror.h"
-#include "virfile.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virqemu.c

@@ -26,8 +26,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virqemu.h"
-#include "virstring.h"
-#include "viralloc.h"
 #include "virbitmap.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virrandom.c

@@ -28,11 +28,8 @@
 #include <gnutls/crypto.h>
 
 #include "virrandom.h"
-#include "virthread.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virresctrl.h

@@ -21,7 +21,6 @@
 #include "internal.h"
 
 #include "virobject.h"
-#include "virbitmap.h"
 #include "virenum.h"
 
 typedef enum {

src/util/virrotatingfile.c

@@ -28,7 +28,6 @@
 #include "virrotatingfile.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "virfile.h"
 #include "virlog.h"
 

src/util/virscsivhost.c

@@ -25,7 +25,6 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virseclabel.c

@@ -22,9 +22,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "viralloc.h"
 #include "virseclabel.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virsecret.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virsecret.h"
-#include "virstring.h"
 #include "viruuid.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virsocketaddr.c

@@ -20,9 +20,7 @@
 
 #include "virsocketaddr.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "virbuffer.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virstoragefile.c

@@ -23,14 +23,10 @@
 #include "virstoragefile.h"
 
 #include "viralloc.h"
-#include "viruuid.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "vircommand.h"
-#include "virhash.h"
 #include "virstring.h"
-#include "virbuffer.h"
-#include "virsecret.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/util/virtpm.c

@@ -22,7 +22,6 @@
 
 #include <sys/stat.h>
 
-#include "virstring.h"
 #include "virerror.h"
 #include "viralloc.h"
 #include "virfile.h"

src/util/virutil.c

@@ -48,11 +48,9 @@
 
 #include "virerror.h"
 #include "virlog.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "vircommand.h"
-#include "virprocess.h"
 #include "virstring.h"
 #include "virutil.h"
 #include "virsocket.h"

src/util/viruuid.c

@@ -25,13 +25,10 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "internal.h"
-#include "virerror.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "virrandom.h"