shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

virsh: cmdUndefine: Properly extract delete-storage-volume-snapshots flag

Browse Source 
Commit 86608f787e 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>
This commit is contained in:
Peter Krempa 2020-04-09 15:25:35 +02:00
parent 4aea6f42fe
commit a33046f3c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/virsh-domain.c
View File

@ -3658,7 +3658,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
bool checkpoints_metadata = vshCommandOptBool(cmd, "checkpoints-metadata"); bool checkpoints_metadata = vshCommandOptBool(cmd, "checkpoints-metadata");
bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage");
bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-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 nvram = vshCommandOptBool(cmd, "nvram");
bool keep_nvram = vshCommandOptBool(cmd, "keep-nvram"); bool keep_nvram = vshCommandOptBool(cmd, "keep-nvram");
/* Positive if these items exist. */ /* Positive if these items exist. */
@ -3687,7 +3687,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
size_t j; size_t j;
virshControlPtr priv = ctl->privData; 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"); VSH_EXCLUSIVE_OPTIONS("nvram", "keep-nvram");
ignore_value(vshCommandOptStringQuiet(ctl, cmd, "storage", &vol_string)); ignore_value(vshCommandOptStringQuiet(ctl, cmd, "storage", &vol_string));