[libvirt] [PATCH 1/2] virsh: don't lie about reconnection in vshReconnect
Ján Tomko
jtomko at redhat.com
Thu Dec 13 13:08:00 UTC 2012
Since we (ab)use vshReconnect for the default URI connection, if it
fails it might print 'Failed to reconnect to the hypervisor' even if we
were never connected before.
This changes it to only mention reconnection on the first try after
getting disconnected.
---
tools/virsh.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index b4829a3..9845b12 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -331,7 +331,10 @@ vshReconnect(vshControl *ctl)
virConnectAuthPtrDefault,
ctl->readonly ? VIR_CONNECT_RO : 0);
if (!ctl->conn) {
- vshError(ctl, "%s", _("Failed to reconnect to the hypervisor"));
+ if (disconnected)
+ vshError(ctl, "%s", _("Failed to reconnect to the hypervisor"));
+ else
+ vshError(ctl, "%s", _("failed to connect to the hypervisor"));
} else {
if (virConnectRegisterCloseCallback(ctl->conn, vshCatchDisconnect,
NULL, NULL) < 0)
--
1.7.8.6
More information about the libvir-list
mailing list