SHA256
1
0
forked from pool/libvirt
libvirt/lxc-wait-after-eth-del.patch
James Fehlig 061a75b436 Accepting request 959272 from home:jfehlig:branches:Virtualization
- qemu: Fix segmentation fault in qemuDomainUndefineFlags
  823a62ec-qemu-fix-undefine-crash.patch

- Update to libvirt 8.1.0
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html#v8-1-0-2022-03-01
  - Dropped patches:
    3be5ba11-libvirt-guests-install.patch,
    16172741-libvirt-guests-manpage.patch,
    8eb44616-remove-sysconfig-files.patch,
    31e937fb-libxl-save-lock-indicator.patch,
    105dace2-revert-virProcessGetStatInfo.patch,
    e0241f33-libxl-mark-allocated-graphics-ports.patch,
    18ec405a-libxl-release-graphics-ports.patch,
    76deb656-qemu-fix-snapshot-revert.patch,
    454b927d-libxl-fix-dom-restore.patch

OBS-URL: https://build.opensuse.org/request/show/959272
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=925
2022-03-03 17:31:09 +00:00

76 lines
2.6 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-8.1.0/src/lxc/lxc_controller.c
===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.1.0/src/lxc/lxc_controller.c
@@ -1998,6 +1998,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
}
+ virWaitForDevices();
return ret;
}
Index: libvirt-8.1.0/src/lxc/lxc_driver.c
===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.1.0/src/lxc/lxc_driver.c
@@ -67,6 +67,7 @@
#include "virtime.h"
#include "virtypedparam.h"
#include "viruri.h"
+#include "virutil.h"
#include "virstring.h"
#include "viraccessapicheck.h"
#include "viraccessapichecklxc.h"
@@ -3511,6 +3512,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth));
+ virWaitForDevices();
break;
case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -3950,6 +3952,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-8.1.0/src/lxc/lxc_process.c
===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.1.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@
#include "virstring.h"
#include "virprocess.h"
#include "virsystemd.h"
+#include "virutil.h"
#include "netdev_bandwidth_conf.h"
#include "virutil.h"
@@ -245,6 +246,7 @@ static void virLXCProcessCleanup(virLXCD
VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
}
}
+ virWaitForDevices();
virDomainConfVMNWFilterTeardown(vm);