SHA256
1
0
forked from pool/libvirt
libvirt/lxc-wait-after-eth-del.patch
James Fehlig c5e448dfb3 Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    72adaf2f-revert-qemu-monitor-error-report.patch,
    71d56a39-nodedev-fix-parse-PCI-address.patch,
    68eed56b-conf-smbios-oem-strings.patch,
    76977061-qemu-smbios-oem-strings.patch,
    0c710a37-libxl-resume-lock-on-mig-failure.patch,
    759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
    c2dc6698-fix-deadlock-obtaining-hostname.patch,
    c391e07e-libxl-clock-settings.patch,
    ef71caea-libxl-memalign.patch,
    suse-apparmor-signal.patch

OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 17:46:32 +00:00

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-4.1.0/src/lxc/lxc_controller.c
===================================================================
--- libvirt-4.1.0.orig/src/lxc/lxc_controller.c
+++ libvirt-4.1.0/src/lxc/lxc_controller.c
@@ -73,6 +73,7 @@
#include "rpc/virnetdaemon.h"
#include "virstring.h"
#include "virgettext.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_LXC
@@ -2003,6 +2004,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
}
+ virWaitForDevices();
return ret;
}
Index: libvirt-4.1.0/src/lxc/lxc_driver.c
===================================================================
--- libvirt-4.1.0.orig/src/lxc/lxc_driver.c
+++ libvirt-4.1.0/src/lxc/lxc_driver.c
@@ -75,6 +75,7 @@
#include "virtime.h"
#include "virtypedparam.h"
#include "viruri.h"
+#include "virutil.h"
#include "virstring.h"
#include "viraccessapicheck.h"
#include "viraccessapichecklxc.h"
@@ -4021,6 +4022,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:
@@ -4464,6 +4466,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-4.1.0/src/lxc/lxc_process.c
===================================================================
--- libvirt-4.1.0.orig/src/lxc/lxc_process.c
+++ libvirt-4.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
@@ -220,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
}
virDomainNetReleaseActualDevice(vm->def, iface);
}
+ virWaitForDevices();
virDomainConfVMNWFilterTeardown(vm);