diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-08 17:05:58 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-08 17:05:58 +0100 |
commit | e5cd695266c5709308aa95b1baae499e4b5d4544 (patch) | |
tree | f51fe9e7dfa9e86b42dab4c14617dce7ca848b8a /block/mirror.c | |
parent | cc8f8ba754bba17eea9791d67b572eb26e30b4ce (diff) | |
parent | a2cb9239b7610ffb00f9ced5cd7640d40b0e1ccf (diff) | |
download | qemu-e5cd695266c5709308aa95b1baae499e4b5d4544.tar.gz |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 08 May 2018 16:18:22 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
sheepdog: Fix sd_co_create_opts() memory leaks
iotests: Add test for cancelling a mirror job
block/mirror: Make cancel always cancel pre-READY
block/mirror: honor ratelimit again
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/mirror.c')
-rw-r--r-- | block/mirror.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/block/mirror.c b/block/mirror.c index 820f512c7b..99da9c0858 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -868,12 +868,16 @@ static void coroutine_fn mirror_run(void *opaque) } ret = 0; + + if (s->synced && !should_complete) { + delay_ns = (s->in_flight == 0 && cnt == 0 ? SLICE_TIME : 0); + } trace_mirror_before_sleep(s, cnt, s->synced, delay_ns); - if (block_job_is_cancelled(&s->common) && s->common.force) { + block_job_sleep_ns(&s->common, delay_ns); + if (block_job_is_cancelled(&s->common) && + (!s->synced || s->common.force)) + { break; - } else if (!should_complete) { - delay_ns = (s->in_flight == 0 && cnt == 0 ? SLICE_TIME : 0); - block_job_sleep_ns(&s->common, delay_ns); } s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); } |