On 06/11/14 18:27, Eric Blake wrote:
Peter's review of my addition of active block commit pointed out some issues that I had copied from block copy. It makes sense to allow the shorter command-line of 'blockcopy $dom $disk --pivot' without having to explicitly specify --wait. And my use of embedded ?: ternaries bordered on unreadable.
* tools/virsh-domain.c (cmdBlockCopy): Make --pivot and --finish imply --wait. Drop excess ?: operators. * tools/virsh.pod (blockcopy): Update documentation.
Signed-off-by: Eric Blake <eblake@redhat.com> --- tools/virsh-domain.c | 25 ++++++++++++++----------- tools/virsh.pod | 17 +++++++++-------- 2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e9162db..294b594 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c
@@ -1808,10 +1808,10 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; bool ret = false; - bool blocking = vshCommandOptBool(cmd, "wait"); bool verbose = vshCommandOptBool(cmd, "verbose"); bool pivot = vshCommandOptBool(cmd, "pivot"); bool finish = vshCommandOptBool(cmd, "finish"); + bool blocking = vshCommandOptBool(cmd, "wait");
Spurious line move?
int timeout = 0; struct sigaction sig_action; struct sigaction old_sig_action;
ACK, Peter