[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 01/16] block/block-copy: move copy_bitmap initialization to bl
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 01/16] block/block-copy: move copy_bitmap initialization to block_copy_state_new() |
Date: |
Mon, 28 Feb 2022 12:39:12 +0100 |
We are going to complicate bitmap initialization in the further
commit. And in future, backup job will be able to work without filter
(when source is immutable), so we'll need same bitmap initialization in
copy-before-write filter and in backup job. So, it's reasonable to do
it in block-copy.
Note that for now cbw_open() is the only caller of
block_copy_state_new().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block/block-copy.c | 1 +
block/copy-before-write.c | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index ce116318b5..abda7a80bd 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -402,6 +402,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
return NULL;
}
bdrv_disable_dirty_bitmap(copy_bitmap);
+ bdrv_set_dirty_bitmap(copy_bitmap, 0, bdrv_dirty_bitmap_size(copy_bitmap));
/*
* If source is in backing chain of target assume that target is going to
be
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index c30a5ff8de..5bdaf0a9d9 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -149,7 +149,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options,
int flags,
Error **errp)
{
BDRVCopyBeforeWriteState *s = bs->opaque;
- BdrvDirtyBitmap *copy_bitmap;
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
@@ -177,9 +176,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options,
int flags,
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.31.1
- [PATCH v5 00/16] Make image fleecing more usable, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 01/16] block/block-copy: move copy_bitmap initialization to block_copy_state_new(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 02/16] block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 04/16] block/copy-before-write: add bitmap open parameter, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 05/16] block/block-copy: add block_copy_reset(), Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 06/16] block: intoduce reqlist, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 07/16] block/reqlist: reqlist_find_conflict(): use ranges_overlap(), Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 03/16] block/block-copy: block_copy_state_new(): add bitmap parameter, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 10/16] block/io: introduce block driver snapshot-access API, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 08/16] block/dirty-bitmap: introduce bdrv_dirty_bitmap_status(), Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 11/16] block: introduce snapshot-access block driver, Vladimir Sementsov-Ogievskiy, 2022/02/28
- [PATCH v5 09/16] block/reqlist: add reqlist_wait_all(), Vladimir Sementsov-Ogievskiy, 2022/02/28