提交 68e1a05f 编写于 作者: P Peter Krempa

virsh: snapshot: Don't block --no-metadata with --print-xml

When testing stuff you might want to print the XML. Interlocking it with
no metadata adds exactly 0 value to the user.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 d79ec3f3
...@@ -369,14 +369,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) ...@@ -369,14 +369,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd)
unsigned int flags = 0; unsigned int flags = 0;
const vshCmdOpt *opt = NULL; const vshCmdOpt *opt = NULL;
if (vshCommandOptBool(cmd, "no-metadata")) { if (vshCommandOptBool(cmd, "no-metadata"))
if (vshCommandOptBool(cmd, "print-xml")) {
vshError(ctl, "%s",
_("--print-xml is incompatible with --no-metadata"));
return false;
}
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA; flags |= VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA;
}
if (vshCommandOptBool(cmd, "halt")) if (vshCommandOptBool(cmd, "halt"))
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_HALT; flags |= VIR_DOMAIN_SNAPSHOT_CREATE_HALT;
if (vshCommandOptBool(cmd, "disk-only")) if (vshCommandOptBool(cmd, "disk-only"))
......
...@@ -4653,7 +4653,7 @@ metadata is silently lost when the domain quits running (whether ...@@ -4653,7 +4653,7 @@ metadata is silently lost when the domain quits running (whether
by command such as B<destroy> or by internal guest action). by command such as B<destroy> or by internal guest action).
=item B<snapshot-create-as> I<domain> {[I<--print-xml>] =item B<snapshot-create-as> I<domain> {[I<--print-xml>]
| [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>] [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>]
[I<description>] [I<--disk-only> [I<--quiesce>]] [I<--atomic>] [I<description>] [I<--disk-only> [I<--quiesce>]] [I<--atomic>]
[[I<--live>] [I<--memspec> B<memspec>]] [I<--diskspec>] B<diskspec>]... [[I<--live>] [I<--memspec> B<memspec>]] [I<--diskspec>] B<diskspec>]...
...@@ -4703,7 +4703,7 @@ If I<--no-metadata> is specified, then the snapshot data is created, ...@@ -4703,7 +4703,7 @@ If I<--no-metadata> is specified, then the snapshot data is created,
but any metadata is immediately discarded (that is, libvirt does not but any metadata is immediately discarded (that is, libvirt does not
treat the snapshot as current, and cannot revert to the snapshot treat the snapshot as current, and cannot revert to the snapshot
unless B<snapshot-create> is later used to teach libvirt about the unless B<snapshot-create> is later used to teach libvirt about the
metadata again). This flag is incompatible with I<--print-xml>. metadata again).
If I<--atomic> is specified, libvirt will guarantee that the snapshot If I<--atomic> is specified, libvirt will guarantee that the snapshot
either succeeds, or fails with no changes; not all hypervisors support either succeeds, or fails with no changes; not all hypervisors support
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册