From ceec58ac9eaf14e2769f0a4c7ef66994e7c3b5f9 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 13 Mar 2015 09:56:48 -0600 Subject: [PATCH] virsh: fix report of non-active commit completion 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 --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1a364bbd6c..b4e9cb0bf2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -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"));