From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 26 Jul 2012 09:24:30 +0000 (+0200)
Subject: virsh: Fix error resetting on fallback paths
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2751ab289bad78ff3da59d164859598ef52d7802;p=libvirt.git

virsh: Fix error resetting on fallback paths

On some fallback paths in virsh, error reported by the previously failed
API is cleared by virResetLastError() that doesn't free error stored by
virsh. This patch changes this to clear it using vshResetLibvirtError().
---

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 65a9808d16..151a8d00ac 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -66,7 +66,7 @@ vshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title,
 
         if (err && err->code == VIR_ERR_NO_DOMAIN_METADATA) {
             desc = vshStrdup(ctl, "");
-            virResetLastError();
+            vshResetLibvirtError();
             return desc;
         }
 
@@ -1362,7 +1362,7 @@ vshDomainListCollect(vshControl *ctl, unsigned int flags)
 
 fallback:
     /* fall back to old method (0.9.12 and older) */
-    virResetLastError();
+    vshResetLibvirtError();
 
     /* list active domains, if necessary */
     if (!MATCH(VIR_CONNECT_LIST_FILTERS_ACTIVE) ||
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 92f0d6ce38..d6de3da57c 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -704,7 +704,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd)
     if (current < 0) {
         virDomainSnapshotPtr other = virDomainSnapshotCurrent(dom, 0);
 
-        virResetLastError();
+        vshResetLibvirtError();
         current = 0;
         if (other) {
             if (STREQ(name, virDomainSnapshotGetName(other)))
@@ -759,7 +759,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd)
     if (metadata < 0) {
         metadata = virDomainSnapshotNum(dom,
                                         VIR_DOMAIN_SNAPSHOT_LIST_METADATA);
-        virResetLastError();
+        vshResetLibvirtError();
     }
     if (metadata >= 0)
         vshPrint(ctl, "%-15s %s\n", _("Metadata:"),