virsh: Add --print-xml flag for 'vol-clone' command

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
index 14ed9cd5a06f44cb70da2dd3f56405f17a67e7b9..c85bc8151d255a8fb953a6b45776b0ed75073ac7 100644 (file)
--- a/docs/manpages/virsh.rst
+++ b/docs/manpages/virsh.rst
@@ -6719,7 +6719,7 @@ vol-clone
 ::
 
    vol-clone vol-name-or-key-or-path name
-      [--pool pool-or-uuid] [--prealloc-metadata] [--reflink]
+      [--pool pool-or-uuid] [--prealloc-metadata] [--reflink] [--print-xml]
 
 Clone an existing volume within the parent pool.  Less powerful,
 but easier to type, version of ``vol-create-from``.
@@ -6743,6 +6743,9 @@ When *--reflink* is specified, perform a COW lightweight copy,
 where the data blocks are copied only when modified.
 If this is not possible, the copy fails.
 
+If *--print-xml* is specified, then the XML used to clone the volume is
+printed instead.
+
 
 vol-delete
 ----------

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 508c620cd3a655816a8b1df4f85dbfc8ea1388d9..fbbeddd8f334ff0fd7206bd7b9e77717624d959d 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -559,6 +559,10 @@ static const vshCmdOptDef opts_vol_clone[] = {
      .type = VSH_OT_BOOL,
      .help = N_("use btrfs COW lightweight copy")
     },
+    {.name = "print-xml",
+     .type = VSH_OT_BOOL,
+     .help = N_("print XML document rather than clone the volume")
+    },
     {.name = NULL}
 };
 
@@ -599,6 +603,11 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd)
         return false;
     }
 
+    if (vshCommandOptBool(cmd, "print-xml")) {
+        vshPrint(ctl, "%s", newxml);
+        return true;
+    }
+
     if (!(newvol = virStorageVolCreateXMLFrom(origpool, (char *) newxml,
                                               origvol, flags))) {
         vshError(ctl, _("Failed to clone vol from %s"),