nwfilter: remove obsolete code related to firewalld

There is a bunch of left over code in the nwfilter driver related to
monitoring firewalld over dbus, that is no longer used since the
conversion to use virFirewall APIs.

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-04-26 13:30:33 +01:00
parent fdc7ebfb54
commit 94d31e7c0e
3 changed files with 0 additions and 21 deletions

View File

@ -38,7 +38,6 @@ struct _virNWFilterDriverState {
virNWFilterObjListPtr nwfilters; virNWFilterObjListPtr nwfilters;
char *configDir; char *configDir;
bool watchingFirewallD;
}; };
virNWFilterDefPtr virNWFilterDefPtr

View File

@ -186,8 +186,6 @@ nwfilterStateInitialize(bool privileged,
if (virMutexInit(&driver->lock) < 0) if (virMutexInit(&driver->lock) < 0)
goto err_free_driverstate; goto err_free_driverstate;
/* remember that we are going to use firewalld */
driver->watchingFirewallD = (sysbus != NULL);
driver->privileged = privileged; driver->privileged = privileged;
if (!(driver->nwfilters = virNWFilterObjListNew())) if (!(driver->nwfilters = virNWFilterObjListNew()))
goto error; goto error;
@ -311,22 +309,6 @@ nwfilterStateReload(void)
} }
/**
* virNWFilterIsWatchingFirewallD:
*
* Checks if the nwfilter has the DBus watches for FirewallD installed.
*
* Returns true if it is watching firewalld, false otherwise
*/
bool
virNWFilterDriverIsWatchingFirewallD(void)
{
if (!driver)
return false;
return driver->watchingFirewallD;
}
/** /**
* nwfilterStateCleanup: * nwfilterStateCleanup:
* *

View File

@ -33,6 +33,4 @@
int nwfilterRegister(void); int nwfilterRegister(void);
bool virNWFilterDriverIsWatchingFirewallD(void);
#endif /* __VIR_NWFILTER_DRIVER_H__ */ #endif /* __VIR_NWFILTER_DRIVER_H__ */