forked from pool/libvirt
fe8f4e8203
- Update to libvirt 1.3.1
- CVE-2015-5313
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches: 034e47c3-CVE-2015-5313.patch,
ace1ee22-qemuxml2argv-test.patch, add-with-login-shell.patch,
virt-aa-helper-rw-mounts.patch
OBS-URL: https://build.opensuse.org/request/show/354651
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=508
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 3bff82b57564ffc1fe4fff23f9d121fcf410dd5a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
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(+)
|
|
|
|
Index: libvirt-1.3.1/src/lxc/lxc_controller.c
|
|
===================================================================
|
|
--- libvirt-1.3.1.orig/src/lxc/lxc_controller.c
|
|
+++ libvirt-1.3.1/src/lxc/lxc_controller.c
|
|
@@ -2002,6 +2002,7 @@ static int virLXCControllerDeleteInterfa
|
|
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
|
|
ret = -1;
|
|
}
|
|
+ virFileWaitForDevices();
|
|
|
|
return ret;
|
|
}
|
|
Index: libvirt-1.3.1/src/lxc/lxc_driver.c
|
|
===================================================================
|
|
--- libvirt-1.3.1.orig/src/lxc/lxc_driver.c
|
|
+++ libvirt-1.3.1/src/lxc/lxc_driver.c
|
|
@@ -4257,6 +4257,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
|
|
case VIR_DOMAIN_NET_TYPE_BRIDGE:
|
|
case VIR_DOMAIN_NET_TYPE_NETWORK:
|
|
ignore_value(virNetDevVethDelete(veth));
|
|
+ virFileWaitForDevices();
|
|
break;
|
|
|
|
case VIR_DOMAIN_NET_TYPE_DIRECT:
|
|
@@ -4684,6 +4685,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
|
|
virDomainAuditNet(vm, detach, NULL, "detach", false);
|
|
goto cleanup;
|
|
}
|
|
+ virFileWaitForDevices();
|
|
break;
|
|
|
|
/* It'd be nice to support this, but with macvlan
|
|
Index: libvirt-1.3.1/src/lxc/lxc_process.c
|
|
===================================================================
|
|
--- libvirt-1.3.1.orig/src/lxc/lxc_process.c
|
|
+++ libvirt-1.3.1/src/lxc/lxc_process.c
|
|
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
|
|
}
|
|
networkReleaseActualDevice(vm->def, iface);
|
|
}
|
|
+ virFileWaitForDevices();
|
|
|
|
virDomainConfVMNWFilterTeardown(vm);
|
|
|