From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 2 Sep 2024 07:30:29 +0000 (+0200)
Subject: network: Move port deletion into the shutdown function
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3e43670f01b265bedca0b2e2de1c652c4056fcdc;p=libvirt.git

network: Move port deletion into the shutdown function

It will be more useful in there when calling from new places.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index b16d524aa1..d27a7e9b88 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2447,6 +2447,8 @@ networkShutdownNetwork(virNetworkDriverState *driver,
         return -1;
     }
 
+    virNetworkObjDeleteAllPorts(obj, cfg->stateDir);
+
     /* now that we know it's stopped call the hook if present */
     networkRunHook(obj, NULL, VIR_HOOK_NETWORK_OP_STOPPED,
                    VIR_HOOK_SUBOP_END);
@@ -3458,8 +3460,6 @@ networkDestroy(virNetworkPtr net)
     if ((ret = networkShutdownNetwork(driver, obj)) < 0)
         goto cleanup;
 
-    virNetworkObjDeleteAllPorts(obj, cfg->stateDir);
-
     /* @def replaced in virNetworkObjUnsetDefTransient */
     def = virNetworkObjGetDef(obj);