From 44574a8789c4e97b0cf4ec020aec1f3927572b3a Mon Sep 17 00:00:00 2001
From: Guannan Ren <gren@redhat.com>
Date: Wed, 22 Aug 2012 04:37:34 +0800
Subject: [PATCH] virsh: don't print error info when snapshot xml is not
 changed

If xml is not changed, error message is printed.
So check ret value instead of edit variable for error message.
---
 tools/virsh-snapshot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index aff91d3a8b..5d84f7a5fa 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -449,7 +449,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd)
                  _("Snapshot %s XML configuration not changed.\n"), \
                  name);                                             \
         ret = true;                                                 \
-        goto cleanup;                                               \
+        goto edit_cleanup;                                          \
     }
 #define EDIT_DEFINE \
     (strstr(doc, "<state>disk-snapshot</state>") ? \
@@ -487,10 +487,10 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd)
     ret = true;
 
 cleanup:
+    if (!ret)
+        vshError(ctl, _("Failed to update %s"), name);
     if (edited)
         virDomainSnapshotFree(edited);
-    else
-        vshError(ctl, _("Failed to update %s"), name);
     if (snapshot)
         virDomainSnapshotFree(snapshot);
     if (dom)