aboutsummaryrefslogtreecommitdiff
path: root/block/replication.c
diff options
context:
space:
mode:
authorLukas Straub <lukasstraub2@web.de>2020-05-11 09:08:01 +0200
committerKevin Wolf <kwolf@redhat.com>2020-05-18 19:05:25 +0200
commite140f4b7b8c0fdda866ba3d8b4aa184b6ba6d6b8 (patch)
tree9b72a7f2703fa404d4a63cac58fa69bdd1aaa4c1 /block/replication.c
parent16cea4ee1c8e5a69a058e76f426b2e17974d8d7d (diff)
block/replication.c: Avoid cancelling the job twice
If qemu in colo secondary mode is stopped, it crashes because s->backup_job is canceled twice: First with job_cancel_sync_all() in qemu_cleanup() and then in replication_stop(). Fix this by assigning NULL to s->backup_job when the job completes so replication_stop() and replication_do_checkpoint() won't touch the job. Signed-off-by: Lukas Straub <lukasstraub2@web.de> Message-Id: <20200511090801.7ed5d8f3@luklap> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/replication.c')
-rw-r--r--block/replication.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/replication.c b/block/replication.c
index 971f0fe266..c03980a192 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -398,6 +398,8 @@ static void backup_job_cleanup(BlockDriverState *bs)
BDRVReplicationState *s = bs->opaque;
BlockDriverState *top_bs;
+ s->backup_job = NULL;
+
top_bs = bdrv_lookup_bs(s->top_id, s->top_id, NULL);
if (!top_bs) {
return;