[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] block/dirty-bitmap: add bdrv_has_named_bitmaps helper
From: |
Eric Blake |
Subject: |
[PULL 02/11] block/dirty-bitmap: add bdrv_has_named_bitmaps helper |
Date: |
Tue, 26 May 2020 11:42:02 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-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 5a8d52e4deaf..36e8da4fc2e3 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 f9bfc77985e8..c01319b188c3 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.26.2
- [PULL 00/11] bitmaps patches for 2020-05-26, Eric Blake, 2020/05/26
- [PULL 01/11] migration: refactor init_dirty_bitmap_migration, Eric Blake, 2020/05/26
- [PULL 02/11] block/dirty-bitmap: add bdrv_has_named_bitmaps helper,
Eric Blake <=
- [PULL 03/11] migration: fix bitmaps pre-blockdev migration with mirror job, Eric Blake, 2020/05/26
- [PULL 05/11] migration: add_bitmaps_to_list: check disk name once, Eric Blake, 2020/05/26
- [PULL 06/11] migration: forbid bitmap migration by generated node-name, Eric Blake, 2020/05/26
- [PULL 04/11] iotests: 194: test also migration of dirty bitmap, Eric Blake, 2020/05/26
- [PULL 08/11] qcow2: Expose bitmaps' size during measure, Eric Blake, 2020/05/26
- [PULL 07/11] iotests: Fix test 178, Eric Blake, 2020/05/26
- [PULL 09/11] qemu-img: Factor out code for merging bitmaps, Eric Blake, 2020/05/26
- [PULL 10/11] qemu-img: Add convert --bitmaps option, Eric Blake, 2020/05/26
- [PULL 11/11] iotests: Add test 291 to for qemu-img bitmap coverage, Eric Blake, 2020/05/26
- Re: [PULL 00/11] bitmaps patches for 2020-05-26, Peter Maydell, 2020/05/27