jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>
(cherry picked from commit eb36639f7bbc16055e551593b81365e8ae3b0b05)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

authored by

Max Reitz and committed by
Michael Roth 1eddfab3 3882183f

+3 -1
+3 -1
block/mirror.c
··· 874 874 } 875 875 trace_mirror_before_sleep(s, cnt, s->synced, delay_ns); 876 876 block_job_sleep_ns(&s->common, delay_ns); 877 - if (block_job_is_cancelled(&s->common) && s->common.force) { 877 + if (block_job_is_cancelled(&s->common) && 878 + (!s->synced || s->common.force)) 879 + { 878 880 break; 879 881 } 880 882 s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);