External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: add missing "async" option in opts_block_commit

Browse Source 
After commit 8aecd35126 it'll detect
that a required option is not defined and it will assert and exit with:

virsh.c:1364: vshCommandOpt: Assertion `valid->name' failed.

Problem has been latent since commit ed23b106.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Simone Gotti 2013-09-19 15:08:29 +02:00 committed by Eric Blake
parent 2cf3a4e526
commit fe64499dd1
2 changed files with 9 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

@ -1544,6 +1544,10 @@ static const vshCmdOptDef opts_block_commit[] = {
.type = VSH_OT_INT, .type = VSH_OT_INT,
.help = N_("with --wait, abort if copy exceeds timeout (in seconds)") .help = N_("with --wait, abort if copy exceeds timeout (in seconds)")
}, },
{.name = "async",
.type = VSH_OT_BOOL,
.help = N_("with --wait, don't wait for cancel to finish")
},
{.name = NULL} {.name = NULL}
}; };

7
tools/virsh.pod
View File

@ -737,7 +737,7 @@ I<domif-setlink>) will accept the MAC address printed by this command.
=item B<blockcommit> I<domain> I<path> [I<bandwidth>] =item B<blockcommit> I<domain> I<path> [I<bandwidth>]
{[I<base>] | [I<--shallow>]} [I<top>] [I<--delete>] {[I<base>] | [I<--shallow>]} [I<top>] [I<--delete>]
[I<--wait> [I<--verbose>] [I<--timeout> B<seconds>]] [I<--wait> [I<--verbose>] [I<--timeout> B<seconds>] [I<--async>]]
Reduce the length of a backing image chain, by committing changes at the Reduce the length of a backing image chain, by committing changes at the
top of the chain (snapshot or delta files) into backing images. By top of the chain (snapshot or delta files) into backing images. By
@ -756,7 +756,10 @@ operation can be checked with B<blockjob>. However, if I<--wait> is
specified, then this command will block until the operation completes, specified, then this command will block until the operation completes,
or cancel the operation if the optional I<timeout> in seconds elapses or cancel the operation if the optional I<timeout> in seconds elapses
or SIGINT is sent (usually with C<Ctrl-C>). Using I<--verbose> along or SIGINT is sent (usually with C<Ctrl-C>). Using I<--verbose> along
with I<--wait> will produce periodic status updates. with I<--wait> will produce periodic status updates. If job cancellation
is triggered, I<--async> will return control to the user as fast as
possible, otherwise the command may continue to block a little while
longer until the job is done cleaning up.
I<path> specifies fully-qualified path of the disk; it corresponds I<path> specifies fully-qualified path of the disk; it corresponds
to a unique target name (<target dev='name'/>) or source file (<source to a unique target name (<target dev='name'/>) or source file (<source