From: Adam Tao <tcx4c70@xxxxxxxxx> Signed-off-by: Peng Liang <tcx4c70@xxxxxxxxx> --- src/nwfilter/nwfilter_dhcpsnoop.c | 3 --- src/nwfilter/nwfilter_driver.c | 5 ----- src/nwfilter/nwfilter_driver.h | 3 --- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ---- src/nwfilter/nwfilter_gentech_driver.c | 4 ---- src/nwfilter/nwfilter_gentech_driver.h | 1 - src/nwfilter/nwfilter_learnipaddr.c | 5 ----- src/nwfilter/nwfilter_learnipaddr.h | 1 - 8 files changed, 26 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index d26e787453..1e6416b68a 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -45,11 +45,8 @@ #include <net/if.h> -#include "viralloc.h" #include "virlog.h" -#include "datatypes.h" #include "virerror.h" -#include "conf/domain_conf.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_dhcpsnoop.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index b66ba22737..10ae6efeb2 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -31,15 +31,10 @@ #include "virerror.h" #include "datatypes.h" -#include "viralloc.h" -#include "domain_conf.h" -#include "domain_nwfilter.h" #include "nwfilter_driver.h" #include "nwfilter_gentech_driver.h" #include "configmake.h" -#include "virfile.h" #include "virpidfile.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index 6c864dd2e3..844a17e069 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -24,7 +24,4 @@ #pragma once -#include "nwfilter_params.h" -#include "nwfilter_conf.h" - int nwfilterRegister(void); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 177fd64049..24c0db5bde 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -33,13 +33,9 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "domain_conf.h" #include "nwfilter_conf.h" -#include "nwfilter_driver.h" -#include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" #include "virfile.h" -#include "vircommand.h" #include "configmake.h" #include "virstring.h" #include "virfirewall.h" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 7e323afb1a..979b13fa2c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -26,7 +26,6 @@ #include "viralloc.h" #include "virlog.h" -#include "domain_conf.h" #include "virerror.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" @@ -34,9 +33,6 @@ #include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #include "virnetdev.h" -#include "datatypes.h" -#include "virsocketaddr.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 969ab76966..946d5d3d56 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -24,7 +24,6 @@ #include "virnwfilterobj.h" #include "virnwfilterbindingdef.h" -#include "nwfilter_tech_driver.h" int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index ec2d337188..0f3042a893 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -37,20 +37,15 @@ #include "internal.h" #include "virbuffer.h" -#include "viralloc.h" #include "virlog.h" -#include "datatypes.h" #include "virnetdev.h" #include "virerror.h" #include "virthread.h" #include "conf/nwfilter_params.h" -#include "conf/domain_conf.h" #include "nwfilter_gentech_driver.h" -#include "nwfilter_ebiptables_driver.h" #include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #include "virstring.h" -#include "virsocket.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h index 5fe5bac036..c7572340c2 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -23,7 +23,6 @@ #pragma once -#include "conf/nwfilter_params.h" #include "nwfilter_tech_driver.h" #include "virnwfilterbindingdef.h" #include <net/if.h> -- 2.36.1