[libvirt] [PATCH 04/26] Remove nwfilter tech driver 'removeRules' callback
The 'removeRules' 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 | 40 -------------------------------
src/nwfilter/nwfilter_tech_driver.h | 5 ----
2 files changed, 45 deletions(-)
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 4365c1f..1dabe52 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -4046,45 +4046,6 @@ ebiptablesTearOldRules(const char *ifname)
/**
- * ebiptablesRemoveRules:
- * @ifname : the name of the interface to which the rules apply
- * @nRuleInstance : the number of given rules
- * @_inst : array of rule instantiation data
- *
- * Remove all rules one after the other
- *
- * Return 0 on success, -1 if execution of one or more cleanup
- * commands failed.
- */
-static int
-ebiptablesRemoveRules(const char *ifname ATTRIBUTE_UNUSED,
- int nruleInstances,
- void **_inst)
-{
- int rc = -1;
- size_t i;
- virBuffer buf = VIR_BUFFER_INITIALIZER;
- ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst;
-
- NWFILTER_SET_EBTABLES_SHELLVAR(&buf);
-
- for (i = 0; i < nruleInstances; i++)
- ebiptablesInstCommand(&buf,
- inst[i]->commandTemplate,
- 'D', -1,
- false);
-
- if (ebiptablesExecCLI(&buf, true, NULL) < 0)
- goto cleanup;
-
- rc = 0;
-
- cleanup:
- return rc;
-}
-
-
-/**
* ebiptablesAllTeardown:
* @ifname : the name of the interface to which the rules apply
*
@@ -4143,7 +4104,6 @@ virNWFilterTechDriver ebiptables_driver = {
.tearNewRules = ebiptablesTearNewRules,
.tearOldRules = ebiptablesTearOldRules,
.allTeardown = ebiptablesAllTeardown,
- .removeRules = ebiptablesRemoveRules,
.freeRuleInstance = ebiptablesFreeRuleInstance,
.displayRuleInstance = ebiptablesDisplayRuleInstance,
diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h
index 03588e2..d1c85b4 100644
--- a/src/nwfilter/nwfilter_tech_driver.h
+++ b/src/nwfilter/nwfilter_tech_driver.h
@@ -58,10 +58,6 @@ typedef int (*virNWFilterRuleTeardownNewRules)(const char *ifname);
typedef int (*virNWFilterRuleTeardownOldRules)(const char *ifname);
-typedef int (*virNWFilterRuleRemoveRules)(const char *ifname,
- int nruleInstances,
- void **_inst);
-
typedef int (*virNWFilterRuleAllTeardown)(const char *ifname);
typedef int (*virNWFilterRuleFreeInstanceData)(void * _inst);
@@ -97,7 +93,6 @@ struct _virNWFilterTechDriver {
virNWFilterRuleApplyNewRules applyNewRules;
virNWFilterRuleTeardownNewRules tearNewRules;
virNWFilterRuleTeardownOldRules tearOldRules;
- virNWFilterRuleRemoveRules removeRules;
virNWFilterRuleAllTeardown allTeardown;
virNWFilterRuleFreeInstanceData freeRuleInstance;
virNWFilterRuleDisplayInstanceData displayRuleInstance;
--
1.9.0