On 06/12/2014 02:45 AM, Peter Krempa wrote:
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.
>
> @@ -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?
Yeah, fallout from an earlier attempt to do:
bool blocking = vshCommandOptBool(...) || pivot || finish;
before deciding to add timeout to the list of options that auto-implies
blocking. I'll drop this hunk.
> int timeout = 0;
> struct sigaction sig_action;
> struct sigaction old_sig_action;
ACK,
Pushing shortly, as fixed.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org