|
 |
6d3351 |
From c85276bfbfda6818ae1dddbe91d971cb26669044 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <c85276bfbfda6818ae1dddbe91d971cb26669044@dist-git>
|
|
|
6d3351 |
From: Laine Stump <laine@laine.org>
|
|
|
6d3351 |
Date: Tue, 2 May 2017 12:31:52 -0400
|
|
|
6d3351 |
Subject: [PATCH] network: better log message when network is inactive during
|
|
|
6d3351 |
reconnect
|
|
|
6d3351 |
|
|
|
6d3351 |
If the network isn't active during networkNotifyActualDevice(), we
|
|
|
6d3351 |
would log an error message stating that the bridge device didn't
|
|
|
6d3351 |
exist. This patch adds a check to see if the network is active, making
|
|
|
6d3351 |
the logs more useful in the case that it isn't.
|
|
|
6d3351 |
|
|
|
6d3351 |
Partially resolves: https://bugzilla.redhat.com/1442700
|
|
|
6d3351 |
|
|
|
6d3351 |
(cherry picked from commit 7949de960eaba07661c1e0ab6e4aa945db8c1b25)
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/network/bridge_driver.c | 7 +++++++
|
|
|
6d3351 |
1 file changed, 7 insertions(+)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
|
|
|
6d3351 |
index cb91a2c90..41bce794a 100644
|
|
|
6d3351 |
--- a/src/network/bridge_driver.c
|
|
|
6d3351 |
+++ b/src/network/bridge_driver.c
|
|
|
6d3351 |
@@ -4682,6 +4682,13 @@ networkNotifyActualDevice(virDomainDefPtr dom,
|
|
|
6d3351 |
}
|
|
|
6d3351 |
netdef = network->def;
|
|
|
6d3351 |
|
|
|
6d3351 |
+ if (!virNetworkObjIsActive(network)) {
|
|
|
6d3351 |
+ virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
6d3351 |
+ _("network '%s' is not active"),
|
|
|
6d3351 |
+ netdef->name);
|
|
|
6d3351 |
+ goto error;
|
|
|
6d3351 |
+ }
|
|
|
6d3351 |
+
|
|
|
6d3351 |
/* if we're restarting libvirtd after an upgrade from a version
|
|
|
6d3351 |
* that didn't save bridge name in actualNetDef for
|
|
|
6d3351 |
* actualType==network, we need to copy it in so that it will be
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|