]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virsh: cmdUndefine: Properly extract delete-storage-volume-snapshots flag
authorPeter Krempa <pkrempa@redhat.com>
Thu, 9 Apr 2020 13:25:35 +0000 (15:25 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 14 Apr 2020 16:43:48 +0000 (18:43 +0200)
Commit 86608f787ee added the above flag as an alias for ambiguous
'delete-snapshots' flag, but forgot to actually change the code that
extracts it, thus the new version actually doesn't work.

https://bugzilla.redhat.com/show_bug.cgi?id=1821988

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

index 2dc7c38b55c7126a65ed2416795311646fb28ab0..d52eb7bc2f31326e908fb2544259b9084646855b 100644 (file)
@@ -3658,7 +3658,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
     bool checkpoints_metadata = vshCommandOptBool(cmd, "checkpoints-metadata");
     bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage");
     bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-storage");
-    bool delete_snapshots = vshCommandOptBool(cmd, "delete-snapshots");
+    bool delete_snapshots = vshCommandOptBool(cmd, "delete-storage-volume-snapshots");
     bool nvram = vshCommandOptBool(cmd, "nvram");
     bool keep_nvram = vshCommandOptBool(cmd, "keep-nvram");
     /* Positive if these items exist.  */
@@ -3687,7 +3687,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
     size_t j;
     virshControlPtr priv = ctl->privData;
 
-    VSH_REQUIRE_OPTION("delete-snapshots", "remove-all-storage");
+    VSH_REQUIRE_OPTION("delete-storage-volume-snapshots", "remove-all-storage");
     VSH_EXCLUSIVE_OPTIONS("nvram", "keep-nvram");
 
     ignore_value(vshCommandOptStringQuiet(ctl, cmd, "storage", &vol_string));