]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virsh: fix report of non-active commit completion
authorEric Blake <eblake@redhat.com>
Fri, 13 Mar 2015 15:56:48 +0000 (09:56 -0600)
committerEric Blake <eblake@redhat.com>
Sun, 15 Mar 2015 02:53:33 +0000 (20:53 -0600)
Commit f182da20 (v1.2.6) caused a slight regression in virsh
reporting of a non-active block job; where it used to state
"Commit complete", it now states "Now in synchronized phase".
But the synchronized phase is only possible for an active commit.

For a reproducer, I created a chain 'a <- b <- c <- d <- e' and
ran virsh blockcommit $dom vda --top c --base a --verbose --wait

* tools/virsh-domain.c (cmdBlockCommit): Synchronized phase is
only possible on active commits.

Signed-off-by: Eric Blake <eblake@redhat.com>
tools/virsh-domain.c

index 1a364bbd6c438cf74de101739e7e4eff88d878e0..b4e9cb0bf2524e18475a4d17c91bd2023089264e 100644 (file)
@@ -2018,7 +2018,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, "\n%s", _("Commit aborted"));
     else if (pivot)
         vshPrint(ctl, "\n%s", _("Successfully pivoted"));
-    else if (!finish)
+    else if (!finish && active)
         vshPrint(ctl, "\n%s", _("Now in synchronized phase"));
     else
         vshPrint(ctl, "\n%s", _("Commit complete"));