提交 94d31e7c 编写于 作者: D Daniel P. Berrangé

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: NJiri Denemark <jdenemar@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 fdc7ebfb
......@@ -38,7 +38,6 @@ struct _virNWFilterDriverState {
virNWFilterObjListPtr nwfilters;
char *configDir;
bool watchingFirewallD;
};
virNWFilterDefPtr
......
......@@ -186,8 +186,6 @@ nwfilterStateInitialize(bool privileged,
if (virMutexInit(&driver->lock) < 0)
goto err_free_driverstate;
/* remember that we are going to use firewalld */
driver->watchingFirewallD = (sysbus != NULL);
driver->privileged = privileged;
if (!(driver->nwfilters = virNWFilterObjListNew()))
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:
*
......
......@@ -33,6 +33,4 @@
int nwfilterRegister(void);
bool virNWFilterDriverIsWatchingFirewallD(void);
#endif /* __VIR_NWFILTER_DRIVER_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册