[libvirt] [PATCH] network: Drop unused networkRestartRadvd

Michal Privoznik mprivozn at redhat.com
Wed Mar 29 08:02:34 UTC 2017


Since its introduction in 1ce4922e720 this function lived as an
outcast in an #if 0 block.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/network/bridge_driver.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 5ccd37a..ddd2a3a 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1980,33 +1980,6 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver,
     return kill(network->radvdPid, SIGHUP);
 }
 
-#if 0
-/* currently unused, so it causes a build error unless we #if it out */
-static int
-networkRestartRadvd(virNetworkObjPtr network)
-{
-    char *radvdpidbase;
-
-    /* if there is a running radvd, kill it */
-    if (network->radvdPid > 0) {
-        /* essentially ignore errors from the following two functions,
-         * since there's really no better recovery to be done than to
-         * just push ahead (and that may be exactly what's needed).
-         */
-        if ((networkKillDaemon(network->radvdPid, "radvd",
-                               network->def->name) >= 0) &&
-            ((radvdpidbase = networkRadvdPidfileBasename(network->def->name))
-             != NULL)) {
-            virPidFileDelete(driver->pidDir, radvdpidbase);
-            VIR_FREE(radvdpidbase);
-        }
-        network->radvdPid = -1;
-    }
-    /* now start radvd if it should be started */
-    return networkStartRadvd(network);
-}
-#endif /* #if 0 */
-
 static int
 networkRefreshDaemonsHelper(virNetworkObjPtr net,
                             void *opaque)
-- 
2.10.2




More information about the libvir-list mailing list