From: Laine Stump <laine@laine.org>
Date: Tue, 25 Apr 2017 16:26:43 +0000 (-0400)
Subject: network: better log message when network is inactive during reconnect
X-Git-Tag: v3.3.0-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7949de960eaba07661c1e0ab6e4aa945db8c1b25;p=thirdparty%2Flibvirt.git

network: better log message when network is inactive during reconnect

If the network isn't active during networkNotifyActualDevice(), we
would log an error message stating that the bridge device didn't
exist. This patch adds a check to see if the network is active, making
the logs more useful in the case that it isn't.

Partially resolves: https://bugzilla.redhat.com/1442700
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index d18b15b71e..3ba70180b8 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4675,6 +4675,13 @@ networkNotifyActualDevice(virDomainDefPtr dom,
     }
     netdef = network->def;
 
+    if (!virNetworkObjIsActive(network)) {
+        virReportError(VIR_ERR_OPERATION_INVALID,
+                       _("network '%s' is not active"),
+                       netdef->name);
+        goto error;
+    }
+
     /* if we're restarting libvirtd after an upgrade from a version
      * that didn't save bridge name in actualNetDef for
      * actualType==network, we need to copy it in so that it will be