conf: Remove unused includes

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

src/conf/backup_conf.c

@@ -21,16 +21,13 @@
 #include "configmake.h"
 #include "internal.h"
 #include "virbuffer.h"
-#include "datatypes.h"
 #include "domain_conf.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "backup_conf.h"
 #include "storage_source_conf.h"
-#include "virfile.h"
 #include "virerror.h"
 #include "virxml.h"
-#include "virstring.h"
 #include "virhash.h"
 #include "virenum.h"
 

src/conf/capabilities.c

@@ -37,7 +37,6 @@
 #include "virlog.h"
 #include "virnuma.h"
 #include "virstring.h"
-#include "virtypedparam.h"
 #include "viruuid.h"
 #include "virenum.h"
 #include "virutil.h"

src/conf/capabilities.h

@@ -23,10 +23,8 @@
 
 #include "internal.h"
 #include "virconftypes.h"
-#include "virbuffer.h"
 #include "cpu_conf.h"
 #include "virarch.h"
-#include "virmacaddr.h"
 #include "virobject.h"
 #include "virresctrl.h"
 

src/conf/checkpoint_conf.c

@@ -23,19 +23,15 @@
 
 #include "configmake.h"
 #include "internal.h"
-#include "virbitmap.h"
 #include "virbuffer.h"
-#include "datatypes.h"
 #include "domain_conf.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "checkpoint_conf.h"
 #include "storage_source_conf.h"
 #include "viruuid.h"
-#include "virfile.h"
 #include "virerror.h"
 #include "virxml.h"
-#include "virstring.h"
 #include "virdomaincheckpointobjlist.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT

src/conf/cpu_conf.c

@@ -26,8 +26,6 @@
 #include "virbuffer.h"
 #include "virfile.h"
 #include "cpu_conf.h"
-#include "domain_conf.h"
-#include "virstring.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_CPU

src/conf/cpu_conf.h

@@ -22,7 +22,6 @@
 
 #include "virbuffer.h"
 #include "virxml.h"
-#include "virbitmap.h"
 #include "virarch.h"
 #include "numa_conf.h"
 #include "virenum.h"

src/conf/device_conf.c

@@ -20,10 +20,8 @@
 
 #include <config.h>
 #include "virerror.h"
-#include "datatypes.h"
 #include "viralloc.h"
 #include "virxml.h"
-#include "viruuid.h"
 #include "virbuffer.h"
 #include "device_conf.h"
 #include "domain_addr.h"

src/conf/device_conf.h

@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virthread.h"
 #include "virbuffer.h"
 #include "virccw.h"
 #include "virpci.h"

src/conf/domain_addr.c

@@ -23,7 +23,6 @@
 
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "domain_addr.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN

src/conf/domain_audit.c

@@ -34,7 +34,6 @@
 #include "viruuid.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "virstring.h"
 
 VIR_LOG_INIT("conf.domain_audit");
 

src/conf/domain_capabilities.c

@@ -20,11 +20,9 @@
 
 #include <config.h>
 
-#include "device_conf.h"
 #include "domain_capabilities.h"
 #include "domain_conf.h"
 #include "viralloc.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES
 

src/conf/domain_conf.c

@@ -34,25 +34,21 @@
 #include "domain_addr.h"
 #include "domain_conf.h"
 #include "domain_validate.h"
-#include "snapshot_conf.h"
 #include "viralloc.h"
 #include "virxml.h"
 #include "viruuid.h"
 #include "virbuffer.h"
 #include "virlog.h"
-#include "nwfilter_conf.h"
 #include "virnetworkportdef.h"
 #include "storage_conf.h"
 #include "storage_source_conf.h"
 #include "virfile.h"
 #include "virbitmap.h"
-#include "secret_conf.h"
 #include "netdev_vport_profile_conf.h"
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vlan_conf.h"
 #include "device_conf.h"
 #include "network_conf.h"
-#include "virtpm.h"
 #include "virsecret.h"
 #include "virstring.h"
 #include "virnetdev.h"

src/conf/domain_conf.h

@@ -29,7 +29,6 @@
 #include "internal.h"
 #include "virconftypes.h"
 #include "capabilities.h"
-#include "storage_encryption_conf.h"
 #include "cpu_conf.h"
 #include "virthread.h"
 #include "virhash.h"

src/conf/domain_event.c

@@ -29,8 +29,6 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
-#include "virtypedparam.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/conf/domain_nwfilter.c

@@ -27,9 +27,7 @@
 #include "domain_conf.h"
 #include "domain_nwfilter.h"
 #include "virnwfilterbindingdef.h"
-#include "virerror.h"
 #include "viralloc.h"
-#include "virstring.h"
 #include "virlog.h"
 
 

src/conf/domain_validate.c

@@ -22,7 +22,6 @@
 
 #include "domain_validate.h"
 #include "domain_conf.h"
-#include "snapshot_conf.h"
 #include "vircgroup.h"
 #include "virconftypes.h"
 #include "virlog.h"

src/conf/interface_conf.c

@@ -20,15 +20,11 @@
 
 #include <config.h>
 #include "virerror.h"
-#include "datatypes.h"
 
 #include "interface_conf.h"
 
-#include "viralloc.h"
 #include "virxml.h"
-#include "viruuid.h"
 #include "virbuffer.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 

src/conf/interface_conf.h

@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virthread.h"
 #include "device_conf.h"
 #include "virenum.h"
 

src/conf/moment_conf.c

@@ -27,8 +27,6 @@
 #include "moment_conf.h"
 #include "domain_conf.h"
 #include "virlog.h"
-#include "viralloc.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 

src/conf/netdev_bandwidth_conf.c

@@ -20,7 +20,6 @@
 
 #include "netdev_bandwidth_conf.h"
 #include "virerror.h"
-#include "viralloc.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/conf/netdev_vport_profile_conf.c

@@ -20,7 +20,6 @@
 
 #include "netdev_vport_profile_conf.h"
 #include "virerror.h"
-#include "viralloc.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/conf/network_conf.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "virerror.h"
-#include "datatypes.h"
 #include "network_conf.h"
 #include "netdev_vport_profile_conf.h"
 #include "netdev_bandwidth_conf.h"
@@ -35,7 +34,6 @@
 #include "virxml.h"
 #include "viruuid.h"
 #include "virbuffer.h"
-#include "virfile.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK

src/conf/network_conf.h

@@ -24,14 +24,12 @@
 #define DNS_RECORD_LENGTH_SRV  (512 - 30)  /* Limit minus overhead as mentioned in RFC-2782 */
 
 #include "internal.h"
-#include "virthread.h"
 #include "virsocketaddr.h"
 #include "virnetdevbandwidth.h"
 #include "virnetdevvportprofile.h"
 #include "virnetdevvlan.h"
 #include "virmacaddr.h"
 #include "device_conf.h"
-#include "virbitmap.h"
 #include "networkcommon_conf.h"
 #include "virobject.h"
 #include "virmacmap.h"

src/conf/network_event.h

@@ -23,7 +23,6 @@
 
 #include "internal.h"
 #include "object_event.h"
-#include "object_event_private.h"
 
 int
 virNetworkEventStateRegisterID(virConnectPtr conn,

src/conf/networkcommon_conf.c

@@ -22,10 +22,7 @@
 #include <config.h>
 
 #include "virerror.h"
-#include "datatypes.h"
 #include "networkcommon_conf.h"
-#include "viralloc.h"
-#include "virstring.h"
 #include "virxml.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK

src/conf/networkcommon_conf.h

@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "virsocketaddr.h"
 #include "virnetdevip.h"
 
 virNetDevIPRoute *

src/conf/node_device_conf.c

@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "virerror.h"
-#include "datatypes.h"
 #include "viralloc.h"
 #include "virstring.h"
 #include "node_device_conf.h"

src/conf/node_device_conf.h

@@ -30,7 +30,6 @@
 #include "virpci.h"
 #include "virvhba.h"
 #include "device_conf.h"
-#include "storage_adapter_conf.h"
 #include "virenum.h"
 
 #include <libxml/tree.h>

src/conf/node_device_event.h

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "object_event.h"
-#include "object_event_private.h"
 
 int
 virNodeDeviceEventStateRegisterID(virConnectPtr conn,

src/conf/node_device_util.c

@@ -23,7 +23,6 @@
 #include "node_device_util.h"
 #include "virlog.h"
 #include "virscsihost.h"
-#include "virstring.h"
 #include "virvhba.h"
 #include "viralloc.h"
 #include "virutil.h"

src/conf/nwfilter_conf.c

@@ -38,10 +38,8 @@
 #include "viruuid.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "datatypes.h"
 #include "nwfilter_params.h"
 #include "nwfilter_conf.h"
-#include "domain_conf.h"
 #include "virfile.h"
 #include "virstring.h"
 

src/conf/nwfilter_conf.h

@@ -26,7 +26,6 @@
 
 #include "internal.h"
 
-#include "virhash.h"
 #include "virxml.h"
 #include "virbuffer.h"
 #include "virsocketaddr.h"

src/conf/nwfilter_ipaddrmap.c

@@ -23,9 +23,6 @@
 
 #include "internal.h"
 
-#include "viralloc.h"
-#include "virerror.h"
-#include "virstring.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"
 #include "nwfilter_ipaddrmap.h"

src/conf/nwfilter_params.c

@@ -25,9 +25,7 @@
 
 #include "viralloc.h"
 #include "virerror.h"
-#include "datatypes.h"
 #include "nwfilter_params.h"
-#include "domain_conf.h"
 #include "virlog.h"
 #include "virstring.h"
 

src/conf/nwfilter_params.h

@@ -23,7 +23,6 @@
 
 #include "virhash.h"
 #include "virbuffer.h"
-#include "virmacaddr.h"
 #include "virxml.h"
 
 typedef enum {

src/conf/object_event.c

@@ -22,16 +22,12 @@
 
 #include <config.h>
 
-#include "domain_event.h"
-#include "network_event.h"
 #include "object_event.h"
 #include "object_event_private.h"
 #include "virlog.h"
-#include "datatypes.h"
 #include "viralloc.h"
 #include "virerror.h"
 #include "virobject.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/conf/object_event.h

@@ -24,8 +24,6 @@
 
 #include "internal.h"
 
-#include "virobject.h"
-
 /**
  * Dispatching domain events that come in while
  * in a call / response rpc

src/conf/secret_conf.c

@@ -22,11 +22,8 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "datatypes.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "secret_conf.h"
-#include "virsecretobj.h"
 #include "virerror.h"
 #include "virsecret.h"
 #include "virstring.h"

src/conf/secret_event.h

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "object_event.h"
-#include "object_event_private.h"
 
 int
 virSecretEventStateRegisterID(virConnectPtr conn,

src/conf/snapshot_conf.c

@@ -27,23 +27,15 @@
 
 #include "configmake.h"
 #include "internal.h"
-#include "virbitmap.h"
 #include "virbuffer.h"
-#include "datatypes.h"
 #include "domain_conf.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "netdev_bandwidth_conf.h"
-#include "netdev_vport_profile_conf.h"
-#include "nwfilter_conf.h"
-#include "secret_conf.h"
 #include "snapshot_conf.h"
 #include "storage_source_conf.h"
 #include "viruuid.h"
-#include "virfile.h"
 #include "virerror.h"
 #include "virxml.h"
-#include "virstring.h"
 #include "virdomainsnapshotobjlist.h"
 
 #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW

src/conf/storage_adapter_conf.c

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

src/conf/storage_capabilities.c

@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include "virerror.h"
-#include "datatypes.h"
 #include "capabilities.h"
 #include "storage_capabilities.h"
 #include "storage_conf.h"

src/conf/storage_conf.c

@@ -27,8 +27,6 @@
 #include <fcntl.h>
 
 #include "virerror.h"
-#include "datatypes.h"
-#include "node_device_conf.h"
 #include "storage_adapter_conf.h"
 #include "storage_conf.h"
 #include "storage_source_conf.h"
@@ -38,10 +36,8 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virscsihost.h"
 #include "virstring.h"
 #include "virlog.h"
-#include "virvhba.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

src/conf/storage_conf.h

@@ -22,10 +22,7 @@
 #pragma once
 
 #include "internal.h"
-#include "storage_encryption_conf.h"
 #include "storage_source_conf.h"
-#include "virbitmap.h"
-#include "virthread.h"
 #include "device_conf.h"
 #include "object_event.h"
 #include "storage_adapter_conf.h"

src/conf/storage_encryption_conf.c

@@ -30,10 +30,7 @@
 #include "storage_encryption_conf.h"
 #include "virxml.h"
 #include "virerror.h"
-#include "viruuid.h"
-#include "virfile.h"
 #include "virsecret.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/conf/storage_event.h

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "object_event.h"
-#include "object_event_private.h"
 
 int
 virStoragePoolEventStateRegisterID(virConnectPtr conn,

src/conf/virchrdev.c

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

src/conf/virdomaincheckpointobjlist.c

@@ -28,7 +28,6 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "datatypes.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT

src/conf/virdomaincheckpointobjlist.h

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "virdomainmomentobjlist.h"
-#include "virbuffer.h"
 
 virDomainCheckpointObjList *
 virDomainCheckpointObjListNew(void);

src/conf/virdomainmomentobjlist.c

@@ -26,14 +26,9 @@
 #include "virdomainmomentobjlist.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "moment_conf.h"
 #include "viralloc.h"
 
-/* FIXME: using virObject would allow us to not need this */
-#include "virdomainsnapshotobjlist.h"
-#include "virdomaincheckpointobjlist.h"
-
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
 VIR_LOG_INIT("conf.virdomainmomentobjlist");

src/conf/virdomainobjlist.c

@@ -25,8 +25,6 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "virdomainobjlist.h"
-#include "checkpoint_conf.h"
-#include "snapshot_conf.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"

src/conf/virdomainsnapshotobjlist.c

@@ -26,9 +26,7 @@
 #include "virdomainsnapshotobjlist.h"
 #include "snapshot_conf.h"
 #include "virlog.h"
-#include "virerror.h"
 #include "datatypes.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT

src/conf/virdomainsnapshotobjlist.h

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "virdomainmomentobjlist.h"
-#include "virbuffer.h"
 
 virDomainSnapshotObjList *virDomainSnapshotObjListNew(void);
 void virDomainSnapshotObjListFree(virDomainSnapshotObjList *snapshots);

src/conf/virinterfaceobj.c

@@ -27,7 +27,6 @@
 #include "virinterfaceobj.h"
 #include "virhash.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 

src/conf/virnetworkportdef.c

@@ -23,8 +23,6 @@
 
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
-#include "virfile.h"
 #include "virnetdevmacvlan.h"
 #include "virnetworkportdef.h"
 #include "network_conf.h"

src/conf/virnetworkportdef.h

@@ -22,7 +22,6 @@
 #pragma once
 
 #include "internal.h"
-#include "viruuid.h"
 #include "virnetdevvlan.h"
 #include "virnetdevvportprofile.h"
 #include "virnetdevbandwidth.h"

src/conf/virnodedeviceobj.c

@@ -27,7 +27,6 @@
 #include "virerror.h"
 #include "virhash.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

src/conf/virnwfilterbindingdef.c

@@ -22,7 +22,6 @@
 
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "nwfilter_params.h"
 #include "virnwfilterbindingdef.h"
 #include "viruuid.h"

src/conf/virnwfilterbindingobj.c

@@ -23,11 +23,7 @@
 
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
-#include "nwfilter_params.h"
 #include "virnwfilterbindingobj.h"
-#include "viruuid.h"
-#include "virfile.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER

src/conf/virsecretobj.h

@@ -23,7 +23,6 @@
 #include "internal.h"
 
 #include "secret_conf.h"
-#include "virobject.h"
 
 typedef struct _virSecretObj virSecretObj;
 

src/conf/virstorageobj.c

@@ -21,7 +21,6 @@
 #include <dirent.h>
 
 #include "datatypes.h"
-#include "node_device_conf.h"
 #include "node_device_util.h"
 #include "virstorageobj.h"
 

src/conf/virstorageobj.h

@@ -23,8 +23,6 @@
 
 #include "storage_conf.h"
 
-#include "capabilities.h"
-
 typedef struct _virStoragePoolObj virStoragePoolObj;
 
 typedef struct _virStoragePoolObjList virStoragePoolObjList;