[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 19/33] block/copy-before-write: initialize block-copy bitmap
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 19/33] block/copy-before-write: initialize block-copy bitmap |
Date: |
Thu, 20 May 2021 17:21:51 +0300 |
We are going to publish copy-before-write filter to be used in separate
of backup. Future step would support bitmap for the filter. But let's
start from full set bitmap.
We have to modify backup, as bitmap is first initialized by
copy-before-write filter, and then backup modifies it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/backup.c | 16 +++++++---------
block/copy-before-write.c | 4 ++++
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index af17149f22..14652ac98a 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -233,18 +233,16 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
BdrvDirtyBitmap *bcs_bitmap = block_copy_dirty_bitmap(job->bcs);
if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
+ bdrv_clear_dirty_bitmap(bcs_bitmap, NULL);
ret = bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap,
NULL, true);
assert(ret);
- } else {
- if (job->sync_mode == MIRROR_SYNC_MODE_TOP) {
- /*
- * We can't hog the coroutine to initialize this thoroughly.
- * Set a flag and resume work when we are able to yield safely.
- */
- block_copy_set_skip_unallocated(job->bcs, true);
- }
- bdrv_set_dirty_bitmap(bcs_bitmap, 0, job->len);
+ } else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) {
+ /*
+ * We can't hog the coroutine to initialize this thoroughly.
+ * Set a flag and resume work when we are able to yield safely.
+ */
+ block_copy_set_skip_unallocated(job->bcs, true);
}
estimate = bdrv_get_dirty_count(bcs_bitmap);
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index e889af7b80..ba2466a328 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -147,6 +147,7 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild
*c,
static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp)
{
BDRVCopyBeforeWriteState *s = bs->opaque;
+ BdrvDirtyBitmap *copy_bitmap;
bool compress;
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
@@ -184,6 +185,9 @@ static int cbw_init(BlockDriverState *bs, QDict *options,
Error **errp)
return -EINVAL;
}
+ copy_bitmap = block_copy_dirty_bitmap(s->bcs);
+ bdrv_set_dirty_bitmap(copy_bitmap, 0, bdrv_dirty_bitmap_size(copy_bitmap));
+
return 0;
}
--
2.29.2
- [PATCH v2 16/33] block/copy-before-write: cbw_init(): rename variables, (continued)
- [PATCH v2 16/33] block/copy-before-write: cbw_init(): rename variables, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 17/33] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 25/33] iotests.py: VM: add own __enter__ method, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 18/33] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 26/33] iotests/222: fix pylint and mypy complains, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 20/33] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 22/33] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 27/33] iotests/222: constantly use single quotes for strings, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 29/33] iotests.py: hmp_qemu_io: support qdev, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 19/33] block/copy-before-write: initialize block-copy bitmap,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 21/33] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 24/33] python/qemu/machine: QEMUMachine: improve qmp() method, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 30/33] iotests/image-fleecing: proper source device, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 31/33] iotests/image-fleecing: rename tgt_node, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 32/33] iotests/image-fleecing: prepare for adding new test-case, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 33/33] iotests/image-fleecing: add test-case for copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/05/20
- Re: [PATCH v2 00/33] block: publish backup-top filter, Max Reitz, 2021/05/31