[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 52/85] block: release persistent bitmaps on inactivat
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 52/85] block: release persistent bitmaps on inactivate |
Date: |
Tue, 11 Jul 2017 18:07:41 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
We should release them here to reload on invalidate cache.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
include/block/dirty-bitmap.h | 1 +
block.c | 4 ++++
block/dirty-bitmap.c | 29 +++++++++++++++++++++++------
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 93d97f0..a79a58d 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -25,6 +25,7 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,
void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);
+void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs);
void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs,
const char *name,
Error **errp);
diff --git a/block.c b/block.c
index 1d44165..913bb43 100644
--- a/block.c
+++ b/block.c
@@ -4082,6 +4082,10 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,
}
}
+ /* At this point persistent bitmaps should be already stored by the format
+ * driver */
+ bdrv_release_persistent_dirty_bitmaps(bs);
+
return 0;
}
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index b2ca78b..543bddb 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -356,15 +356,20 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs)
bdrv_dirty_bitmaps_unlock(bs);
}
+static bool bdrv_dirty_bitmap_has_name(BdrvDirtyBitmap *bitmap)
+{
+ return !!bdrv_dirty_bitmap_name(bitmap);
+}
+
/* Called with BQL taken. */
-static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs,
- BdrvDirtyBitmap *bitmap,
- bool only_named)
+static void bdrv_do_release_matching_dirty_bitmap(
+ BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
+ bool (*cond)(BdrvDirtyBitmap *bitmap))
{
BdrvDirtyBitmap *bm, *next;
bdrv_dirty_bitmaps_lock(bs);
QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) {
- if ((!bitmap || bm == bitmap) && (!only_named || bm->name)) {
+ if ((!bitmap || bm == bitmap) && (!cond || cond(bm))) {
assert(!bm->active_iterators);
assert(!bdrv_dirty_bitmap_frozen(bm));
assert(!bm->meta);
@@ -389,7 +394,7 @@ out:
/* Called with BQL taken. */
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)
{
- bdrv_do_release_matching_dirty_bitmap(bs, bitmap, false);
+ bdrv_do_release_matching_dirty_bitmap(bs, bitmap, NULL);
}
/**
@@ -400,7 +405,19 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs,
BdrvDirtyBitmap *bitmap)
*/
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)
{
- bdrv_do_release_matching_dirty_bitmap(bs, NULL, true);
+ bdrv_do_release_matching_dirty_bitmap(bs, NULL,
bdrv_dirty_bitmap_has_name);
+}
+
+/**
+ * Release all persistent dirty bitmaps attached to a BDS (for use in
+ * bdrv_inactivate_recurse()).
+ * There must not be any frozen bitmaps attached.
+ * This function does not remove persistent bitmaps from the storage.
+ */
+void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs)
+{
+ bdrv_do_release_matching_dirty_bitmap(bs, NULL,
+ bdrv_dirty_bitmap_get_persistance);
}
/**
--
2.9.4
- [Qemu-devel] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, (continued)
- [Qemu-devel] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 44/85] qcow2: add .bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 43/85] block: add bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 45/85] qmp: add persistent flag to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 46/85] qmp: add autoload parameter to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 49/85] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 47/85] qmp: add x-debug-block-dirty-bitmap-sha256, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 48/85] iotests: test qcow2 persistent dirty bitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persistent, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 52/85] block: release persistent bitmaps on inactivate,
Max Reitz <=
- [Qemu-devel] [PULL 53/85] iotests: skip 159 & 170 with luks format, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 54/85] iotests: fix remainining tests to work with LUKS, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 55/85] iotests: reduce PBKDF iterations when testing LUKS, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 58/85] iotests: Use absolute paths for executables, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 56/85] iotests: add more LUKS hash combination tests, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 59/85] iotests: Add test for colon handling, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 61/85] block: add bdrv_measure() API, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 60/85] tests: Avoid non-portable 'echo -ARG', Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 62/85] raw-format: add bdrv_measure() support, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 64/85] qcow2: make refcount size calculation conservative, Max Reitz, 2017/07/11