block/replication.c: Avoid cancelling the job twice
PATCH 1/1 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.
--- block/replication.c | 2 ++ 1 file changed, 2 insertions(+)
block/replication.c +2 -0
@@ -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 ;
Signature · 1 line
2.20.1
Kevin Wolf
AppliedAm 11.05.2020 um 09:08 hat Lukas Straub geschrieben:
Quoted 9 lines
If qemu in colo secondary mode is stopped, it crashes because
s->backup_jobis canceled twice: First withjob_cancel_sync_all()inqemu_cleanup()and then inreplication_stop().Fix this by assigning NULL to
s->backup_jobwhen the job completes soreplication_stop()andreplication_do_checkpoint()won't touch the job.Signed-off-by Lukas Straub <[email protected]>
Thanks, applied to the block branch.
Kevin