diff options
| author | Lukas Straub <lukasstraub2@web.de> | 2021-07-18 16:48:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-07-20 16:11:53 +0200 |
| commit | c2cf0ecab5455f41ab56c131b21e153a3befa8b0 (patch) | |
| tree | bbd08ea3093fdc11a9bef3eaa7cf1df79ab1a281 | |
| parent | 3b78420bb14f7e439a079aee28eeec997a229c5e (diff) | |
| download | qemu-c2cf0ecab5455f41ab56c131b21e153a3befa8b0.zip qemu-c2cf0ecab5455f41ab56c131b21e153a3befa8b0.tar.gz qemu-c2cf0ecab5455f41ab56c131b21e153a3befa8b0.tar.bz2 | |
replication: Remove workaround
Remove the workaround introduced in commit
6ecbc6c52672db5c13805735ca02784879ce8285
"replication: Avoid blk_make_empty() on read-only child".
It is not needed anymore since s->hidden_disk is guaranteed to be
writable when secondary_do_checkpoint() runs. Because replication_start(),
_do_checkpoint() and _stop() are only called by COLO migration code
and COLO-migration activates all disks via bdrv_invalidate_cache_all()
before it calls these functions.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <d3acfad43879e9f376bffa7dd797ae74d0a7c81a.1626619393.git.lukasstraub2@web.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/replication.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/block/replication.c b/block/replication.c index b74192f..32444b9 100644 --- a/block/replication.c +++ b/block/replication.c @@ -346,17 +346,7 @@ static void secondary_do_checkpoint(BlockDriverState *bs, Error **errp) return; } - BlockBackend *blk = blk_new(qemu_get_current_aio_context(), - BLK_PERM_WRITE, BLK_PERM_ALL); - blk_insert_bs(blk, s->hidden_disk->bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); - blk_unref(blk); - return; - } - - ret = blk_make_empty(blk, errp); - blk_unref(blk); + ret = bdrv_make_empty(s->hidden_disk, errp); if (ret < 0) { return; } |