forked from pool/libvirt
7fe9d077c7
- Update to libvirt 5.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
11c8aca9-libxl-set-mem-after-balloon.patch,
70c2933d-apparmor-named-profiles.patch,
a3ab6d42-apparmor-conv-libvirtd-named-profile.patch,
b6440119-qemu-conf-sev.patch,
a404ac34-qemu-cgroup-sev.patch,
6fd4c8f8-qemu-domain-sev.patch,
17f6a257-security-dac-sev.patch,
a2d3dea9-qemu-caps-dac-override-sev.patch,
620d9dd5-qemu-no-dac-override-nonroot.patch
- jsc#SLE-3887, jsc#SLE-4480, jsc#SLE-4577
OBS-URL: https://build.opensuse.org/request/show/681981
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=734
84 lines
2.7 KiB
Diff
84 lines
2.7 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-5.1.0/src/lxc/lxc_controller.c
|
|
===================================================================
|
|
--- libvirt-5.1.0.orig/src/lxc/lxc_controller.c
|
|
+++ libvirt-5.1.0/src/lxc/lxc_controller.c
|
|
@@ -69,6 +69,7 @@
|
|
#include "rpc/virnetdaemon.h"
|
|
#include "virstring.h"
|
|
#include "virgettext.h"
|
|
+#include "virutil.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_LXC
|
|
|
|
@@ -2017,6 +2018,7 @@ static int virLXCControllerDeleteInterfa
|
|
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
|
|
ret = -1;
|
|
}
|
|
+ virWaitForDevices();
|
|
|
|
return ret;
|
|
}
|
|
Index: libvirt-5.1.0/src/lxc/lxc_driver.c
|
|
===================================================================
|
|
--- libvirt-5.1.0.orig/src/lxc/lxc_driver.c
|
|
+++ libvirt-5.1.0/src/lxc/lxc_driver.c
|
|
@@ -70,6 +70,7 @@
|
|
#include "virtime.h"
|
|
#include "virtypedparam.h"
|
|
#include "viruri.h"
|
|
+#include "virutil.h"
|
|
#include "virstring.h"
|
|
#include "viraccessapicheck.h"
|
|
#include "viraccessapichecklxc.h"
|
|
@@ -3930,6 +3931,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
|
|
case VIR_DOMAIN_NET_TYPE_NETWORK:
|
|
case VIR_DOMAIN_NET_TYPE_ETHERNET:
|
|
ignore_value(virNetDevVethDelete(veth));
|
|
+ virWaitForDevices();
|
|
break;
|
|
|
|
case VIR_DOMAIN_NET_TYPE_DIRECT:
|
|
@@ -4373,6 +4375,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
|
|
virDomainAuditNet(vm, detach, NULL, "detach", false);
|
|
goto cleanup;
|
|
}
|
|
+ virWaitForDevices();
|
|
break;
|
|
|
|
/* It'd be nice to support this, but with macvlan
|
|
Index: libvirt-5.1.0/src/lxc/lxc_process.c
|
|
===================================================================
|
|
--- libvirt-5.1.0.orig/src/lxc/lxc_process.c
|
|
+++ libvirt-5.1.0/src/lxc/lxc_process.c
|
|
@@ -51,6 +51,7 @@
|
|
#include "viratomic.h"
|
|
#include "virprocess.h"
|
|
#include "virsystemd.h"
|
|
+#include "virutil.h"
|
|
#include "netdev_bandwidth_conf.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_LXC
|
|
@@ -226,6 +227,7 @@ static void virLXCProcessCleanup(virLXCD
|
|
}
|
|
virDomainNetReleaseActualDevice(vm->def, iface);
|
|
}
|
|
+ virWaitForDevices();
|
|
|
|
virDomainConfVMNWFilterTeardown(vm);
|
|
|