diff options
| author | Fiona Ebner <f.ebner@proxmox.com> | 2023-10-31 14:54:24 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-10-31 18:20:29 +0100 |
| commit | 058cfca5645a9ed7cb2bdb77d15f2eacaf343694 (patch) | |
| tree | b2c79cdb099353eef066889b763c1cdafbbca2dc /block | |
| parent | c45d0e1af0b9e8fa0b0abc30bd6a4ef8d37964b4 (diff) | |
| download | qemu-058cfca5645a9ed7cb2bdb77d15f2eacaf343694.zip qemu-058cfca5645a9ed7cb2bdb77d15f2eacaf343694.tar.gz qemu-058cfca5645a9ed7cb2bdb77d15f2eacaf343694.tar.bz2 | |
block/mirror: move dirty bitmap to filter
In preparation to allow switching to active mode without draining.
Initialization of the bitmap in mirror_dirty_init() still happens with
the original/backing BlockDriverState, which should be fine, because
the mirror top has the same length.
Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20231031135431.393137-4-f.ebner@proxmox.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/block/mirror.c b/block/mirror.c index 1c2c00e..914d723 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1500,6 +1500,11 @@ bdrv_mirror_top_do_write(BlockDriverState *bs, MirrorMethod method, abort(); } + if (!copy_to_target && s->job && s->job->dirty_bitmap) { + s->job->actively_synced = false; + bdrv_set_dirty_bitmap(s->job->dirty_bitmap, offset, bytes); + } + if (ret < 0) { goto out; } @@ -1823,13 +1828,17 @@ static BlockJob *mirror_start_job( s->should_complete = true; } - s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); + s->dirty_bitmap = bdrv_create_dirty_bitmap(s->mirror_top_bs, granularity, + NULL, errp); if (!s->dirty_bitmap) { goto fail; } - if (s->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING) { - bdrv_disable_dirty_bitmap(s->dirty_bitmap); - } + + /* + * The dirty bitmap is set by bdrv_mirror_top_do_write() when not in active + * mode. + */ + bdrv_disable_dirty_bitmap(s->dirty_bitmap); ret = block_job_add_bdrv(&s->common, "source", bs, 0, BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE | |