Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/access/viraccessdriver.h | 1 - src/access/viraccessdriverpolkit.c | 4 ---- src/access/viraccessdriverstack.c | 1 - src/access/viraccessmanager.h | 1 - 4 files changed, 7 deletions(-) diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h index c1bccfe90f..f4bc4b6ced 100644 --- a/src/access/viraccessdriver.h +++ b/src/access/viraccessdriver.h @@ -20,7 +20,6 @@ #pragma once -#include "conf/domain_conf.h" #include "access/viraccessmanager.h" typedef int (*virAccessDriverCheckConnectDrv)(virAccessManager *manager, diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index c8d1421ad8..2473bd6258 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -21,13 +21,9 @@ #include <config.h> #include "viraccessdriverpolkit.h" -#include "viralloc.h" -#include "vircommand.h" #include "virlog.h" -#include "virprocess.h" #include "virerror.h" #include "virpolkit.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_ACCESS diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c index e6fe285a54..fb9ea71665 100644 --- a/src/access/viraccessdriverstack.c +++ b/src/access/viraccessdriverstack.c @@ -22,7 +22,6 @@ #include "viraccessdriverstack.h" #include "viralloc.h" -#include "virerror.h" #define VIR_FROM_THIS VIR_FROM_ACCESS diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h index 9e3da355da..2050ac9b85 100644 --- a/src/access/viraccessmanager.h +++ b/src/access/viraccessmanager.h @@ -21,7 +21,6 @@ #pragma once #include "viridentity.h" -#include "conf/domain_conf.h" #include "conf/network_conf.h" #include "conf/nwfilter_conf.h" #include "conf/node_device_conf.h" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/ch/ch_conf.c | 1 - src/ch/ch_domain.c | 1 - src/ch/ch_driver.c | 7 ------- src/ch/ch_monitor.c | 2 -- src/ch/ch_process.c | 2 -- 5 files changed, 13 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index bae245adf3..775596e9f5 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -21,7 +21,6 @@ #include <config.h> #include "configmake.h" -#include "viralloc.h" #include "vircommand.h" #include "virlog.h" #include "virobject.h" diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 5ab526ba1b..62a6f7a9d6 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -22,7 +22,6 @@ #include "ch_domain.h" #include "domain_driver.h" -#include "viralloc.h" #include "virchrdev.h" #include "virlog.h" #include "virtime.h" diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index d14899044e..e7c172c894 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -29,18 +29,11 @@ #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" -#include "viralloc.h" -#include "virbuffer.h" #include "virchrdev.h" -#include "vircommand.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virnetdevtap.h" #include "virobject.h" -#include "virstring.h" #include "virtypedparam.h" -#include "viruri.h" #include "virutil.h" #include "viruuid.h" #include "virnuma.h" diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 2c6b83a1b5..fe3c1237c4 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -24,7 +24,6 @@ #include <unistd.h> #include <curl/curl.h> -#include "ch_conf.h" #include "ch_monitor.h" #include "viralloc.h" #include "vircommand.h" @@ -33,7 +32,6 @@ #include "virjson.h" #include "virlog.h" #include "virstring.h" -#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_CH diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 4247902bcf..77f55e777b 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -27,8 +27,6 @@ #include "ch_monitor.h" #include "ch_process.h" #include "domain_cgroup.h" -#include "virnuma.h" -#include "viralloc.h" #include "virerror.h" #include "virjson.h" #include "virlog.h" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/cpu/cpu.c | 3 --- src/cpu/cpu.h | 1 - src/cpu/cpu_arm.c | 1 - src/cpu/cpu_map.c | 2 -- src/cpu/cpu_ppc64.c | 1 - src/cpu/cpu_s390.c | 2 -- src/cpu/cpu_x86.c | 1 - 7 files changed, 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 285c7eee44..d97ef5e873 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -21,16 +21,13 @@ #include <config.h> #include "virlog.h" -#include "viralloc.h" #include "virxml.h" #include "cpu.h" -#include "cpu_map.h" #include "cpu_x86.h" #include "cpu_ppc64.h" #include "cpu_s390.h" #include "cpu_arm.h" #include "capabilities.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 071b33fe76..06b5858ef3 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -20,7 +20,6 @@ #pragma once -#include "virerror.h" #include "datatypes.h" #include "virarch.h" #include "domain_capabilities.h" diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 51a3c1f3ee..599bb836ed 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -35,7 +35,6 @@ #include "cpu_arm.h" #include "cpu_map.h" #include "virlog.h" -#include "virstring.h" #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 6baaa77776..1d8051a13b 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -20,12 +20,10 @@ #include <config.h> -#include "viralloc.h" #include "virfile.h" #include "cpu.h" #include "cpu_map.h" #include "configmake.h" -#include "virstring.h" #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 087635404d..cd2df4ba4a 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -26,7 +26,6 @@ #include "cpu.h" #include "virstring.h" #include "cpu_map.h" -#include "virbuffer.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 8fda4a49a6..d908a83928 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -21,8 +21,6 @@ #include <config.h> -#include "viralloc.h" -#include "virstring.h" #include "cpu.h" diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a4aca6055d..695d095baa 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -31,7 +31,6 @@ #include "cpu_x86.h" #include "virbuffer.h" #include "virendian.h" -#include "virstring.h" #include "virhostcpu.h" #define VIR_FROM_THIS VIR_FROM_CPU -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/hyperv/hyperv_private.h | 2 -- src/hyperv/hyperv_util.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h index da37a8fd20..fb82cef046 100644 --- a/src/hyperv/hyperv_private.h +++ b/src/hyperv/hyperv_private.h @@ -23,11 +23,9 @@ #pragma once #include "internal.h" -#include "virerror.h" #include "hyperv_util.h" #include "hyperv_wsman.h" #include "capabilities.h" -#include "domain_conf.h" typedef struct _hypervPrivate hypervPrivate; struct _hypervPrivate { diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index ede786be25..fe71e47285 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -22,13 +22,10 @@ #include <config.h> #include "internal.h" -#include "datatypes.h" #include "viralloc.h" #include "virlog.h" -#include "viruuid.h" #include "hyperv_private.h" #include "hyperv_util.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_HYPERV -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/libxl/libxl_capabilities.c | 1 - src/libxl/libxl_capabilities.h | 2 -- src/libxl/libxl_conf.c | 3 --- src/libxl/libxl_conf.h | 2 -- src/libxl/libxl_domain.c | 1 - src/libxl/libxl_domain.h | 2 -- src/libxl/libxl_driver.c | 3 --- src/libxl/libxl_logger.c | 2 -- src/libxl/libxl_migration.c | 3 --- src/libxl/xen_xl.c | 1 - src/libxl/xen_xl.h | 1 - src/libxl/xen_xm.c | 1 - 12 files changed, 22 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 6c7dfcb15e..c2975d637e 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "domain_conf.h" #include "capabilities.h" #include "domain_capabilities.h" diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index fd2b72620b..6611786dd5 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -22,8 +22,6 @@ #include <libxl.h> -#include "virobject.h" -#include "capabilities.h" #include "domain_capabilities.h" #include "virfirmware.h" diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 401e47344e..aa3d7925ec 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -28,20 +28,17 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "datatypes.h" #include "virconf.h" #include "virfile.h" #include "viridentity.h" #include "virstring.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virsocketaddr.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_conf.h" #include "libxl_utils.h" -#include "virstoragefile.h" #include "virsecret.h" #include "cpu/cpu.h" #include "xen_common.h" diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 16a7195bfd..7087b41079 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -27,11 +27,9 @@ #include "libvirt_internal.h" #include "virdomainobjlist.h" #include "domain_event.h" -#include "capabilities.h" #include "configmake.h" #include "virportallocator.h" #include "virobject.h" -#include "virchrdev.h" #include "virhostdev.h" #include "locking/lock_manager.h" #include "virfirmware.h" diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 49ac09d8a4..17b347de4e 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -32,7 +32,6 @@ #include "virerror.h" #include "virhook.h" #include "virlog.h" -#include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" #include "xen_common.h" diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa15e0352f..5ce4d518a9 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -22,10 +22,8 @@ #include <libxl.h> -#include "domain_conf.h" #include "libxl_conf.h" #include "virchrdev.h" -#include "virenum.h" #include "domain_job.h" diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d4ae875854..f980039165 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -36,7 +36,6 @@ #include "viralloc.h" #include "viruuid.h" #include "virhook.h" -#include "vircommand.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_driver.h" @@ -47,8 +46,6 @@ #include "xen_xl.h" #include "virtypedparam.h" #include "viruri.h" -#include "virstring.h" -#include "virsysinfo.h" #include "viraccessapicheck.h" #include "virhostdev.h" #include "virpidfile.h" diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 45cdc32f38..69565823a0 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -24,10 +24,8 @@ #include "internal.h" #include "libxl_logger.h" #include "util/viralloc.h" -#include "util/virerror.h" #include "util/virfile.h" #include "util/virhash.h" -#include "util/virstring.h" #include "util/virthread.h" #include "util/virtime.h" diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 5bb8747890..0fd2b3206e 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -23,12 +23,10 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "virconf.h" #include "datatypes.h" #include "virfile.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virstring.h" #include "virobject.h" #include "virthread.h" @@ -36,7 +34,6 @@ #include "rpc/virnetsocket.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" -#include "libxl_driver.h" #include "libxl_conf.h" #include "libxl_migration.h" #include "locking/domain_lock.h" diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index eb3b0b3718..e62f591dcd 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -29,7 +29,6 @@ #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" -#include "storage_source.h" #include "storage_source_backingstore.h" #include "xen_xl.h" #include "libxl_capabilities.h" diff --git a/src/libxl/xen_xl.h b/src/libxl/xen_xl.h index c997562956..f8b1ebfde9 100644 --- a/src/libxl/xen_xl.h +++ b/src/libxl/xen_xl.h @@ -23,7 +23,6 @@ #pragma once #include "virconf.h" -#include "domain_conf.h" #include "xen_common.h" virDomainDef *xenParseXL(virConf *conn, diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index a962da9cad..d6213a852d 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -29,7 +29,6 @@ #include "xenxs_private.h" #include "xen_xm.h" #include "domain_conf.h" -#include "virstring.h" #include "xen_common.h" #define VIR_FROM_THIS VIR_FROM_XENXM -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/logging/log_daemon.c | 5 ----- src/logging/log_daemon_config.c | 4 ---- src/logging/log_daemon_dispatch.c | 1 - src/logging/log_handler.c | 1 - src/logging/log_manager.c | 1 - 5 files changed, 12 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8ab334ff6d..91ed119c7f 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -33,15 +33,10 @@ #include "virutil.h" #include "virfile.h" #include "virpidfile.h" -#include "virprocess.h" #include "virerror.h" #include "virlog.h" #include "viralloc.h" -#include "virconf.h" #include "rpc/virnetdaemon.h" -#include "virrandom.h" -#include "virhash.h" -#include "viruuid.h" #include "virstring.h" #include "virgettext.h" #include "virdaemon.h" diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index 84a2946395..4436745488 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -23,12 +23,8 @@ #include "log_daemon_config.h" #include "virconf.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "rpc/virnetserver.h" #include "configmake.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index 7a0a310576..f7448155fc 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -23,7 +23,6 @@ #include "rpc/virnetserver.h" #include "rpc/virnetserverclient.h" #include "virlog.h" -#include "virstring.h" #include "log_daemon.h" #include "log_protocol.h" #include "virerror.h" diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 5c3df37415..bf1e3f35c5 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -25,7 +25,6 @@ #include "virobject.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "virlog.h" #include "virrotatingfile.h" #include "viruuid.h" diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index e605ed9930..6e8e7e9f1a 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -24,7 +24,6 @@ #include "log_protocol.h" #include "viralloc.h" #include "virutil.h" -#include "virstring.h" #include "virerror.h" #include "virfile.h" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/node_device/node_device_driver.c | 3 --- src/node_device/node_device_udev.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 4b31cd5695..0178ae8b66 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -32,14 +32,11 @@ #include "viralloc.h" #include "virfile.h" #include "virjson.h" -#include "virstring.h" #include "node_device_conf.h" #include "node_device_event.h" #include "node_device_driver.h" -#include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" -#include "virnetdev.h" #include "virutil.h" #include "vircommand.h" #include "virlog.h" diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 44ec22cf75..3d69bdedae 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -30,11 +30,9 @@ #include "node_device_udev.h" #include "virerror.h" #include "driver.h" -#include "datatypes.h" #include "virlog.h" #include "viralloc.h" #include "viruuid.h" -#include "virbuffer.h" #include "virfile.h" #include "virccw.h" #include "virpci.h" @@ -43,7 +41,6 @@ #include "virnetdev.h" #include "virmdev.h" #include "virutil.h" -#include "virpcivpd.h" #include "configmake.h" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/qemu/qemu_agent.c | 2 -- src/qemu/qemu_alias.c | 1 - src/qemu/qemu_alias.h | 2 -- src/qemu/qemu_backup.c | 5 ----- src/qemu/qemu_block.c | 1 - src/qemu/qemu_block.h | 1 - src/qemu/qemu_blockjob.c | 2 -- src/qemu/qemu_capabilities.c | 6 ------ src/qemu/qemu_capabilities.h | 2 -- src/qemu/qemu_cgroup.c | 7 ------- src/qemu/qemu_cgroup.h | 2 -- src/qemu/qemu_checkpoint.c | 3 --- src/qemu/qemu_checkpoint.h | 1 - src/qemu/qemu_command.c | 7 ------- src/qemu/qemu_command.h | 4 ---- src/qemu/qemu_conf.c | 5 ----- src/qemu/qemu_conf.h | 7 ------- src/qemu/qemu_dbus.c | 3 --- src/qemu/qemu_domain.c | 6 ------ src/qemu/qemu_domain.h | 3 --- src/qemu/qemu_domain_address.h | 2 -- src/qemu/qemu_driver.c | 10 ---------- src/qemu/qemu_extdevice.c | 5 ----- src/qemu/qemu_firmware.c | 1 - src/qemu/qemu_hostdev.c | 5 ----- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 4 ---- src/qemu/qemu_hotplug.h | 1 - src/qemu/qemu_interface.c | 1 - src/qemu/qemu_interface.h | 1 - src/qemu/qemu_interop_config.c | 3 --- src/qemu/qemu_migration.c | 5 ----- src/qemu/qemu_migration_cookie.c | 1 - src/qemu/qemu_migration_cookie.h | 1 - src/qemu/qemu_migration_params.c | 2 -- src/qemu/qemu_migration_params.h | 2 -- src/qemu/qemu_monitor.c | 2 -- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 4 ---- src/qemu/qemu_monitor_json.h | 1 - src/qemu/qemu_monitor_text.c | 2 -- src/qemu/qemu_namespace.c | 1 - src/qemu/qemu_namespace.h | 1 - src/qemu/qemu_process.c | 2 -- src/qemu/qemu_process.h | 1 - src/qemu/qemu_qapi.c | 2 -- src/qemu/qemu_saveimage.c | 2 -- src/qemu/qemu_saveimage.h | 2 -- src/qemu/qemu_security.h | 2 -- src/qemu/qemu_shim.c | 1 - src/qemu/qemu_slirp.c | 3 --- src/qemu/qemu_snapshot.c | 4 ---- src/qemu/qemu_snapshot.h | 1 - src/qemu/qemu_tpm.c | 5 ----- src/qemu/qemu_validate.h | 1 - src/qemu/qemu_vhost_user.c | 1 - src/qemu/qemu_vhost_user.h | 2 -- src/qemu/qemu_vhost_user_gpu.c | 3 --- src/qemu/qemu_vhost_user_gpu.h | 1 - 59 files changed, 161 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index f57a8d5f25..05fbfe9145 100644 --- 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 8c2f055604..7efd91051e 100644 --- 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 8fc27f4696..1a583b8207 100644 --- 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 427c090dd8..d2a5d2db5f 100644 --- 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 877c66d62b..9fe22f18f2 100644 --- 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 8eafb8482a..8641c8a2d2 100644 --- 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 8c2205118f..ed82ac5dc2 100644 --- 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 d0c8217825..e78390fb96 100644 --- 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 26cd655db3..9c368af2ad 100644 --- 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 aa0c927578..6e26d965c5 100644 --- 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 f09134947f..3668034cde 100644 --- 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 a933230335..933ea41023 100644 --- 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 351995a31d..fc1c35cdd2 100644 --- 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 4f4d8cf25c..c807ed6391 100644 --- 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 2bb4984656..f8e9d71e81 100644 --- 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 c22cf79cbe..3b75cdeb95 100644 --- 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 5e752d075e..c40c452f58 100644 --- 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 2ed8f8640d..cb2694795e 100644 --- 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 941cf7e0e4..f271d18de9 100644 --- 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 153dfe3a23..f27b1fad3f 100644 --- 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 4c360a0f70..dbb5de915e 100644 --- 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 ee1adb0300..65e41460fb 100644 --- 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 87463e74bf..b8e3c1000a 100644 --- 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 51223faadf..25852aff36 100644 --- 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 8af22bdd58..45cd1066f0 100644 --- 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 09006851b1..2d484db878 100644 --- 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 f795568299..ee44649d48 100644 --- 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 a0a9ae47e2..2b1e8085a4 100644 --- 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 ba03277025..cf8117d996 100644 --- 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 e359d4f520..d7ac6e6fc9 100644 --- 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 24db722c0b..cdc710804f 100644 --- 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 849c25b168..6e5b3839fb 100644 --- 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 52ed2c518b..0738ad430f 100644 --- 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 d9e1d949a8..2f0cdcf7b6 100644 --- 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 95fd773645..4e83d8d8bd 100644 --- 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 a0909b9f3d..f2f0090343 100644 --- 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 37bcbde31e..e310c3e013 100644 --- 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 91f2d0941c..584176e187 100644 --- 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 8b81a07429..cc4dd1308f 100644 --- 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 3b55e380b3..ad3853ae69 100644 --- 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 86af1e4975..65785f1dae 100644 --- 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 23681b14a4..5df550366d 100644 --- 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 020aca13d8..fbea865c70 100644 --- 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 e53f7c9c79..0ce91ebb64 100644 --- 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 8641534be4..0fddae0bbb 100644 --- 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 426db8d30d..500d3c50b3 100644 --- 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 4fd4c5cfcd..79567bf17d 100644 --- 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 391cd55ed0..30cf4b1ee0 100644 --- 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 eaf646f225..e01d4699e6 100644 --- 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 a06869a406..7b58583074 100644 --- 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 772ea582c5..c802ef7fa8 100644 --- 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 c6beeda1d0..833f880252 100644 --- 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 0cc38c0039..f69c05f68c 100644 --- 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 086780edcd..03829775b8 100644 --- 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 1e0546633c..e06a43b8e3 100644 --- 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 75cc718c09..7539afd50a 100644 --- 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 f4ae1839d1..d1aa6ca189 100644 --- 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 6f601cebde..7c5be4098e 100644 --- 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 0d50dd2464..2b86982cb8 100644 --- 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" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/rpc/virkeepalive.c | 3 --- src/rpc/virnetclient.c | 1 - src/rpc/virnetclient.h | 1 - src/rpc/virnetclientprogram.h | 1 - src/rpc/virnetclientstream.c | 1 - src/rpc/virnetclientstream.h | 1 - src/rpc/virnetdaemon.c | 2 -- src/rpc/virnetdaemon.h | 3 --- src/rpc/virnetmessage.c | 1 - src/rpc/virnetsaslcontext.c | 3 --- src/rpc/virnetserver.c | 1 - src/rpc/virnetserver.h | 1 - src/rpc/virnetserverclient.c | 1 - src/rpc/virnetserverprogram.h | 1 - src/rpc/virnetserverservice.h | 1 - src/rpc/virnetsocket.c | 1 - src/rpc/virnetsshsession.c | 1 - 17 files changed, 24 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 52decf5a5f..b7ee6fb169 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -20,12 +20,9 @@ #include <config.h> -#include "viralloc.h" #include "virthread.h" -#include "virfile.h" #include "virlog.h" #include "virerror.h" -#include "virnetsocket.h" #include "virkeepaliveprotocol.h" #include "virkeepalive.h" #include "virprobe.h" diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2998551cd8..3f79c03a58 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -34,7 +34,6 @@ #include "virutil.h" #include "virerror.h" #include "virprobe.h" -#include "virstring.h" #include "vireventglibwatch.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 5048033325..1647a6cc71 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -27,7 +27,6 @@ #endif #include "virnetclientprogram.h" #include "virnetclientstream.h" -#include "virobject.h" #include "viruri.h" typedef enum { diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h index 8cd8d4f2c8..54f6278a30 100644 --- a/src/rpc/virnetclientprogram.h +++ b/src/rpc/virnetclientprogram.h @@ -24,7 +24,6 @@ #include <rpc/xdr.h> #include "virnetmessage.h" -#include "virobject.h" typedef struct _virNetClient virNetClient; diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index e8e8ca2af2..a03f67e542 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -22,7 +22,6 @@ #include "virnetclientstream.h" #include "virnetclient.h" -#include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "virthread.h" diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h index 7428843f9b..7363969424 100644 --- a/src/rpc/virnetclientstream.h +++ b/src/rpc/virnetclientstream.h @@ -21,7 +21,6 @@ #pragma once #include "virnetclientprogram.h" -#include "virobject.h" typedef struct _virNetClientStream virNetClientStream; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 1f32bae35f..3c4adb2ca2 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -28,13 +28,11 @@ #include "viralloc.h" #include "virerror.h" #include "virthread.h" -#include "virthreadpool.h" #include "virutil.h" #include "virfile.h" #include "virnetserver.h" #include "virgdbus.h" #include "virhash.h" -#include "virstring.h" #include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h index f91b59a4fd..d588f86799 100644 --- a/src/rpc/virnetdaemon.h +++ b/src/rpc/virnetdaemon.h @@ -22,12 +22,9 @@ #include <signal.h> -#include "virnettlscontext.h" -#include "virobject.h" #include "virjson.h" #include "virnetserverprogram.h" #include "virnetserverclient.h" -#include "virnetserverservice.h" #include "virnetserver.h" virNetDaemon *virNetDaemonNew(void); diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index d78438bd95..d298d30d57 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -28,7 +28,6 @@ #include "virlog.h" #include "virfile.h" #include "virutil.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index ede434ed4a..dbf777cfa3 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -21,13 +21,10 @@ #include <config.h> #include "virnetsaslcontext.h" -#include "virnetmessage.h" #include "virerror.h" -#include "viralloc.h" #include "virthread.h" #include "virlog.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 371b72c8d6..17ab61b882 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virthread.h" #include "virthreadpool.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 371f2d07cf..9f0cf3a3fc 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,7 +25,6 @@ #include "virnetserverprogram.h" #include "virnetserverclient.h" #include "virnetserverservice.h" -#include "virobject.h" #include "virjson.h" #include "virsystemd.h" diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index da9956f2b4..bb70856351 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -35,7 +35,6 @@ #include "virthread.h" #include "virkeepalive.h" #include "virprobe.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h index 218287f12f..cb7c67902c 100644 --- a/src/rpc/virnetserverprogram.h +++ b/src/rpc/virnetserverprogram.h @@ -23,7 +23,6 @@ #include "virnetmessage.h" #include "virnetserverclient.h" -#include "virobject.h" typedef struct _virNetDaemon virNetDaemon; diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index f3d55a9cc0..d2049556f9 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -22,7 +22,6 @@ #pragma once #include "virnetserverprogram.h" -#include "virobject.h" typedef enum { VIR_NET_SERVER_SERVICE_AUTH_NONE = 0, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 1af2778b97..32f506d2d4 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -45,7 +45,6 @@ #include "virlog.h" #include "virfile.h" #include "virthread.h" -#include "virpidfile.h" #include "virprobe.h" #include "virprocess.h" #include "virstring.h" diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index f2862979c9..485318d09b 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -32,7 +32,6 @@ #include "virerror.h" #include "virfile.h" #include "virobject.h" -#include "virstring.h" #include "virauth.h" #define VIR_FROM_THIS VIR_FROM_SSH -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/util/iohelper.c | 3 --- src/util/virarptable.c | 2 -- src/util/virauth.c | 1 - src/util/virauthconfig.c | 1 - src/util/virbpf.c | 1 - src/util/virbuffer.c | 2 -- src/util/vircgroup.c | 3 --- src/util/vircgroupv2devices.c | 1 - src/util/virconf.c | 1 - src/util/vircrypto.c | 2 -- src/util/virdnsmasq.c | 2 -- src/util/virebtables.c | 3 --- src/util/virenum.c | 1 - src/util/virerror.c | 1 - src/util/vireventglib.c | 1 - src/util/virfcp.c | 2 -- src/util/virfdstream.c | 1 - src/util/virfilecache.c | 2 -- src/util/virfirewall.c | 1 - src/util/virfirmware.c | 1 - src/util/virhook.c | 2 -- src/util/virhostcpu.c | 2 -- src/util/virhostmem.c | 2 -- src/util/virhostuptime.c | 1 - src/util/viridentity.c | 3 --- src/util/virinitctl.c | 3 --- src/util/viriptables.c | 6 ------ src/util/viriscsi.c | 2 -- src/util/virjson.c | 1 - src/util/virkmod.c | 1 - src/util/virlease.c | 2 -- src/util/virlockspace.c | 1 - src/util/virmacaddr.c | 1 - src/util/virmacmap.c | 2 -- src/util/virnetdevbandwidth.c | 1 - src/util/virnetdevbridge.c | 2 -- src/util/virnetdevmacvlan.c | 2 -- src/util/virnetdevmacvlan.h | 2 -- src/util/virnetdevmidonet.c | 1 - src/util/virnetdevtap.c | 1 - src/util/virnetdevveth.c | 2 -- src/util/virnetdevvlan.c | 1 - src/util/virnetlink.c | 1 - src/util/virnvme.c | 1 - src/util/virobject.c | 2 -- src/util/virpci.c | 1 - src/util/virpcivpd.c | 1 - src/util/virperf.c | 2 -- src/util/virpidfile.c | 1 - src/util/virpolkit.c | 2 -- src/util/virportallocator.c | 3 --- src/util/virqemu.c | 2 -- src/util/virrandom.c | 3 --- src/util/virresctrl.h | 1 - src/util/virrotatingfile.c | 1 - src/util/virscsivhost.c | 1 - src/util/virseclabel.c | 2 -- src/util/virsecret.c | 1 - src/util/virsocketaddr.c | 2 -- src/util/virstoragefile.c | 4 ---- src/util/virtpm.c | 1 - src/util/virutil.c | 2 -- src/util/viruuid.c | 3 --- 63 files changed, 110 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 055540c8c4..dd77bda723 100644 --- a/src/util/iohelper.c +++ b/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" diff --git a/src/util/virarptable.c b/src/util/virarptable.c index 3b9ece3d9b..7f9fefc160 100644 --- a/src/util/virarptable.c +++ b/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 diff --git a/src/util/virauth.c b/src/util/virauth.c index e7fe8c97dd..b9c2ae3ed1 100644 --- a/src/util/virauth.c +++ b/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 diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 63d9cebdf7..dabd7cd217 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -24,7 +24,6 @@ #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "viralloc.h" struct _virAuthConfig { diff --git a/src/util/virbpf.c b/src/util/virbpf.c index df4f333614..1169b99d07 100644 --- a/src/util/virbpf.c +++ b/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"); diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 19cf775a8c..01d04cc4f9 100644 --- a/src/util/virbuffer.c +++ b/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 diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5cfc20f1ed..9918430cca 100644 --- a/src/util/vircgroup.c +++ b/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"); diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index ffa65bdd00..1769c499c8 100644 --- a/src/util/vircgroupv2devices.c +++ b/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" diff --git a/src/util/virconf.c b/src/util/virconf.c index 0d0c04a824..8a96805642 100644 --- a/src/util/virconf.c +++ b/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 diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 23692d22fb..828e822d8e 100644 --- a/src/util/vircrypto.c +++ b/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> diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..342b489ab7 100644 --- a/src/util/virdnsmasq.c +++ b/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" diff --git a/src/util/virebtables.c b/src/util/virebtables.c index e296cf2578..a1f5f7cf1e 100644 --- a/src/util/virebtables.c +++ b/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 diff --git a/src/util/virenum.c b/src/util/virenum.c index 103f00b524..c6936e58ff 100644 --- a/src/util/virenum.c +++ b/src/util/virenum.c @@ -18,7 +18,6 @@ #include <config.h> #include "virenum.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virerror.c b/src/util/virerror.c index 5c8b9ebeb5..d114c0a346 100644 --- a/src/util/virerror.c +++ b/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 diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index fc04d8f712..b01ddb814e 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -27,7 +27,6 @@ #include "vireventglib.h" #include "vireventglibwatch.h" -#include "virerror.h" #include "virlog.h" #include "virprobe.h" diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 5e8fe72fec..bb62fa9025 100644 --- a/src/util/virfcp.c +++ b/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" diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index b596659702..3de0d59a8b 100644 --- a/src/util/virfdstream.c +++ b/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 diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index cfcfc26e19..c4bc984020 100644 --- a/src/util/virfilecache.c +++ b/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> diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 31a8352d4e..3183e0aec7 100644 --- a/src/util/virfirewall.c +++ b/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" diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index b2e3491544..9b333cf04b 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -20,7 +20,6 @@ #include <config.h> -#include "viralloc.h" #include "virerror.h" #include "virfirmware.h" #include "virlog.h" diff --git a/src/util/virhook.c b/src/util/virhook.c index b52e2cd814..871bfcc670 100644 --- a/src/util/virhook.c +++ b/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" diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index e3f2d6d4b7..639dd9b51e 100644 --- a/src/util/virhostcpu.c +++ b/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 diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 5984dfab3f..052f7cd935 100644 --- a/src/util/virhostmem.c +++ b/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" diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 7508a5a9b6..3d41fa081d 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -25,7 +25,6 @@ #endif #include "virhostuptime.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" #include "virstring.h" diff --git a/src/util/viridentity.c b/src/util/viridentity.c index e3a9cbb661..46dcf3a04e 100644 --- a/src/util/viridentity.c +++ b/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" diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index d7e29f24c3..1b9f2ad022 100644 --- a/src/util/virinitctl.c +++ b/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 diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 7db09a0d80..e9886a200e 100644 --- a/src/util/viriptables.c +++ b/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"); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index e84d49b03c..fbf84c9305 100644 --- a/src/util/viriscsi.c +++ b/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 diff --git a/src/util/virjson.c b/src/util/virjson.c index ae970c7653..53f8cdff95 100644 --- a/src/util/virjson.c +++ b/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" diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 6a996ebb04..4c709f8659 100644 --- a/src/util/virkmod.c +++ b/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) diff --git a/src/util/virlease.c b/src/util/virlease.c index 48b0f6fe57..357bacd83d 100644 --- a/src/util/virlease.c +++ b/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 diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 79925053bf..d54162b3d7 100644 --- a/src/util/virlockspace.c +++ b/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> diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 6b22384cee..073f298b5b 100644 --- a/src/util/virmacaddr.c +++ b/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 }; diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index cf554205a8..98be64fb31 100644 --- a/src/util/virmacmap.c +++ b/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 diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 2895be8d27..d816bcbf06 100644 --- a/src/util/virnetdevbandwidth.c +++ b/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 diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index a9667b48ce..f1a1c7f509 100644 --- a/src/util/virnetdevbridge.c +++ b/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> diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 1985d1028a..94968a8b4d 100644 --- a/src/util/virnetdevmacvlan.c +++ b/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 diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 0a013fc242..405e48088f 100644 --- a/src/util/virnetdevmacvlan.h +++ b/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" diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 72b2fd4467..202808ef0f 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -20,7 +20,6 @@ #include "virnetdevmidonet.h" #include "vircommand.h" -#include "viralloc.h" #include "virerror.h" #include "viruuid.h" diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cdaf67a72e..112a1e8b99 100644 --- a/src/util/virnetdevtap.c +++ b/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> diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index b580e105ac..ad1f517039 100644 --- a/src/util/virnetdevveth.c +++ b/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" diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 64fbacd4f8..67daa5d3b4 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -19,7 +19,6 @@ #include <config.h> #include "internal.h" -#include "virerror.h" #include "virnetdevvlan.h" #include "viralloc.h" diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index c6b015d7a9..98f75652e9 100644 --- a/src/util/virnetlink.c +++ b/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 diff --git a/src/util/virnvme.c b/src/util/virnvme.c index 3ce02b5000..d0f0c04aba 100644 --- a/src/util/virnvme.c +++ b/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 diff --git a/src/util/virobject.c b/src/util/virobject.c index 74cc84205e..d1cd4d32f1 100644 --- a/src/util/virobject.c +++ b/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 diff --git a/src/util/virpci.c b/src/util/virpci.c index d141fde814..03d1d7b074 100644 --- a/src/util/virpci.c +++ b/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" diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 9af0566d19..4ba4fea237 100644 --- a/src/util/virpcivpd.c +++ b/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 diff --git a/src/util/virperf.c b/src/util/virperf.c index fde8ca7e34..434d1d99c4 100644 --- a/src/util/virperf.c +++ b/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"); diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 9d194f7336..bfd967c1af 100644 --- a/src/util/virpidfile.c +++ b/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" diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 8970de192f..6c83eaf412 100644 --- a/src/util/virpolkit.c +++ b/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" diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 97ab362749..87835a3ed7 100644 --- a/src/util/virportallocator.c +++ b/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 diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 8ff61b22b0..9dc0eab386 100644 --- a/src/util/virqemu.c +++ b/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 diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c3f3aa1fa6..e23ddf8e1d 100644 --- a/src/util/virrandom.c +++ b/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 diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 5d7b23c3c4..0e4b535f9e 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -21,7 +21,6 @@ #include "internal.h" #include "virobject.h" -#include "virbitmap.h" #include "virenum.h" typedef enum { diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 4e6fa382a8..d339e58e1c 100644 --- a/src/util/virrotatingfile.c +++ b/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" diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 487301ab64..1ea6a1ee2a 100644 --- a/src/util/virscsivhost.c +++ b/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 diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index 907e154d14..d7e4834d5f 100644 --- a/src/util/virseclabel.c +++ b/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 diff --git a/src/util/virsecret.c b/src/util/virsecret.c index 604d900f77..c01f3fb967 100644 --- a/src/util/virsecret.c +++ b/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 diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 430e43f2eb..0480485ab7 100644 --- a/src/util/virsocketaddr.c +++ b/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 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e3ec64486e..873da65d42 100644 --- a/src/util/virstoragefile.c +++ b/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 diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 65126f8160..b898f3a6db 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -22,7 +22,6 @@ #include <sys/stat.h> -#include "virstring.h" #include "virerror.h" #include "viralloc.h" #include "virfile.h" diff --git a/src/util/virutil.c b/src/util/virutil.c index 176e2f8f59..7e246d22d1 100644 --- a/src/util/virutil.c +++ b/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" diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 558fbb9c0d..ca22c91d48 100644 --- a/src/util/viruuid.c +++ b/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" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/vmware/vmware_conf.c | 1 - src/vmware/vmware_driver.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..80a85f4d0f 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -26,7 +26,6 @@ #include "cpu/cpu.h" #include "viralloc.h" #include "virfile.h" -#include "viruuid.h" #include "virerror.h" #include "vmx.h" #include "vmware_conf.h" diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index da66f98db0..2a18d73988 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -34,7 +34,6 @@ #include "vmx.h" #include "vmware_conf.h" #include "vmware_driver.h" -#include "virstring.h" /* Various places we may find the "vmrun" binary, * without a leading / it will be searched in PATH -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- src/test/test_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a824ef0186..24ff6e8967 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -31,7 +31,6 @@ #include "virerror.h" #include "datatypes.h" #include "test_driver.h" -#include "virbuffer.h" #include "viruuid.h" #include "capabilities.h" #include "configmake.h" @@ -56,7 +55,6 @@ #include "virlog.h" #include "virfile.h" #include "virtypedparam.h" -#include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" #include "virauth.h" -- 2.36.1

Signed-off-by: Peng Liang <tcx4c70@gmail.com> --- tests/commandtest.c | 2 -- tests/cputest.c | 2 -- tests/domainconftest.c | 2 -- tests/esxutilstest.c | 1 - tests/eventtest.c | 2 -- tests/fchosttest.c | 1 - tests/fdstreamtest.c | 3 --- tests/genericxml2xmltest.c | 1 - tests/interfacexml2xmltest.c | 2 -- tests/libxlmock.c | 2 -- tests/libxlxml2domconfigtest.c | 5 ----- tests/lxcxml2xmltest.c | 1 - tests/networkxml2conftest.c | 2 -- tests/networkxml2firewalltest.c | 2 -- tests/networkxml2xmltest.c | 2 -- tests/networkxml2xmlupdatetest.c | 2 -- tests/nodedevmdevctltest.c | 1 - tests/nodedevxml2xmltest.c | 2 -- tests/nssmock.c | 2 -- tests/nsstest.c | 1 - tests/nwfilterebiptablestest.c | 1 - tests/nwfilterxml2firewalltest.c | 1 - tests/nwfilterxml2xmltest.c | 5 ----- tests/objecteventtest.c | 3 --- tests/openvzutilstest.c | 2 -- tests/qemuagenttest.c | 2 -- tests/qemublocktest.c | 4 ---- tests/qemucapsprobemock.c | 1 - tests/qemucommandutiltest.c | 1 - tests/qemucpumock.c | 1 - tests/qemudomaincheckpointxml2xmltest.c | 2 -- tests/qemudomainsnapshotxml2xmltest.c | 2 -- tests/qemuhotplugmock.c | 1 - tests/qemuhotplugtest.c | 3 --- tests/qemumemlocktest.c | 2 -- tests/qemumigparamstest.c | 1 - tests/qemumonitorjsontest.c | 2 -- tests/qemumonitortestutils.c | 2 -- tests/qemumonitortestutils.h | 1 - tests/qemusecuritymock.c | 2 -- tests/qemuxml2argvmock.c | 6 ------ tests/qemuxml2argvtest.c | 8 -------- tests/qemuxml2xmltest.c | 3 --- tests/scsihosttest.c | 2 -- tests/seclabeltest.c | 1 - tests/securityselinuxhelper.c | 1 - tests/securityselinuxlabeltest.c | 2 -- tests/securityselinuxtest.c | 3 --- tests/sockettest.c | 1 - tests/storagebackendsheepdogtest.c | 1 - tests/storagepoolxml2argvtest.c | 3 --- tests/storagepoolxml2xmltest.c | 2 -- tests/storagevolxml2argvtest.c | 3 --- tests/storagevolxml2xmltest.c | 2 -- tests/sysinfotest.c | 1 - tests/testutils.c | 4 ---- tests/testutils.h | 1 - tests/testutilslxc.c | 1 - tests/testutilslxc.h | 2 -- tests/testutilsqemu.c | 1 - tests/utiltest.c | 1 - tests/virauthconfigtest.c | 2 -- tests/virbuftest.c | 2 -- tests/vircaps2xmltest.c | 1 - tests/vircgroupmock.c | 2 -- tests/vircgrouptest.c | 1 - tests/virconftest.c | 1 - tests/virdriverconnvalidatetest.c | 2 -- tests/virdrivermoduletest.c | 2 -- tests/virfilemock.c | 2 -- tests/virfiletest.c | 1 - tests/virfilewrapper.c | 2 -- tests/virfirewalltest.c | 1 - tests/virhostcputest.c | 1 - tests/viridentitytest.c | 4 ---- tests/virkeycodetest.c | 4 ---- tests/virkmodtest.c | 1 - tests/virlockspacetest.c | 2 -- tests/virmigtest.c | 1 - tests/virmockstathelpers.c | 1 - tests/virnetdevmock.c | 1 - tests/virnetdevtest.c | 2 -- tests/virnetmessagetest.c | 2 -- tests/virnetsockettest.c | 1 - tests/virnettlscontexttest.c | 5 ----- tests/virnettlssessiontest.c | 4 ---- tests/virnetworkportxml2xmltest.c | 1 - tests/virnumamock.c | 3 --- tests/virnwfilterbindingxml2xmltest.c | 3 --- tests/virpcimock.c | 1 - tests/virportallocatortest.c | 3 --- tests/virrandommock.c | 1 - tests/virschematest.c | 2 -- tests/virshtest.c | 2 -- tests/virstoragetest.c | 3 --- tests/virstorageutiltest.c | 3 --- tests/virstringtest.c | 3 --- tests/virtestmock.c | 2 -- tests/virtimetest.c | 2 -- tests/viruritest.c | 1 - tests/virusbmock.c | 3 --- tests/virusbtest.c | 2 -- tests/vmx2xmltest.c | 2 -- tests/vshtabletest.c | 1 - tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 2 -- tests/xml2vmxtest.c | 1 - 107 files changed, 216 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 74e60a072b..95d1bfa91b 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -35,8 +35,6 @@ #include "virfile.h" #include "virpidfile.h" #include "virerror.h" -#include "virthread.h" -#include "virstring.h" #include "virprocess.h" #include "virutil.h" diff --git a/tests/cputest.c b/tests/cputest.c index ddf05b779b..b7ec79dfc6 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -33,8 +33,6 @@ #include "cpu_conf.h" #include "cpu/cpu.h" #include "cpu/cpu_x86.h" -#include "cpu/cpu_map.h" -#include "virstring.h" #if WITH_QEMU # include "testutilsqemu.h" diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 14d84b0071..b483e1221a 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -19,8 +19,6 @@ #include <config.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "domain_conf.h" diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index db49dcd6e0..4591cf49db 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -7,7 +7,6 @@ # include <unistd.h> # include "internal.h" -# include "viralloc.h" # include "vmx/vmx.h" # include "esx/esx_util.h" # include "esx/esx_vi_types.h" diff --git a/tests/eventtest.c b/tests/eventtest.c index 1e93c70e74..470de4c630 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -31,10 +31,8 @@ #include "testutils.h" #include "internal.h" #include "virfile.h" -#include "virthread.h" #include "virlog.h" #include "virutil.h" -#include "virevent.h" VIR_LOG_INIT("tests.eventtest"); diff --git a/tests/fchosttest.c b/tests/fchosttest.c index dc1503e9a7..d050458a58 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -20,7 +20,6 @@ #include <config.h> #include "virlog.h" -#include "virstring.h" #include "virvhba.h" #include "testutils.h" diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 96519e91c2..5e6b347949 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -24,10 +24,7 @@ #include "virfdstream.h" #include "datatypes.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virfile.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 87014e3e53..b83367cb4b 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -7,7 +7,6 @@ #include "testutils.h" #include "internal.h" -#include "virstring.h" #include "conf/backup_conf.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 15fab88107..b23e0f589b 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "interface_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/libxlmock.c b/tests/libxlmock.c index a52d4bc2ed..0e4bf7df52 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -28,8 +28,6 @@ # include <xenstore.h> # include <xenctrl.h> -# include "virfile.h" -# include "virsocket.h" # include "libxl/libxl_capabilities.h" VIR_MOCK_IMPL_RET_VOID(xs_daemon_open, diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 015597eb44..a7080e0fa2 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -31,12 +31,7 @@ #if defined(WITH_LIBXL) && defined(WITH_YAJL) # include "internal.h" -# include "viralloc.h" # include "libxl/libxl_conf.h" -# include "datatypes.h" -# include "virstring.h" -# include "virmock.h" -# include "virjson.h" # include "testutilsxen.h" # define VIR_FROM_THIS VIR_FROM_LIBXL diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 8ab32acf42..2c5d294f18 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -12,7 +12,6 @@ # include "internal.h" # include "lxc/lxc_conf.h" # include "testutilslxc.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index a062ff9c3c..bbeb849a39 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -8,10 +8,8 @@ #include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "vircommand.h" #include "viralloc.h" #include "network/bridge_driver.h" -#include "virstring.h" #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 11be85e06f..2648115a12 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -22,7 +22,6 @@ #include <config.h> #include "testutils.h" -#include "viralloc.h" #if defined (__linux__) @@ -31,7 +30,6 @@ # include "network/bridge_driver_platform.h" # include "virbuffer.h" # include "virmock.h" -# include "virfirewall.h" # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 9e8d675a10..5f39162ef1 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index 4471b4dd9e..c50c6c8558 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index d660d4cc21..dee4639922 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -2,7 +2,6 @@ #include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "node_device/node_device_driver.h" #include "vircommand.h" #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index ad9562cc82..f82027fb87 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "node_device_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/nssmock.c b/tests/nssmock.c index b1c1aba957..9ead6d8f97 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -27,8 +27,6 @@ # include <unistd.h> # include "configmake.h" -# include "virstring.h" -# include "viralloc.h" static int (*real_open)(const char *path, int flags, ...); static DIR * (*real_opendir)(const char *name); diff --git a/tests/nsstest.c b/tests/nsstest.c index a03f230452..615b063118 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -23,7 +23,6 @@ #ifdef WITH_NSS # include "libvirt_nss.h" -# include "virsocket.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 35c1c772ae..f76f13fd25 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -24,7 +24,6 @@ #include "testutils.h" #include "nwfilter/nwfilter_ebiptables_driver.h" #include "virbuffer.h" -#include "virfirewall.h" #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index ec37a4ae11..1514002b8f 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -26,7 +26,6 @@ # include "testutils.h" # include "nwfilter/nwfilter_ebiptables_driver.h" # include "virbuffer.h" -# include "virfirewall.h" # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 7a7e05965b..c2b6dc575b 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -7,12 +7,7 @@ #include "internal.h" #include "testutils.h" -#include "virxml.h" -#include "virthread.h" -#include "nwfilter_params.h" #include "nwfilter_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 5f63f6f5cb..7110f54139 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -23,9 +23,6 @@ #include "testutils.h" -#include "virerror.h" -#include "virxml.h" - #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 7e6c0b60bb..77e086e390 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -7,9 +7,7 @@ # include <unistd.h> # include "internal.h" -# include "viralloc.h" # include "openvz/openvz_conf.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_OPENVZ diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index b23177385c..dd2d4984e2 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -24,9 +24,7 @@ #include "qemumonitortestutils.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_agent.h" -#include "virthread.h" #include "virerror.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 6329096a68..57116c930b 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -21,8 +21,6 @@ #include "testutils.h" #include "testutilsqemu.h" #include "testutilsqemuschema.h" -#include "virstoragefile.h" -#include "virstring.h" #include "virlog.h" #include "qemu/qemu_block.h" #include "qemu/qemu_qapi.h" @@ -31,8 +29,6 @@ #include "qemu/qemu_checkpoint.h" #include "qemu/qemu_validate.h" -#include "qemu/qemu_command.h" - #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW #include "conf/snapshot_conf_priv.h" diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 2717ed5d84..0263b0ad01 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -20,7 +20,6 @@ #include <dlfcn.h> #include "internal.h" -#include "viralloc.h" #include "virjson.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_monitor_json.h" diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index ae86ef9ea0..f92fb8f177 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -22,7 +22,6 @@ #include "util/virjson.h" #include "util/virqemu.h" #include "testutils.h" -#include "testutilsqemu.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index e84a0294d4..5a63308347 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -18,7 +18,6 @@ #include "conf/cpu_conf.h" -#include "cpu/cpu.h" #include "qemu/qemu_capabilities.h" #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu/qemu_capspriv.h" diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 25613c8452..d49dcd9143 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -14,10 +14,8 @@ # include "internal.h" # include "qemu/qemu_conf.h" -# include "qemu/qemu_domain.h" # include "checkpoint_conf.h" # include "testutilsqemu.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index 3fa932e755..2f66839ae8 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -11,9 +11,7 @@ # include "internal.h" # include "qemu/qemu_conf.h" -# include "qemu/qemu_domain.h" # include "testutilsqemu.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index d618ff9d06..89d287945a 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -24,7 +24,6 @@ #include "testutilsqemu.h" #include "conf/domain_conf.h" #include "virdevmapper.h" -#include "virutil.h" #include "virmock.h" #include <fcntl.h> diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 21123b88ed..e98d9845e8 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -27,9 +27,6 @@ #include "testutilsqemu.h" #include "testutilsqemuschema.h" #include "virhostdev.h" -#include "virerror.h" -#include "virstring.h" -#include "virthread.h" #include "virfile.h" #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 86057e9a3a..b303f70e9d 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -9,9 +9,7 @@ #ifdef WITH_QEMU -# include "datatypes.h" # include "internal.h" -# include "virstring.h" # include "conf/domain_conf.h" # include "qemu/qemu_domain.h" diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index ae59ff6757..bcdee5f32b 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -22,7 +22,6 @@ #include "virjson.h" #include "virbuffer.h" #include "virxml.h" -#include "virhash.h" #include "testutils.h" #include "testutilsqemu.h" #include "tests/testutilsqemuschema.h" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 1019661aa1..ca1b8c3000 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -28,9 +28,7 @@ #include "qemu/qemu_monitor_json.h" #include "qemu/qemu_qapi.h" #include "qemu/qemu_alias.h" -#include "virthread.h" #include "virerror.h" -#include "virstring.h" #include "cpu/cpu.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_migration_params.h" diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index ddd7d91b13..a5d716deee 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -30,12 +30,10 @@ #include "qemu/qemu_processpriv.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" -#include "qemu/qemu_qapi.h" #include "rpc/virnetsocket.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "vireventthread.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 935f9d1e1a..ffcb32a5cc 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -19,7 +19,6 @@ #pragma once -#include "domain_conf.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 03c818d8a3..a6f9d6b917 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -33,8 +33,6 @@ #include "virfile.h" #include "virthread.h" #include "virhash.h" -#include "virstring.h" -#include "viralloc.h" #include "qemusecuritytest.h" #include "security/security_manager.h" #include "virhostuptime.h" diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index bb14f775f3..85bd76c315 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -23,25 +23,19 @@ #include "internal.h" #include "viralloc.h" #include "vircommand.h" -#include "vircrypto.h" #include "viridentitypriv.h" #include "virmock.h" -#include "virlog.h" #include "virnetdev.h" #include "virnetdevbandwidth.h" #include "virnetdevip.h" #include "virnetdevtap.h" #include "virnetdevopenvswitch.h" #include "virnuma.h" -#include "virrandom.h" -#include "virscsi.h" #include "virscsivhost.h" -#include "virstring.h" #include "virtpm.h" #include "virutil.h" #include "qemu/qemu_interface.h" #include "qemu/qemu_command.h" -#include <time.h> #include <unistd.h> #include <fcntl.h> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bffe7aef8a..9db2a543e8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -12,24 +12,16 @@ # include "internal.h" # include "viralloc.h" # include "viridentity.h" -# include "qemu/qemu_alias.h" # include "qemu/qemu_capabilities.h" -# include "qemu/qemu_command.h" # include "qemu/qemu_domain.h" # include "qemu/qemu_migration.h" # include "qemu/qemu_process.h" # include "qemu/qemu_slirp.h" -# include "qemu/qemu_qapi.h" # include "datatypes.h" # include "conf/storage_conf.h" -# include "cpu/cpu_map.h" -# include "virstring.h" -# include "storage/storage_driver.h" -# include "virmock.h" # include "virfilewrapper.h" # include "configmake.h" # include "testutilsqemuschema.h" -# include "qemu/qemu_monitor_json.h" # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3bd57306cc..b8175168ea 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -8,10 +8,7 @@ #include "testutils.h" #include "internal.h" -#include "qemu/qemu_domain_address.h" -#include "qemu/qemu_domain.h" #include "testutilsqemu.h" -#include "virstring.h" #include "virfilewrapper.h" #include "configmake.h" diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index cb66a479e3..28ad59f39d 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -26,8 +26,6 @@ # include <fcntl.h> # include <sys/stat.h> # include <unistd.h> -# include "virstring.h" -# include "virerror.h" # include "virlog.h" # include "virscsihost.h" diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index b2a11b278c..769d6e1f29 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -2,7 +2,6 @@ #include <unistd.h> #include "security/security_driver.h" -#include "virrandom.h" #include "testutils.h" static int diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index c3d6505ef2..24c9f3841c 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -39,7 +39,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE #include "viralloc.h" -#include "virstring.h" static int (*real_statfs)(const char *path, struct statfs *buf); static int (*real_security_get_boolean_active)(const char *name); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index dfe9d38d34..4f97edad17 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -30,13 +30,11 @@ #include "internal.h" #include "testutils.h" #include "testutilsqemu.h" -#include "qemu/qemu_domain.h" #include "viralloc.h" #include "virerror.h" #include "virfile.h" #include "virlog.h" #include "security/security_manager.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 4912cc3483..6a0f1617ae 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -27,10 +27,7 @@ #include "internal.h" #include "testutils.h" -#include "viralloc.h" #include "virlog.h" -#include "virerror.h" -#include "virfile.h" #include "security/security_manager.h" #include "virstring.h" diff --git a/tests/sockettest.c b/tests/sockettest.c index 2a35b6a829..f2b75a2e53 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -25,7 +25,6 @@ #include "virsocketaddr.h" #include "testutils.h" #include "virlog.h" -#include "viralloc.h" VIR_LOG_INIT("tests.sockettest"); diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index c7dabd976b..8f27e40d46 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -29,7 +29,6 @@ #include "testutils.h" #define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW #include "storage/storage_backend_sheepdog_priv.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 449b745519..487481b7ee 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -2,10 +2,7 @@ #include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "storage/storage_util.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index f21f20357a..2bad858033 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "storage_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #include "storage/storage_util.h" diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 94e2de1730..6f1fc7b38c 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -2,10 +2,7 @@ #include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "storage/storage_util.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index be38f50a51..5d06821cd0 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "storage_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 973b8317b5..287c40c6f9 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -29,7 +29,6 @@ #include "virsysinfo.h" #include "testutils.h" #include "virfile.h" -#include "virstring.h" #define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW #include "virsysinfopriv.h" diff --git a/tests/testutils.c b/tests/testutils.c index 9d454c23bc..30f91dcd28 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -29,13 +29,9 @@ #include "testutils.h" #include "internal.h" #include "viralloc.h" -#include "virthread.h" #include "virerror.h" #include "virbuffer.h" #include "virlog.h" -#include "vircommand.h" -#include "virrandom.h" -#include "virprocess.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/testutils.h b/tests/testutils.h index ff5661bb3f..869b58bd1e 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -24,7 +24,6 @@ #include "virfile.h" #include "virstring.h" #include "virjson.h" -#include "capabilities.h" #include "domain_conf.h" #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c index ac7a01a4e8..356c118646 100644 --- a/tests/testutilslxc.c +++ b/tests/testutilslxc.c @@ -3,7 +3,6 @@ # include "testutilslxc.h" # include "testutils.h" -# include "viralloc.h" # include "domain_conf.h" # define VIR_FROM_THIS VIR_FROM_LXC diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h index 0f7345b1c1..c8f2ad6dff 100644 --- a/tests/testutilslxc.h +++ b/tests/testutilslxc.h @@ -16,8 +16,6 @@ #pragma once -#include "capabilities.h" - #include "lxc/lxc_conf.h" #define FAKEDEVDIR0 "/fakedevdir0/bla/fasl" diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 6211b2a871..d26caba5fb 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -6,7 +6,6 @@ # include "testutils.h" # include "viralloc.h" # include "cpu_conf.h" -# include "qemu/qemu_driver.h" # include "qemu/qemu_domain.h" # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" diff --git a/tests/utiltest.c b/tests/utiltest.c index 419dfea913..e7a79f808f 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -3,7 +3,6 @@ #include <unistd.h> #include "internal.h" -#include "viralloc.h" #include "testutils.h" #include "virutil.h" diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 6fd7407b97..5301fd9dea 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -21,8 +21,6 @@ #include <signal.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virauthconfig.h" diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 79bd0cae8e..0ca7927c3f 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -4,8 +4,6 @@ #include "internal.h" #include "testutils.h" #include "virbuffer.h" -#include "viralloc.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index b143f873a1..26a512e87f 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -20,7 +20,6 @@ #include "testutils.h" #include "capabilities.h" -#include "virbitmap.h" #include "virfilewrapper.h" diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index a213c8e686..8a0e3aec0f 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -26,8 +26,6 @@ # include <sys/sysmacros.h> # include <stdarg.h> # include "testutilslxc.h" -# include "virstring.h" -# include "virfile.h" # include "viralloc.h" # include "vircgroupv2devices.h" diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7d54df1a85..e29bc094b1 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -25,7 +25,6 @@ # define LIBVIRT_VIRCGROUPPRIV_H_ALLOW # include "vircgrouppriv.h" -# include "virstring.h" # include "virerror.h" # include "virlog.h" # include "virfile.h" diff --git a/tests/virconftest.c b/tests/virconftest.c index 3b203b6ae6..34a8232790 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -23,7 +23,6 @@ #include <unistd.h> #include "virconf.h" -#include "viralloc.h" #include "testutils.h" diff --git a/tests/virdriverconnvalidatetest.c b/tests/virdriverconnvalidatetest.c index 6f4cefb61e..6d10628a73 100644 --- a/tests/virdriverconnvalidatetest.c +++ b/tests/virdriverconnvalidatetest.c @@ -19,8 +19,6 @@ #include <config.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "driver.h" diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index e7930d3453..27d0f15ac5 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -19,8 +19,6 @@ #include <config.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "driver.h" diff --git a/tests/virfilemock.c b/tests/virfilemock.c index d4863bd12c..093a8d7cf0 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -26,8 +26,6 @@ #endif #include "virmock.h" -#include "virstring.h" -#include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 1e95c77d06..9fbfc37e56 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -23,7 +23,6 @@ #include "testutils.h" #include "virfile.h" -#include "virstring.h" #ifdef __linux__ # include <linux/falloc.h> diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index aaff39866d..9cdfcfdc3f 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -23,10 +23,8 @@ # include <fcntl.h> # include "viralloc.h" -# include "virfile.h" # include "virfilewrapper.h" # include "virmock.h" -# include "virstring.h" /* Mapping for prefix overrides */ diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 8a0ca6be07..e3d15fb67b 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -31,7 +31,6 @@ # include "vircommandpriv.h" # define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW # include "virfirewalldpriv.h" -# include "virmock.h" # define VIR_FROM_THIS VIR_FROM_FIREWALL diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 746e65727f..196f4c29b9 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -8,7 +8,6 @@ #define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" #include "virfile.h" -#include "virstring.h" #include "virfilewrapper.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 99c7899ed7..73ed9f73df 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -28,12 +28,8 @@ #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW #include "viridentitypriv.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virlockspace.h" - #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("tests.identitytest"); diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 0f0c7b17da..cd1ea1c81a 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -22,12 +22,8 @@ #include "testutils.h" #include "virkeycode.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virlockspace.h" - #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("tests.keycodetest"); diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index d2df3bdb04..0e662878b2 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -25,7 +25,6 @@ # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # include "virkmod.h" -# include "virstring.h" # define MODNAME "vfio-pci" diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 109edf34d5..711164265d 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -23,8 +23,6 @@ #include <sys/stat.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" #include "virutil.h" diff --git a/tests/virmigtest.c b/tests/virmigtest.c index af6643397e..adc123b802 100644 --- a/tests/virmigtest.c +++ b/tests/virmigtest.c @@ -22,7 +22,6 @@ #include "testutils.h" #include "virlog.h" -#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index ecb39bb4f7..39e270eaac 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -21,7 +21,6 @@ */ #include "virmock.h" -#include "viralloc.h" #include <sys/stat.h> #include <unistd.h> diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index f26991a48c..910009d80c 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -20,7 +20,6 @@ #ifdef __linux__ # include "internal.h" -# include "virstring.h" # include "virnetdev.h" # define NET_DEV_TEST_DATA_PREFIX abs_srcdir "/virnetdevtestdata/sys/class/net" diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 3fd7b70ad0..aec84c6c35 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -21,8 +21,6 @@ #include "internal.h" #include "testutils.h" -#include "virnetlink.h" - #define LIBVIRT_VIRNETDEVPRIV_H_ALLOW #ifdef __linux__ diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 386c339c2c..14790c0ece 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -21,10 +21,8 @@ #include <signal.h> #include "testutils.h" -#include "virerror.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "rpc/virnetmessage.h" #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 4e8edb05c3..396005899a 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -29,7 +29,6 @@ #include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "virstring.h" #include "rpc/virnetsocket.h" #include "rpc/virnetclient.h" diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 0ad42a77ed..403cd8d0ac 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -23,12 +23,7 @@ #include "testutils.h" #include "virnettlshelpers.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virfile.h" -#include "vircommand.h" -#include "virsocket.h" #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600 diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 9e0d6a46e6..5b98a6de3e 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -23,12 +23,8 @@ #include "testutils.h" #include "virnettlshelpers.h" #include "virutil.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "vircommand.h" -#include "virsocket.h" #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600 diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c index 176f52d675..237624a752 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -28,7 +28,6 @@ #include "internal.h" #include "testutils.h" #include "virnetworkportdef.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 7f2653cb53..87c9a58c6f 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -19,11 +19,8 @@ #include <config.h> #include "internal.h" -#include "virmock.h" #include "virnuma.h" #include "virfile.h" -#include "viralloc.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c index ccdad3daa5..0c93b58a0c 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -28,10 +28,7 @@ #include "internal.h" #include "testutils.h" -#include "virxml.h" #include "virnwfilterbindingdef.h" -#include "testutilsqemu.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 77d46f0952..b2111794e6 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -31,7 +31,6 @@ # include <stdarg.h> # include <dirent.h> # include "viralloc.h" -# include "virstring.h" # include "virfile.h" static int (*real_access)(const char *path, int mode); diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 5c0a76de6f..9e17a88eb5 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -26,11 +26,8 @@ #if defined(__linux__) && defined(RTLD_NEXT) -# include "virerror.h" -# include "viralloc.h" # include "virlog.h" # include "virportallocator.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_RPC diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 6dd15213e3..e295f74446 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -23,7 +23,6 @@ # include <gnutls/gnutls.h> # include "internal.h" -# include "virstring.h" # include "virrandom.h" # include "virmock.h" diff --git a/tests/virschematest.c b/tests/virschematest.c index 29a5546418..dd13d82c62 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -21,8 +21,6 @@ #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virxml.h" diff --git a/tests/virshtest.c b/tests/virshtest.c index c2c892c60d..a53a6273b9 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -3,10 +3,8 @@ #include <unistd.h> #include "internal.h" -#include "virxml.h" #include "testutils.h" #include "vircommand.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ccfc9f7001..11f7abbda6 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -23,11 +23,8 @@ #include "storage_source.h" #include "testutils.h" #include "vircommand.h" -#include "virerror.h" #include "virfile.h" #include "virlog.h" -#include "virstoragefile.h" -#include "virstring.h" #include "storage/storage_driver.h" diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c index d4ab818f5f..ba92ec8bcc 100644 --- a/tests/virstorageutiltest.c +++ b/tests/virstorageutiltest.c @@ -18,10 +18,7 @@ #include "testutils.h" -#include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virstring.h" #include "storage/storage_util.h" diff --git a/tests/virstringtest.c b/tests/virstringtest.c index b406076020..7d8d9204cc 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -20,9 +20,6 @@ #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "virstring.h" diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 7951f3d00f..19559aee7a 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -26,8 +26,6 @@ #include "virsocket.h" #include "configmake.h" -#include "virstring.h" -#include "viralloc.h" #include "virfile.h" static int (*real_open)(const char *path, int flags, ...); diff --git a/tests/virtimetest.c b/tests/virtimetest.c index f98165b106..5972ce585e 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -21,8 +21,6 @@ #include <signal.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virtime.h" diff --git a/tests/viruritest.c b/tests/viruritest.c index 96f29aafc0..94c8aa806d 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -21,7 +21,6 @@ #include <signal.h> #include "testutils.h" -#include "virerror.h" #include "viralloc.h" #include "virlog.h" diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 5b09895197..971d98aa9a 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -24,9 +24,6 @@ #include <dlfcn.h> #include <fcntl.h> -#include "viralloc.h" -#include "virfile.h" -#include "virstring.h" #include "virusb.h" #define USB_SYSFS "/sys/bus/usb" diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 65050d5e5f..870e136321 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -18,9 +18,7 @@ #include <config.h> -#include "viralloc.h" #include "virerror.h" -#include "virfile.h" #include "virusb.h" #include "testutils.h" diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 257bda3b0e..dbd771017b 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -7,9 +7,7 @@ # include <unistd.h> # include "internal.h" -# include "viralloc.h" # include "vmx/vmx.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_VMWARE diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 83d7f9b5ab..bb75a41418 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -27,7 +27,6 @@ #include "internal.h" #include "testutils.h" -#include "viralloc.h" #include "../tools/vsh-table.h" static int diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index d6505f9e12..962a1f2c4b 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -28,7 +28,6 @@ #include "internal.h" #include "datatypes.h" #include "libxl/xen_xl.h" -#include "viralloc.h" #include "virstring.h" #include "testutils.h" #include "testutilsxen.h" diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index c99d1f2bd9..dbf9f7a4c7 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -28,8 +28,6 @@ #include "libxl/xen_xm.h" #include "testutils.h" #include "testutilsxen.h" -#include "viralloc.h" -#include "virstring.h" #include "libxl/libxl_conf.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index cd6d81947b..1a7f2e4f33 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -9,7 +9,6 @@ # include "internal.h" # include "viralloc.h" # include "vmx/vmx.h" -# include "virstring.h" # define VIR_FROM_THIS VIR_FROM_VMWARE -- 2.36.1