libvirt/lxc-wait-after-eth-del.patch
James Fehlig c7b51f773c Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    e4d131b8-mv-virDomainDefPostParseInternal.patch,
    3e428670-post-parse-implicit-video.patch,
    538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
    400e716d-libxl-noprope-emulator.patch,
    b90c4b5f-tests-use-qemu-xen.patch,
    fccf2725-libxl-API-4.4.patch,
    5325123d-libxl-migv2-save-restore.patch,
    f9edcfa4-libxl-migv2-migration.patch,
    a1c9a81a-libxl-rbd-fix.patch,
    ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
  are never toogled. Also drop conditionals for suse_version <
  1310

OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 02:00:39 +00:00

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.5/src/lxc/lxc_controller.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_controller.c
+++ libvirt-1.3.5/src/lxc/lxc_controller.c
@@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
}
+ virFileWaitForDevices();
return ret;
}
Index: libvirt-1.3.5/src/lxc/lxc_driver.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_driver.c
+++ libvirt-1.3.5/src/lxc/lxc_driver.c
@@ -4350,6 +4350,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth));
+ virFileWaitForDevices();
break;
case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4779,6 +4780,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.5/src/lxc/lxc_process.c
===================================================================
--- libvirt-1.3.5.orig/src/lxc/lxc_process.c
+++ libvirt-1.3.5/src/lxc/lxc_process.c
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
}
networkReleaseActualDevice(vm->def, iface);
}
+ virFileWaitForDevices();
virDomainConfVMNWFilterTeardown(vm);