block/mirror: Make cancel always cancel pre-READY
commiteb36639f7bbc16055e551593b81365e8ae3b0b05
authorMax Reitz <mreitz@redhat.com>
Tue, 1 May 2018 22:05:08 +0000 (2 00:05 +0200)
committerJeff Cody <jcody@redhat.com>
Tue, 8 May 2018 14:47:27 +0000 (8 10:47 -0400)
tree9ee711af952551dfeac083cbe8d108524b6f0960
parentddc4115efdfa6619689fe18871aa2d37890b3463
block/mirror: Make cancel always cancel pre-READY

Commit b76e4458b1eb3c32e9824fe6aa51f67d2b251748 made the mirror block
job respect block-job-cancel's @force flag: With that flag set, it would
now always really cancel, even post-READY.

Unfortunately, it had a side effect: Without that flag set, it would now
never cancel, not even before READY.  Considering that is an
incompatible change and not noted anywhere in the commit or the
description of block-job-cancel's @force parameter, this seems
unintentional and we should revert to the previous behavior, which is to
immediately cancel the job when block-job-cancel is called before source
and target are in sync (i.e. before the READY event).

Cc: qemu-stable@nongnu.org
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1572856
Reported-by: Yanan Fu <yfu@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180501220509.14152-2-mreitz@redhat.com
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
block/mirror.c