[libvirt] [PATCH 05/26] Remove nwfilter tech driver 'displayRuleInstance' callback
The 'displayRuleInstance' callback in the nwfilter tech driver
is never invoked, so can be deleted.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/nwfilter/nwfilter_ebiptables_driver.c | 12 ------------
src/nwfilter/nwfilter_tech_driver.h | 3 ---
2 files changed, 15 deletions(-)
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 1dabe52..0885bb1 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -2781,17 +2781,6 @@ ebiptablesFreeRuleInstance(void *_inst)
}
-static int
-ebiptablesDisplayRuleInstance(void *_inst)
-{
- ebiptablesRuleInstPtr inst = (ebiptablesRuleInstPtr)_inst;
- VIR_INFO("Command Template: '%s', Needed protocol: '%s'",
- inst->commandTemplate,
- inst->neededProtocolChain);
- return 0;
-}
-
-
/**
* ebiptablesExecCLI:
* @buf: pointer to virBuffer containing the string with the commands to
@@ -4105,7 +4094,6 @@ virNWFilterTechDriver ebiptables_driver = {
.tearOldRules = ebiptablesTearOldRules,
.allTeardown = ebiptablesAllTeardown,
.freeRuleInstance = ebiptablesFreeRuleInstance,
- .displayRuleInstance = ebiptablesDisplayRuleInstance,
.canApplyBasicRules = ebiptablesCanApplyBasicRules,
.applyBasicRules = ebtablesApplyBasicRules,
diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h
index d1c85b4..ed09a67 100644
--- a/src/nwfilter/nwfilter_tech_driver.h
+++ b/src/nwfilter/nwfilter_tech_driver.h
@@ -62,8 +62,6 @@ typedef int (*virNWFilterRuleAllTeardown)(const char *ifname);
typedef int (*virNWFilterRuleFreeInstanceData)(void * _inst);
-typedef int (*virNWFilterRuleDisplayInstanceData)(void *_inst);
-
typedef int (*virNWFilterCanApplyBasicRules)(void);
typedef int (*virNWFilterApplyBasicRules)(const char *ifname,
@@ -95,7 +93,6 @@ struct _virNWFilterTechDriver {
virNWFilterRuleTeardownOldRules tearOldRules;
virNWFilterRuleAllTeardown allTeardown;
virNWFilterRuleFreeInstanceData freeRuleInstance;
- virNWFilterRuleDisplayInstanceData displayRuleInstance;
virNWFilterCanApplyBasicRules canApplyBasicRules;
virNWFilterApplyBasicRules applyBasicRules;
--
1.9.0