summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2021-04-09 14:04:19 +0200
committerKevin Wolf <kwolf@redhat.com>2021-04-09 18:00:29 +0200
commit00769414cd1044b823b65e66586e93bb79494441 (patch)
treeaaa6eda54e7311abb395b8e8aa9fdd5f0d6fbd91
parentc41f5b96ee73925c165036d59c4efa761826e800 (diff)
downloadfocaccia-qemu-00769414cd1044b823b65e66586e93bb79494441.tar.gz
focaccia-qemu-00769414cd1044b823b65e66586e93bb79494441.zip
mirror: Do not enter a paused job on completion
Currently, it is impossible to complete jobs on standby (i.e. paused
ready jobs), but actually the only thing in mirror_complete() that does
not work quite well with a paused job is the job_enter() at the end.

If we make it conditional, this function works just fine even if the
mirror job is paused.

So technically this is a no-op, but obviously the intention is to accept
block-job-complete even for jobs on standby, which we need this patch
for first.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210409120422.144040-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/mirror.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c
index f1f936bf1a..5a71bd8bbc 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1148,7 +1148,11 @@ static void mirror_complete(Job *job, Error **errp)
     }
 
     s->should_complete = true;
-    job_enter(job);
+
+    /* If the job is paused, it will be re-entered when it is resumed */
+    if (!job->paused) {
+        job_enter(job);
+    }
 }
 
 static void coroutine_fn mirror_pause(Job *job)