From 3d5245e3ebd1e143ea858c8535474b681bc21a38 Mon Sep 17 00:00:00 2001 From: Peng Liang Date: Wed, 8 Jun 2022 20:13:14 +0800 Subject: [PATCH] lxc: Remove unused includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peng Liang Reviewed-by: Ján Tomko --- src/lxc/lxc_cgroup.c | 3 --- src/lxc/lxc_cgroup.h | 1 - src/lxc/lxc_conf.c | 1 - src/lxc/lxc_conf.h | 4 ---- src/lxc/lxc_container.c | 2 -- src/lxc/lxc_container.h | 1 - src/lxc/lxc_controller.c | 4 ---- src/lxc/lxc_domain.c | 2 -- src/lxc/lxc_driver.c | 4 ---- src/lxc/lxc_fuse.c | 1 - src/lxc/lxc_monitor.c | 2 -- src/lxc/lxc_native.c | 1 - src/lxc/lxc_process.c | 4 ---- 13 files changed, 30 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index d31fff5f98..ee14570470 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -27,9 +27,6 @@ #include "virfile.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" -#include "virsystemd.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h index bebdc3ff96..64d0c51175 100644 --- a/src/lxc/lxc_cgroup.h +++ b/src/lxc/lxc_cgroup.h @@ -23,7 +23,6 @@ #include "vircgroup.h" #include "domain_conf.h" -#include "lxc_fuse.h" #include "virusb.h" virCgroup *virLXCCgroupCreate(virDomainDef *def, diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 3ab4d61fe3..7834801fb5 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -34,7 +34,6 @@ #include "configmake.h" #include "lxc_container.h" #include "virnodesuspend.h" -#include "virstring.h" #include "virfile.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 04e51aa954..6b9004aa3c 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -23,15 +23,11 @@ #include "internal.h" #include "libvirt_internal.h" -#include "domain_conf.h" #include "domain_event.h" -#include "capabilities.h" #include "virthread.h" #include "security/security_manager.h" #include "configmake.h" -#include "vircgroup.h" #include "virsysinfo.h" -#include "virusb.h" #include "virclosecallbacks.h" #include "virhostdev.h" diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d5410e9fa6..b5278831da 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -52,10 +52,8 @@ #include "virlog.h" #include "lxc_container.h" #include "viralloc.h" -#include "virnetdevveth.h" #include "viruuid.h" #include "virfile.h" -#include "virusb.h" #include "vircommand.h" #include "virnetdevip.h" #include "virprocess.h" diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index c11660d28b..a5c898e979 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -20,7 +20,6 @@ #pragma once -#include "lxc_conf.h" #include "lxc_domain.h" #include "security/security_manager.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index d936f34793..a71a662ebd 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -36,7 +36,6 @@ #include #include #include -#include #if WITH_CAPNG # include @@ -56,15 +55,12 @@ #include "virfile.h" #include "virgdbus.h" #include "virpidfile.h" -#include "vircommand.h" #include "virhostcpu.h" -#include "virrandom.h" #include "virprocess.h" #include "virnuma.h" #include "rpc/virnetdaemon.h" #include "virstring.h" #include "virgettext.h" -#include "virsocket.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 5064f942b9..4c7265e40c 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -25,8 +25,6 @@ #include "virlog.h" #include "virerror.h" -#include "virstring.h" -#include "virfile.h" #include "virtime.h" #include "virsystemd.h" #include "virinitctl.h" diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 31de677b88..0d8cdcebfd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -44,13 +44,11 @@ #include "lxc_driver.h" #include "lxc_native.h" #include "lxc_process.h" -#include "virnetdevbridge.h" #include "virnetdevveth.h" #include "virnetdevopenvswitch.h" #include "virhostcpu.h" #include "virhostmem.h" #include "viruuid.h" -#include "virhook.h" #include "virfile.h" #include "virpidfile.h" #include "virfdstream.h" @@ -64,7 +62,6 @@ #include "virnetdevtap.h" #include "virnodesuspend.h" #include "virprocess.h" -#include "virtime.h" #include "virtypedparam.h" #include "viruri.h" #include "virstring.h" @@ -72,7 +69,6 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" #include "netdev_bandwidth_conf.h" -#include "virsocket.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 5e48206c39..a99b44327f 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -43,7 +43,6 @@ #include "virerror.h" #include "virfile.h" #include "virbuffer.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index d8ef489a01..811d6685e5 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -21,14 +21,12 @@ #include #include "lxc_monitor.h" -#include "lxc_conf.h" #include "lxc_monitor_dispatch.h" #include "virerror.h" #include "virlog.h" #include "virthread.h" #include "rpc/virnetclient.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index ea2f1effe1..025c376ad2 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -25,7 +25,6 @@ #include "lxc_container.h" #include "lxc_native.h" #include "util/viralloc.h" -#include "util/virfile.h" #include "util/virlog.h" #include "util/virstring.h" #include "util/virconf.h" diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d162812a74..9dc7d9d0d8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -29,8 +29,6 @@ #include "lxc_process.h" #include "lxc_domain.h" #include "lxc_container.h" -#include "lxc_cgroup.h" -#include "lxc_fuse.h" #include "datatypes.h" #include "virfile.h" #include "virpidfile.h" @@ -48,9 +46,7 @@ #include "vircommand.h" #include "lxc_hostdev.h" #include "virhook.h" -#include "virstring.h" #include "virprocess.h" -#include "virsystemd.h" #include "netdev_bandwidth_conf.h" #include "virutil.h"