From 3bff82b57564ffc1fe4fff23f9d121fcf410dd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 25 Nov 2015 11:43:56 +0100 Subject: [PATCH] Wait for udev events to be handled after removing veth As per http://www.redhat.com/archives/libvir-list/2013-July/msg01279.html, wait for udev events to be handled after removing a virtual NIC. Any udev rule associated to NIC destroy could happen to run with a new device with the same name that is being created. --- src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 2 ++ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 3e5d2b4..02ef04f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2002,6 +2002,7 @@ static int virLXCControllerDeleteInterfaces(virLXCControllerPtr ctrl) if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } + virFileWaitForDevices(); return ret; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1a9550e..4c7c28f 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4254,6 +4254,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: ignore_value(virNetDevVethDelete(veth)); + virFileWaitForDevices(); break; case VIR_DOMAIN_NET_TYPE_DIRECT: @@ -4681,6 +4682,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } + virFileWaitForDevices(); break; /* It'd be nice to support this, but with macvlan diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 57e3880..8967de8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, } networkReleaseActualDevice(vm->def, iface); } + virFileWaitForDevices(); virDomainConfVMNWFilterTeardown(vm); -- 2.1.4