render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
Blob Blame History Raw
From 20832604f4fb7568148bcf277452a2981ff2456d Mon Sep 17 00:00:00 2001
Message-Id: <20832604f4fb7568148bcf277452a2981ff2456d.1381871411.git.jdenemar@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 7 Oct 2013 17:17:27 +0100
Subject: [PATCH] Don't set netdev offline in container cleanup

For

  https://bugzilla.redhat.com/show_bug.cgi?id=1014604

During container cleanup there is a race where the kernel may
have destroyed the veth device before we try to set it offline.
This causes log error messages. Given that we're about to
delete the device entirely, setting it offline is pointless.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit f5eae5708623401f50a07729283624423894ed68)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/lxc/lxc_process.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 0a28305..bc9bdfb 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -192,7 +192,6 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
         virDomainNetDefPtr iface = vm->def->nets[i];
         vport = virDomainNetGetActualVirtPortProfile(iface);
         if (iface->ifname) {
-            ignore_value(virNetDevSetOnline(iface->ifname, false));
             if (vport &&
                 vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
                 ignore_value(virNetDevOpenvswitchRemovePort(
-- 
1.8.3.2