qemu: Remove unused includes

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

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index e6e92c7dc4ec92d973e2f2b0383b167e5958ca4e..d81f01ba773f75e7f0471afc6b7583b29b635025 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -34,12 +34,10 @@
 #include "virerror.h"
 #include "virjson.h"
 #include "virfile.h"
-#include "virprocess.h"
 #include "virtime.h"
 #include "virobject.h"
 #include "virstring.h"
 #include "virenum.h"
-#include "virsocket.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 8c2f0556044a4f4ad7cc65bc21b842c549636353..7efd91051ed37d8835c6e08747c057c71c1e7030 100644 (file)
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include "qemu_alias.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
 #include "virutil.h"

diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 8fc27f4696eecbb08723b72c6e6430910dd6d08e..1a583b820717562fca8a9a77e791afe353c1b74d 100644 (file)
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include "domain_conf.h"
-
 #include "qemu_capabilities.h"
 #include "qemu_domain.h"
 #include "qemu_domain_address.h"

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 427c090dd8b0259f1d4defc776fcde5f2f719e5b..d2a5d2db5f21d660d5658cadfa85728d20f3b4c0 100644 (file)
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -23,9 +23,7 @@
 #include "qemu_conf.h"
 #include "qemu_capabilities.h"
 #include "qemu_monitor.h"
-#include "qemu_process.h"
 #include "qemu_backup.h"
-#include "qemu_monitor_json.h"
 #include "qemu_checkpoint.h"
 #include "qemu_command.h"
 #include "qemu_security.h"
@@ -35,9 +33,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virbuffer.h"
-#include "viralloc.h"
-#include "virxml.h"
-#include "virstring.h"
 #include "backup_conf.h"
 #include "virdomaincheckpointobjlist.h"
 

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 877c66d62b95abdda991c171a6c65ca8dd447b30..9fe22f18f2dafc639770ccea3c26154d39ab5b8c 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -26,7 +26,6 @@
 
 #include "storage_source.h"
 #include "viralloc.h"
-#include "virstoragefile.h"
 #include "virstring.h"
 #include "virlog.h"
 

diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 8eafb8482a470bf38d9471d47d639929d23da29e..8641c8a2d246e82aed6bf600ae38b245f1556e14 100644 (file)
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -23,7 +23,6 @@
 #include "qemu_conf.h"
 #include "qemu_domain.h"
 
-#include "virhash.h"
 #include "virjson.h"
 #include "viruri.h"
 

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 8c2205118f232003b2ff5d7835212adcc6f0243c..ed82ac5dc2dc02a7d8984f6964b83c8faf171e97 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -35,10 +35,8 @@
 #include "storage_source_conf.h"
 #include "virlog.h"
 #include "virthread.h"
-#include "virtime.h"
 #include "locking/domain_lock.h"
 #include "viralloc.h"
-#include "virstring.h"
 #include "qemu_security.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e8c96ffc1fd45db2a38f0e72c1abd75a3294669a..2c3be3ececa9027b808c6d39aaa091379ea994fb 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -24,20 +24,15 @@
 #include "qemu_capabilities.h"
 #include "viralloc.h"
 #include "virarch.h"
-#include "vircrypto.h"
 #include "virlog.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virfilecache.h"
-#include "virpidfile.h"
-#include "virprocess.h"
 #include "cpu/cpu.h"
 #include "cpu/cpu_x86.h"
 #include "domain_conf.h"
-#include "vircommand.h"
 #include "virbitmap.h"
 #include "virnodesuspend.h"
-#include "virnuma.h"
 #include "virhostcpu.h"
 #include "qemu_monitor.h"
 #include "virstring.h"
@@ -54,7 +49,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <sys/utsname.h>
 #ifdef __APPLE__
 # include <sys/types.h>

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 9bb81f87c2bb6ddc3f02b76b84272164e31967c7..6f35ba14854ee7164a6d372d5d32409ce24bd6e0 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -22,8 +22,6 @@
 #pragma once
 
 #include "virobject.h"
-#include "capabilities.h"
-#include "vircommand.h"
 #include "qemu_monitor.h"
 #include "domain_capabilities.h"
 #include "virfirmware.h"

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index f189ca2bb6f5dcf7c3345f913dc9e859cb3585ea..2cc16a69d345d1d3374956aa8cf12f217a91e4b1 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -23,21 +23,14 @@
 
 #include "qemu_cgroup.h"
 #include "qemu_domain.h"
-#include "qemu_process.h"
 #include "qemu_extdevice.h"
 #include "qemu_hostdev.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "domain_audit.h"
 #include "domain_cgroup.h"
-#include "virscsi.h"
-#include "virstring.h"
 #include "virfile.h"
-#include "virtypedparam.h"
-#include "virnuma.h"
 #include "virdevmapper.h"
-#include "virutil.h"
 #include "virglibutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index f09134947ffc3b2cc1be44b5f38db117ea67ed68..3668034cde2782fb30bd860c4213aaf0b302e717 100644 (file)
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -21,9 +21,7 @@
 
 #pragma once
 
-#include "virusb.h"
 #include "vircgroup.h"
-#include "domain_conf.h"
 #include "qemu_conf.h"
 
 int qemuSetupImageCgroup(virDomainObj *vm,

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index a933230335f56f741258a38bc0f8a563040f8d15..933ea410239255ff135eeec0c8f41aeba180ce2f 100644 (file)
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -31,11 +31,8 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "domain_conf.h"
-#include "libvirt_internal.h"
 #include "virxml.h"
-#include "virstring.h"
 #include "virdomaincheckpointobjlist.h"
-#include "virdomainsnapshotobjlist.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
index 351995a31dfe5ea2c6e4af3b57aec910ad710cc3..fc1c35cdd2550450eb9508fad751adfe120daa21 100644 (file)
--- a/src/qemu/qemu_checkpoint.h
+++ b/src/qemu/qemu_checkpoint.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "virconftypes.h"
-#include "datatypes.h"
 #include "qemu_conf.h"
 
 virDomainObj *

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d5f0c25e8a0cba77e0553be27ec4aae07db13535..57334ab24662ee0afc0ec820876dc2192aaa8464 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -41,23 +41,16 @@
 #include "viruuid.h"
 #include "domain_nwfilter.h"
 #include "domain_addr.h"
-#include "domain_audit.h"
 #include "domain_conf.h"
 #include "netdev_bandwidth_conf.h"
-#include "snapshot_conf.h"
-#include "storage_conf.h"
-#include "secret_conf.h"
 #include "virnetdevopenvswitch.h"
 #include "device_conf.h"
 #include "storage_source_conf.h"
 #include "virtpm.h"
-#include "virscsi.h"
 #include "virnuma.h"
 #include "virgic.h"
 #include "virmdev.h"
-#include "virdomainsnapshotobjlist.h"
 #include "virutil.h"
-#include "virsecureerase.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 2bb4984656d201fd8d191154522c583f7cf72a49..f8e9d71e81dea6b50c6cee09c8c9be0a6f745504 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -21,17 +21,13 @@
 
 #pragma once
 
-#include "domain_addr.h"
 #include "domain_conf.h"
 #include "vircommand.h"
 #include "virenum.h"
-#include "capabilities.h"
 #include "qemu_block.h"
 #include "qemu_conf.h"
 #include "qemu_domain.h"
-#include "qemu_domain_address.h"
 #include "qemu_capabilities.h"
-#include "logging/log_manager.h"
 
 /* Config type for XML import/export conversions */
 #define QEMU_CONFIG_FORMAT_ARGV "qemu-argv"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c22cf79cbefa43c8eb50659a056fa396d1caa7d7..3b75cdeb95dd95fd63130af6f973aee3e452b02a 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -34,19 +34,14 @@
 #include "qemu_namespace.h"
 #include "qemu_security.h"
 #include "viruuid.h"
-#include "virbuffer.h"
 #include "virconf.h"
 #include "viralloc.h"
-#include "datatypes.h"
 #include "virxml.h"
 #include "virlog.h"
 #include "cpu/cpu.h"
 #include "domain_driver.h"
-#include "domain_nwfilter.h"
 #include "virfile.h"
-#include "virsocket.h"
 #include "virstring.h"
-#include "storage_conf.h"
 #include "virutil.h"
 #include "configmake.h"
 #include "security/security_util.h"

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5e752d075eb09ed1d2b9d13d5958b1b0df0b2923..c40c452f5858ec4725d9c941f620c49f5c271e92 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -25,21 +25,14 @@
 
 #include "virebtables.h"
 #include "internal.h"
-#include "capabilities.h"
-#include "network_conf.h"
 #include "domain_conf.h"
 #include "checkpoint_conf.h"
 #include "snapshot_conf.h"
 #include "domain_event.h"
 #include "virthread.h"
 #include "security/security_manager.h"
-#include "virpci.h"
-#include "virusb.h"
-#include "virscsi.h"
 #include "cpu_conf.h"
-#include "driver.h"
 #include "virportallocator.h"
-#include "vircommand.h"
 #include "virthreadpool.h"
 #include "locking/lock_manager.h"
 #include "qemu_capabilities.h"

diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c
index 2ed8f8640dad50df808d8b975adcf24378f75565..cb2694795e5923551ca5b80cd905b41caea7131e 100644 (file)
--- a/src/qemu/qemu_dbus.c
+++ b/src/qemu/qemu_dbus.c
@@ -18,13 +18,10 @@
 
 #include <config.h>
 
-#include "qemu_extdevice.h"
 #include "qemu_dbus.h"
 #include "qemu_security.h"
 
-#include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virtime.h"
 #include "virpidfile.h"
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2e53afa8793c0830874806b9b10ee25c03ad236d..9769e3bb92fece77a4c6f1b923422905034a708f 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -26,10 +26,8 @@
 #include "qemu_block.h"
 #include "qemu_cgroup.h"
 #include "qemu_command.h"
-#include "qemu_process.h"
 #include "qemu_capabilities.h"
 #include "qemu_hostdev.h"
-#include "qemu_migration.h"
 #include "qemu_migration_params.h"
 #include "qemu_security.h"
 #include "qemu_slirp.h"
@@ -46,17 +44,14 @@
 #include "viruuid.h"
 #include "virfile.h"
 #include "domain_addr.h"
-#include "domain_capabilities.h"
 #include "domain_driver.h"
 #include "domain_event.h"
 #include "domain_validate.h"
 #include "virtime.h"
 #include "virnetdevbandwidth.h"
-#include "virnetdevopenvswitch.h"
 #include "virstoragefile.h"
 #include "storage_source.h"
 #include "virstring.h"
-#include "virthreadjob.h"
 #include "virprocess.h"
 #include "vircrypto.h"
 #include "virrandom.h"
@@ -68,7 +63,6 @@
 #include "virdomaincheckpointobjlist.h"
 #include "backup_conf.h"
 #include "virutil.h"
-#include "virqemu.h"
 #include "virsecureerase.h"
 
 #include <sys/time.h>

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index ac0f4e6d5becd93548c7cf2716d3c93719522cd2..a87dfff1bb769ccf7a065008c3e9f04f23381768 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -22,12 +22,10 @@
 #pragma once
 
 #include <glib-object.h>
-#include "virthread.h"
 #include "vircgroup.h"
 #include "virperf.h"
 #include "domain_addr.h"
 #include "domain_conf.h"
-#include "snapshot_conf.h"
 #include "qemu_monitor.h"
 #include "qemu_agent.h"
 #include "qemu_blockjob.h"
@@ -37,7 +35,6 @@
 #include "qemu_migration_params.h"
 #include "qemu_slirp.h"
 #include "qemu_fd.h"
-#include "virmdev.h"
 #include "virchrdev.h"
 #include "virobject.h"
 #include "logging/log_manager.h"

diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h
index 4c360a0f70226be6c45048b7b858c5211bad3145..dbb5de915edb43e6b661f853ec69378710e735c3 100644 (file)
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include "domain_addr.h"
-#include "domain_conf.h"
 #include "qemu_conf.h"
 #include "qemu_capabilities.h"
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 08eb211b8abf89d17af90a6c16ca9776cab914e0..3b5c3db67ce0b826d6ddaf1ff82954e9ac310eee 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -25,11 +25,9 @@
 #include <poll.h>
 #include <sys/time.h>
 #include <dirent.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <sys/ioctl.h>
 
 #include "qemu_driver.h"
@@ -39,7 +37,6 @@
 #include "qemu_conf.h"
 #include "qemu_capabilities.h"
 #include "qemu_command.h"
-#include "qemu_cgroup.h"
 #include "qemu_hostdev.h"
 #include "qemu_hotplug.h"
 #include "qemu_monitor.h"
@@ -65,25 +62,20 @@
 #include "virnetdevopenvswitch.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "virarptable.h"
 #include "viruuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
 #include "domain_validate.h"
-#include "node_device_conf.h"
 #include "virpci.h"
-#include "virusb.h"
 #include "virpidfile.h"
 #include "virprocess.h"
 #include "libvirt_internal.h"
 #include "virxml.h"
 #include "cpu/cpu.h"
 #include "virsysinfo.h"
-#include "domain_nwfilter.h"
 #include "virhook.h"
-#include "virstoragefile.h"
 #include "storage_source_conf.h"
 #include "storage_file_probe.h"
 #include "storage_source.h"
@@ -107,11 +99,9 @@
 #include "virperf.h"
 #include "virnuma.h"
 #include "netdev_bandwidth_conf.h"
-#include "virqemu.h"
 #include "virdomainsnapshotobjlist.h"
 #include "virenum.h"
 #include "virdomaincheckpointobjlist.h"
-#include "virsocket.h"
 #include "virutil.h"
 #include "backup_conf.h"
 

diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 87463e74bfc3057abe1d07201570f87f697efdeb..b8e3c1000ab58152072c0dc367224db9e9afa43e 100644 (file)
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include "qemu_command.h"
 #include "qemu_extdevice.h"
 #include "qemu_vhost_user_gpu.h"
 #include "qemu_dbus.h"
@@ -29,12 +28,8 @@
 #include "qemu_slirp.h"
 #include "qemu_virtiofs.h"
 
-#include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virtime.h"
-#include "virtpm.h"
-#include "virpidfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index a2199789629397e9a0a7f66e597d3abf82de649a..f2a1bc81ac9eecda4cb852b35e18eb8ec2394bac 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -29,7 +29,6 @@
 #include "virarch.h"
 #include "virjson.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "viralloc.h"
 #include "virenum.h"
 

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 8af22bdd58a4414039154ee1d778fc91691be877..45cd1066f0a541de854a6e8ac0426ccd2f0cac52 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -28,11 +28,6 @@
 #include "qemu_domain.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "viralloc.h"
-#include "virpci.h"
-#include "virusb.h"
-#include "virscsi.h"
-#include "virnetdev.h"
 #include "virfile.h"
 #include "virhostdev.h"
 #include "virutil.h"

diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index 09006851b1e22ad6428c3615b41771fdedbfd973..2d484db878dd4cb126d8d83f09881e0f5fa3d30e 100644 (file)
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "qemu_conf.h"
-#include "domain_conf.h"
 
 bool qemuHostdevNeedsVFIO(const virDomainHostdevDef *hostdev);
 

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f795568299a9e90c246c607df8c9141b6307a7da..ee44649d4810149cf3ec37e409fc3b9c09837c90 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -46,20 +46,16 @@
 #include "viralloc.h"
 #include "virpci.h"
 #include "virfile.h"
-#include "virprocess.h"
 #include "qemu_cgroup.h"
 #include "locking/domain_lock.h"
 #include "virnetdev.h"
 #include "virnetdevbridge.h"
-#include "virnetdevtap.h"
 #include "virnetdevopenvswitch.h"
 #include "virnetdevmidonet.h"
 #include "device_conf.h"
 #include "storage_source.h"
 #include "storage_source_conf.h"
-#include "virstring.h"
 #include "virtime.h"
-#include "virqemu.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index a0a9ae47e249a942450425a2c0ba52f2cf049030..2b1e8085a458150a63b21de34213824347ca71b6 100644 (file)
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -23,7 +23,6 @@
 
 #include "qemu_conf.h"
 #include "qemu_domain.h"
-#include "domain_conf.h"
 
 int qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
                                    virDomainObj *vm,

diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index ba03277025e17d09dca1977da32433c6f9f0d184..cf8117d9961aea203cfe8b1cc8b955c362fa3384 100644 (file)
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -27,7 +27,6 @@
 #include "qemu_interface.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virnetdev.h"
 #include "virnetdevtap.h"
 #include "virnetdevmacvlan.h"

diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index e359d4f520c7bdbbac80856858d2c1510b9f3050..d7ac6e6fc983689c61a1711e01aa057ccebb601b 100644 (file)
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "domain_conf.h"
 #include "qemu_conf.h"
 #include "qemu_domain.h"
 #include "qemu_slirp.h"

diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c
index 24db722c0be39d93ac420510413e9b881107fc03..cdc710804f826a8879ff24a9136a0817d27452d8 100644 (file)
--- a/src/qemu/qemu_interop_config.c
+++ b/src/qemu/qemu_interop_config.c
@@ -22,13 +22,10 @@
 
 #include "qemu_interop_config.h"
 #include "configmake.h"
-#include "viralloc.h"
-#include "virenum.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virhash.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 849c25b16877d6ead448b753bbd56372a07c2d14..6e5b3839fb35fe788def0e64ec24b1d6dc5f20c4 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -33,7 +33,6 @@
 #include "qemu_process.h"
 #include "qemu_capabilities.h"
 #include "qemu_alias.h"
-#include "qemu_cgroup.h"
 #include "qemu_hotplug.h"
 #include "qemu_blockjob.h"
 #include "qemu_security.h"
@@ -48,9 +47,7 @@
 #include "virnetdevopenvswitch.h"
 #include "datatypes.h"
 #include "virfdstream.h"
-#include "viruuid.h"
 #include "virtime.h"
-#include "locking/domain_lock.h"
 #include "rpc/virnetsocket.h"
 #include "storage_source_conf.h"
 #include "viruri.h"
@@ -58,9 +55,7 @@
 #include "virstring.h"
 #include "virtypedparam.h"
 #include "virprocess.h"
-#include "nwfilter_conf.h"
 #include "virdomainsnapshotobjlist.h"
-#include "virsocket.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index 52ed2c518b8b20b57c142ade065fb5767628b880..0738ad430f1ee7a5971a42047647e55a1ab16526 100644 (file)
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -22,7 +22,6 @@
 #include <gnutls/x509.h>
 
 #include "locking/domain_lock.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virnetdevopenvswitch.h"

diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h
index d9e1d949a8ebf10feb2f76ade84ba7b8240a77da..2f0cdcf7b6755ff5a4f5e9e11834d3dde042d443 100644 (file)
--- a/src/qemu/qemu_migration_cookie.h
+++ b/src/qemu/qemu_migration_cookie.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "qemu_domain.h"
-#include "qemu_domainjob.h"
 #include "qemu_migration_params.h"
 #include "virenum.h"
 

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 95fd773645a35679cbb0c288067e7ad672a1b400..4e83d8d8bd390e79211069d5245ce54b41d4372c 100644 (file)
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -23,12 +23,10 @@
 
 #include "virlog.h"
 #include "virerror.h"
-#include "viralloc.h"
 #include "virstring.h"
 
 #include "qemu_alias.h"
 #include "qemu_hotplug.h"
-#include "qemu_migration.h"
 #include "qemu_migration_params.h"
 #define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
 #include "qemu_migration_paramspriv.h"

diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index a0909b9f3dc09ef075eee4bcb812580f22f5b770..f2f009034313fc0381db35d6ae40d880b114af69 100644 (file)
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -24,8 +24,6 @@
 #include "internal.h"
 
 #include "virbuffer.h"
-#include "virxml.h"
-#include "qemu_monitor.h"
 #include "qemu_conf.h"
 #include "virenum.h"
 

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 32c993a941f0e8ea2bf7b8541d9f4621d2b7a134..fda5d2f3689a84bc7d86f66066644a18cd00ae7a 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -31,7 +31,6 @@
 #include "qemu_monitor_text.h"
 #include "qemu_monitor_json.h"
 #include "qemu_domain.h"
-#include "qemu_process.h"
 #include "qemu_capabilities.h"
 #include "virerror.h"
 #include "viralloc.h"
@@ -42,7 +41,6 @@
 #include "virprobe.h"
 #include "virstring.h"
 #include "virtime.h"
-#include "virsocket.h"
 #include "virutil.h"
 
 #ifdef WITH_DTRACE_PROBES

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 06822d664215af33104ef1dd08f8abbb46a53be8..95267ec6c73957410dd69da9a93a4b34e60d296a 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -25,10 +25,8 @@
 
 #include "domain_conf.h"
 #include "virbitmap.h"
-#include "virhash.h"
 #include "virjson.h"
 #include "virnetdev.h"
-#include "device_conf.h"
 #include "cpu/cpu.h"
 #include "util/virgic.h"
 #include "virenum.h"

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6b3acab0d2b1279f5888df9d42cc4d0c039af618..3aad2ab212c2804f6e31100b4fcebdce8f2523d8 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -27,18 +27,14 @@
 
 #include "qemu_monitor_json.h"
 #include "qemu_alias.h"
-#include "qemu_capabilities.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "driver.h"
-#include "datatypes.h"
 #include "virerror.h"
 #include "virjson.h"
 #include "virprobe.h"
 #include "virstring.h"
 #include "cpu/cpu_x86.h"
 #include "virenum.h"
-#include "virsocket.h"
 
 #ifdef WITH_DTRACE_PROBES
 # include "libvirt_qemu_probes.h"

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 3b55e380b3aae9af44dd59504e2fd89cfa5a45e0..ad3853ae69dcd7ce17b54c58dafcda7c4b1af4b9 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -24,7 +24,6 @@
 #include "internal.h"
 
 #include "qemu_monitor.h"
-#include "virbitmap.h"
 #include "cpu/cpu.h"
 #include "util/virgic.h"
 

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 86af1e49754a994fc4e446c58b112bd4e3a92a11..65785f1dae052a1a3262dc32dad36ac027ca4379 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -24,10 +24,8 @@
 
 #include "qemu_monitor_text.h"
 #include "qemu_monitor_json.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 59c6dc52ac29a78ea6a8efecf872038dbe330d43..98cd794666b936c4ff4a74086069b1ccaae5d0c1 100644 (file)
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -38,7 +38,6 @@
 #include "qemu_hostdev.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virdevmapper.h"
 #include "virglibutil.h"
 

diff --git a/src/qemu/qemu_namespace.h b/src/qemu/qemu_namespace.h
index 020aca13d8857195bb2dc9f9b8db11a98598df56..fbea865c705ed5204ce0ad87ac9fd59d60dff958 100644 (file)
--- a/src/qemu/qemu_namespace.h
+++ b/src/qemu/qemu_namespace.h
@@ -23,7 +23,6 @@
 
 #include "virenum.h"
 #include "qemu_conf.h"
-#include "virconf.h"
 
 typedef enum {
     QEMU_DOMAIN_NS_MOUNT = 0,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1af7cef4a8f5e8b3716a9607976f2bfaa3da19dc..771a623ef75444fc3bba9e66204816c975af0e39 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -87,9 +87,7 @@
 #include "virnuma.h"
 #include "virstring.h"
 #include "virhostdev.h"
-#include "virsecret.h"
 #include "configmake.h"
-#include "nwfilter_conf.h"
 #include "netdev_bandwidth_conf.h"
 #include "virresctrl.h"
 #include "virvsock.h"

diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 8641534be419d6bc8199d8e75e796141a812dcff..0fddae0bbb122f9de7118a97dae7a25a16581320 100644 (file)
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -23,7 +23,6 @@
 
 #include "qemu_conf.h"
 #include "qemu_domain.h"
-#include "virstoragefile.h"
 #include "vireventthread.h"
 
 int qemuProcessPrepareMonitorChr(virDomainChrSourceDef *monConfig,

diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index 426db8d30d9f8d3ebebeef63603b1d4b2cbbd9a5..500d3c50b31d453d8a5cfb038850862ae2723a4d 100644 (file)
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -20,8 +20,6 @@
 
 #include "qemu_qapi.h"
 
-#include "viralloc.h"
-#include "virstring.h"
 #include "virerror.h"
 #include "virlog.h"
 

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 4fd4c5cfcd62e07f312e365de525a1178085365c..79567bf17d96d0320cdc119de7786cd97ddd33b7 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -28,8 +28,6 @@
 
 #include "virerror.h"
 #include "virlog.h"
-#include "viralloc.h"
-#include "virqemu.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h
index 391cd55ed0404ac998d32d54f22a032fdfedba9b..30cf4b1ee03de37c093b8140e4c1e6bef7e75397 100644 (file)
--- a/src/qemu/qemu_saveimage.h
+++ b/src/qemu/qemu_saveimage.h
@@ -19,10 +19,8 @@
 #pragma once
 
 #include "virconftypes.h"
-#include "datatypes.h"
 
 #include "qemu_conf.h"
-#include "qemu_domainjob.h"
 #include "qemu_domain.h"
 
 /* It would be nice to replace 'Qemud' with 'Qemu' but

diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
index eaf646f225e923d1175d44ed4df8ad6eef683682..e01d4699e6b58e611eb62824aad85bcfb7f33781 100644 (file)
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@@ -21,8 +21,6 @@
 #pragma once
 
 #include "qemu_conf.h"
-#include "domain_conf.h"
-#include "security/security_manager.h"
 
 int qemuSecuritySetAllLabel(virQEMUDriver *driver,
                             virDomainObj *vm,

diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c
index a06869a4060e38b148350948f79e8aa0fc760857..7b5858307414079924a738920cd9853ba1a1aee6 100644 (file)
--- a/src/qemu/qemu_shim.c
+++ b/src/qemu/qemu_shim.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "virfile.h"
-#include "virstring.h"
 #include "virgettext.h"
 #include "virthread.h"
 

diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c
index 772ea582c561ede4c523addfadcc6d418fb829b6..c802ef7fa865b7e224b67b69a3f22fec066b3eb6 100644 (file)
--- a/src/qemu/qemu_slirp.c
+++ b/src/qemu/qemu_slirp.c
@@ -22,14 +22,11 @@
 #include "qemu_extdevice.h"
 #include "qemu_security.h"
 #include "qemu_slirp.h"
-#include "viralloc.h"
 #include "virenum.h"
 #include "virerror.h"
 #include "virjson.h"
 #include "virlog.h"
 #include "virpidfile.h"
-#include "virstring.h"
-#include "virtime.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index c6beeda1d026cded85e7e0d2a3e4f949dab0725f..833f880252afeaf33e4f126f485b985208802468 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -36,10 +36,6 @@
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "locking/domain_lock.h"
-#include "libvirt_internal.h"
-#include "virxml.h"
-#include "virstoragefile.h"
-#include "virstring.h"
 #include "virdomainsnapshotobjlist.h"
 #include "virqemu.h"
 #include "storage_source.h"

diff --git a/src/qemu/qemu_snapshot.h b/src/qemu/qemu_snapshot.h
index 0cc38c003942de1fb346e0994d7983c258942436..f69c05f68cfa036d7afcd2702ab9061bfd8beda2 100644 (file)
--- a/src/qemu/qemu_snapshot.h
+++ b/src/qemu/qemu_snapshot.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "virconftypes.h"
-#include "datatypes.h"
 #include "qemu_conf.h"
 #include "qemu_domainjob.h"
 

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 086780edcd0fb4ceb9a9effc4f67ef07894c6ccd..03829775b8a1dc8f624408d692a358fb924d5082 100644 (file)
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -26,19 +26,14 @@
 #include <fcntl.h>
 
 #include "qemu_extdevice.h"
-#include "qemu_domain.h"
 #include "qemu_security.h"
 
 #include "conf/domain_conf.h"
 #include "vircommand.h"
-#include "viralloc.h"
-#include "virkmod.h"
 #include "viridentity.h"
 #include "virlog.h"
-#include "virutil.h"
 #include "viruuid.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "virpidfile.h"
 #include "configmake.h"
 #include "qemu_tpm.h"

diff --git a/src/qemu/qemu_validate.h b/src/qemu/qemu_validate.h
index 1e0546633c40a823436bbb21b4c9276acd8d2521..e06a43b8e364c2980cbe366bb753ca283521c2a0 100644 (file)
--- a/src/qemu/qemu_validate.h
+++ b/src/qemu/qemu_validate.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "domain_conf.h"
 #include "qemu_capabilities.h"
 
 int

diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c
index 75cc718c096348c0c4e0ab4e8dc238a1b7f03559..7539afd50aef5e59d6597b4b7e0942e3fa489737 100644 (file)
--- a/src/qemu/qemu_vhost_user.c
+++ b/src/qemu/qemu_vhost_user.c
@@ -24,7 +24,6 @@
 #include "qemu_interop_config.h"
 #include "virjson.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "viralloc.h"
 #include "virenum.h"
 #include "virutil.h"

diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h
index f4ae1839d176a5f5ef0698f53d3654162eb00d25..d1aa6ca189f3c18aef9cae50ce29b28c0c1eea09 100644 (file)
--- a/src/qemu/qemu_vhost_user.h
+++ b/src/qemu/qemu_vhost_user.h
@@ -20,9 +20,7 @@
 
 #pragma once
 
-#include "domain_conf.h"
 #include "qemu_conf.h"
-#include "virarch.h"
 
 typedef struct _qemuVhostUser qemuVhostUser;
 

diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c
index 6f601cebde0c0e2e0219b9e6cf850248ff4ad229..7c5be4098e5bad636e0b519050407bf2378a71b3 100644 (file)
--- a/src/qemu/qemu_vhost_user_gpu.c
+++ b/src/qemu/qemu_vhost_user_gpu.c
@@ -27,11 +27,8 @@
 #include "conf/domain_conf.h"
 #include "configmake.h"
 #include "vircommand.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "virstring.h"
-#include "virtime.h"
 #include "virpidfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/qemu/qemu_vhost_user_gpu.h b/src/qemu/qemu_vhost_user_gpu.h
index 0d50dd24645772f02467a23260f329a09b208345..2b86982cb87e08aae0dd918528eb2bf24b05cde3 100644 (file)
--- a/src/qemu/qemu_vhost_user_gpu.h
+++ b/src/qemu/qemu_vhost_user_gpu.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "domain_conf.h"
 #include "qemu_domain.h"
 #include "qemu_security.h"