[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 2/6] block/dirty-bitmap: add bdrv_has_named_bitmaps helper
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 2/6] block/dirty-bitmap: add bdrv_has_named_bitmaps helper |
Date: |
Fri, 22 May 2020 01:06:44 +0300 |
To be used for bitmap migration in further commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/block/dirty-bitmap.h | 1 +
block/dirty-bitmap.c | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 5a8d52e4de..36e8da4fc2 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -95,6 +95,7 @@ int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap);
void bdrv_dirty_bitmap_truncate(BlockDriverState *bs, int64_t bytes);
bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);
bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);
+bool bdrv_has_named_bitmaps(BlockDriverState *bs);
bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);
bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap);
bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap);
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index f9bfc77985..c01319b188 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -818,6 +818,19 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs)
return false;
}
+bool bdrv_has_named_bitmaps(BlockDriverState *bs)
+{
+ BdrvDirtyBitmap *bm;
+
+ QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {
+ if (bdrv_dirty_bitmap_name(bm)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
/* Called with BQL taken. */
void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap, bool
persistent)
{
--
2.21.0
- [PATCH v4 0/6] fix migration with bitmaps and mirror, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 1/6] migration/block-dirty-bitmap: refactor init_dirty_bitmap_migration, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 2/6] block/dirty-bitmap: add bdrv_has_named_bitmaps helper,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 3/6] migration/block-dirty-bitmap: fix bitmaps pre-blockdev migration during mirror job, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 4/6] iotests: 194: test also migration of dirty bitmap, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 5/6] migration/block-dirty-bitmap: add_bitmaps_to_list: check disk name once, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 6/6] migration/block-dirty-bitmap: forbid migration by generated node-name, Vladimir Sementsov-Ogievskiy, 2020/05/21
- Re: [PATCH v4 0/6] fix migration with bitmaps and mirror, Eric Blake, 2020/05/22