diff mbox series

block/replication.c: Avoid cancelling the job twice

Message ID 20200511090801.7ed5d8f3@luklap (mailing list archive)
State New, archived
Headers show
Series block/replication.c: Avoid cancelling the job twice | expand

Commit Message

Lukas Straub May 11, 2020, 7:08 a.m. UTC 
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>
---
 block/replication.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Kevin Wolf May 13, 2020, 10:11 a.m. UTC | #1 
Am 11.05.2020 um 09:08 hat Lukas Straub geschrieben:
> 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>

Thanks, applied to the block branch.

Kevin
diff mbox series

Patch

diff --git a/block/replication.c b/block/replication.c
index da013c2041..33f2f62a44 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;