From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 14 Jun 2012 12:18:31 +0000 (+0200)
Subject: virsh: Report name from edited object
X-Git-Tag: v0.9.13-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79521a5e5b6f1427060217d8791ae946952ea934;p=thirdparty%2Flibvirt.git

virsh: Report name from edited object

There is a little easter egg in virsh: one can easily clone
an object (domain, network, ...). Just 'virsh edit' change the name
and remove <uuid>. And then, in the end when reporting success
the new name was printed out.
However, with recent edit rewrite we lost the final part and are
still printing the original name out.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 6077d84b32..df0a3e9b8e 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -8612,7 +8612,7 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd)
 #include "virsh-edit.c"
 
     vshPrint(ctl, _("Interface %s XML configuration edited.\n"),
-             virInterfaceGetName(iface));
+             virInterfaceGetName(iface_edited));
 
     ret = true;
 
@@ -10006,7 +10006,7 @@ cmdNWFilterEdit(vshControl *ctl, const vshCmd *cmd)
 #include "virsh-edit.c"
 
     vshPrint(ctl, _("Network filter %s XML configuration edited.\n"),
-             virNWFilterGetName(nwfilter));
+             virNWFilterGetName(nwfilter_edited));
 
     ret = true;
 
@@ -15811,7 +15811,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd)
 #include "virsh-edit.c"
 
     vshPrint(ctl, _("Domain %s XML configuration edited.\n"),
-             virDomainGetName(dom));
+             virDomainGetName(dom_edited));
 
     ret = true;
 
@@ -15883,7 +15883,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd)
 #include "virsh-edit.c"
 
     vshPrint(ctl, _("Network %s XML configuration edited.\n"),
-             virNetworkGetName(network));
+             virNetworkGetName(network_edited));
 
     ret = true;
 
@@ -15938,7 +15938,7 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd)
 #include "virsh-edit.c"
 
     vshPrint(ctl, _("Pool %s XML configuration edited.\n"),
-             virStoragePoolGetName(pool));
+             virStoragePoolGetName(pool_edited));
 
     ret = true;