summaryrefslogtreecommitdiff
path: root/block/mirror.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/mirror.c')
-rw-r--r--block/mirror.c12
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);
}