[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persist
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persistent |
Date: |
Tue, 11 Jul 2017 18:07:40 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
qapi/block-core.json | 3 ++-
blockdev.c | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 9b5047d..4bf11e8 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1593,7 +1593,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 the bitmap is persistent, remove it from its
+# storage too.
#
# Returns: nothing on success
# If @node is not a valid block device or node, DeviceNotFound
diff --git a/blockdev.c b/blockdev.c
index 988a60d..124c230 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2771,6 +2771,7 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
{
BlockDriverState *bs;
BdrvDirtyBitmap *bitmap;
+ Error *local_err = NULL;
bitmap = block_dirty_bitmap_lookup(node, name, &bs, errp);
if (!bitmap || !bs) {
@@ -2783,6 +2784,15 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
name);
return;
}
+
+ 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);
+ return;
+ }
+ }
+
bdrv_dirty_bitmap_make_anon(bitmap);
bdrv_release_dirty_bitmap(bs, bitmap);
}
--
2.9.4
- [Qemu-block] [PULL 46/85] qmp: add autoload parameter to block-dirty-bitmap-add, (continued)
- [Qemu-block] [PULL 46/85] qmp: add autoload parameter to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 48/85] iotests: test qcow2 persistent dirty bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 47/85] qmp: add x-debug-block-dirty-bitmap-sha256, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 49/85] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 52/85] block: release persistent bitmaps on inactivate, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persistent,
Max Reitz <=
- [Qemu-block] [PULL 53/85] iotests: skip 159 & 170 with luks format, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 54/85] iotests: fix remainining tests to work with LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 55/85] iotests: reduce PBKDF iterations when testing LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 56/85] iotests: add more LUKS hash combination tests, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 58/85] iotests: Use absolute paths for executables, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 59/85] iotests: Add test for colon handling, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 60/85] tests: Avoid non-portable 'echo -ARG', Max Reitz, 2017/07/11
- [Qemu-block] [PULL 61/85] block: add bdrv_measure() API, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 62/85] raw-format: add bdrv_measure() support, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 57/85] iotests: chown LUKS device before qemu-io launches, Max Reitz, 2017/07/11