[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 24/25] qmp: block-dirty-bitmap-remove: remove persis
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 24/25] qmp: block-dirty-bitmap-remove: remove persistent |
Date: |
Wed, 3 May 2017 15:25:38 +0300 |
Remove persistent bitmap from the storage on block-dirty-bitmap-remove.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
blockdev.c | 10 ++++++++++
qapi/block-core.json | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index c49d414891..0ad1a658b9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2802,6 +2802,7 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
AioContext *aio_context;
BlockDriverState *bs;
BdrvDirtyBitmap *bitmap;
+ Error *local_err = NULL;
bitmap = block_dirty_bitmap_lookup(node, name, &bs, &aio_context, errp);
if (!bitmap || !bs) {
@@ -2814,6 +2815,15 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
name);
goto out;
}
+
+ if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
+ bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ goto out;
+ }
+ }
+
bdrv_dirty_bitmap_make_anon(bitmap);
bdrv_release_dirty_bitmap(bs, bitmap);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index e9523b4b8c..933b1a5fe5 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1600,7 +1600,8 @@
# @block-dirty-bitmap-remove:
#
# Stop write tracking and remove the dirty bitmap that was created
-# with block-dirty-bitmap-add.
+# with block-dirty-bitmap-add. If bitmap is persistent, remove it from it's
+# storage too.
#
# Returns: nothing on success
# If @node is not a valid block device or node, DeviceNotFound
--
2.11.1
- [Qemu-block] [PATCH 19/25] qmp: add autoload parameter to block-dirty-bitmap-add, (continued)
- [Qemu-block] [PATCH 19/25] qmp: add autoload parameter to block-dirty-bitmap-add, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 21/25] iotests: test qcow2 persistent dirty bitmap, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 22/25] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 06/25] block/dirty-bitmap: add deserialize_ones func, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 16/25] block: add bdrv_can_store_new_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 17/25] qcow2: add .bdrv_can_store_new_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 01/25] specs/qcow2: fix bitmap granularity qemu-specific note, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 02/25] specs/qcow2: do not use wording 'bitmap header', Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 05/25] block: fix bdrv_dirty_bitmap_granularity signature, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 24/25] qmp: block-dirty-bitmap-remove: remove persistent,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 25/25] block: release persistent bitmaps on inactivate, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 20/25] qmp: add x-debug-block-dirty-bitmap-sha256, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 12/25] block: bdrv_close: release bitmaps after drv->bdrv_close, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 04/25] tests: add hbitmap iter test, Vladimir Sementsov-Ogievskiy, 2017/05/03
- [Qemu-block] [PATCH 08/25] qcow2: add bitmaps extension, Vladimir Sementsov-Ogievskiy, 2017/05/03