External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-24 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: Clean up after disappeared transient inactive networks

Browse Source 
If a network disappeared the daemon should not only remove it from the
list of networks, but also do a proper cleanup.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Martin Kletzander 2024-09-03 13:07:30 +02:00
parent 2bea2782d5
commit 8a2717e803
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/bridge_driver.c
View File

@ -533,6 +533,23 @@ networkUpdateState(virNetworkObj *obj,
} }
static int
networkCleanupTransientInactive(virNetworkObj *obj,
void *opaque)
{
virNetworkDriverState *driver = opaque;
if (!virNetworkObjIsActive(obj) &&
!virNetworkObjIsPersistent(obj)) {
/* We can only do a cleanup here so that this can be called from an
* iterator over the networks */
networkCleanupInactive(driver, obj);
}
return 0;
}
static int static int
networkAutostartConfig(virNetworkObj *obj, networkAutostartConfig(virNetworkObj *obj,
void *opaque) void *opaque)
@ -659,6 +676,11 @@ networkStateInitialize(bool privileged,
virNetworkObjListForEach(network_driver->networks, virNetworkObjListForEach(network_driver->networks,
networkUpdateState, networkUpdateState,
network_driver); network_driver);
/* Before removing inactive transient networks from the list make sure we
* clean up after them as well */
virNetworkObjListForEach(network_driver->networks,
networkCleanupTransientInactive,
network_driver);
virNetworkObjListPrune(network_driver->networks, virNetworkObjListPrune(network_driver->networks,
VIR_CONNECT_LIST_NETWORKS_INACTIVE | VIR_CONNECT_LIST_NETWORKS_INACTIVE |
VIR_CONNECT_LIST_NETWORKS_TRANSIENT); VIR_CONNECT_LIST_NETWORKS_TRANSIENT);