[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 085/100] qmp: add persistent flag to block-dirty-bitm
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 085/100] qmp: add persistent flag to block-dirty-bitmap-add |
Date: |
Fri, 7 Jul 2017 19:08:40 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Add optional 'persistent' flag to qmp command block-dirty-bitmap-add.
Default is false.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Denis V. Lunev <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>
---
blockdev.c | 18 +++++++++++++++++-
qapi/block-core.json | 8 +++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index edeb36b..2ef731b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1983,6 +1983,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState
*common,
/* AIO context taken and released within qmp_block_dirty_bitmap_add */
qmp_block_dirty_bitmap_add(action->node, action->name,
action->has_granularity, action->granularity,
+ action->has_persistent, action->persistent,
&local_err);
if (!local_err) {
@@ -2708,9 +2709,11 @@ out:
void qmp_block_dirty_bitmap_add(const char *node, const char *name,
bool has_granularity, uint32_t granularity,
+ bool has_persistent, bool persistent,
Error **errp)
{
BlockDriverState *bs;
+ BdrvDirtyBitmap *bitmap;
if (!name || name[0] == '\0') {
error_setg(errp, "Bitmap name cannot be empty");
@@ -2733,7 +2736,20 @@ void qmp_block_dirty_bitmap_add(const char *node, const
char *name,
granularity = bdrv_get_default_bitmap_granularity(bs);
}
- bdrv_create_dirty_bitmap(bs, granularity, name, errp);
+ if (!has_persistent) {
+ persistent = false;
+ }
+
+ if (persistent &&
+ !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp))
+ {
+ return;
+ }
+
+ bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp);
+ if (bitmap != NULL) {
+ bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
+ }
}
void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 9570963..907ac9d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1553,10 +1553,16 @@
# @granularity: the bitmap granularity, default is 64k for
# block-dirty-bitmap-add
#
+# @persistent: the bitmap is persistent, i.e. it will be saved to the
+# corresponding block device image file on its close. For now only
+# Qcow2 disks support persistent bitmaps. Default is false for
+# block-dirty-bitmap-add. (Since: 2.10)
+#
# Since: 2.4
##
{ 'struct': 'BlockDirtyBitmapAdd',
- 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } }
+ 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',
+ '*persistent': 'bool' } }
##
# @block-dirty-bitmap-add:
--
1.8.3.1
- [Qemu-block] [PULL 076/100] qcow2: support .bdrv_reopen_bitmaps_rw, (continued)
- [Qemu-block] [PULL 076/100] qcow2: support .bdrv_reopen_bitmaps_rw, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 079/100] block: introduce persistent dirty bitmaps, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 082/100] qcow2: store bitmaps on reopening image as read-only, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 080/100] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 081/100] qcow2: add persistent dirty bitmaps support, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 083/100] block: add bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 087/100] qmp: add x-debug-block-dirty-bitmap-sha256, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 084/100] qcow2: add .bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 086/100] qmp: add autoload parameter to block-dirty-bitmap-add, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 088/100] iotests: test qcow2 persistent dirty bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 085/100] qmp: add persistent flag to block-dirty-bitmap-add,
Kevin Wolf <=
- [Qemu-block] [PULL 089/100] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 093/100] iotests: skip 159 & 170 with luks format, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 091/100] qmp: block-dirty-bitmap-remove: remove persistent, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 092/100] block: release persistent bitmaps on inactivate, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 090/100] qcow2: add .bdrv_remove_persistent_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 094/100] iotests: fix remainining tests to work with LUKS, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 095/100] iotests: reduce PBKDF iterations when testing LUKS, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 096/100] iotests: add more LUKS hash combination tests, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 098/100] iotests: Use absolute paths for executables, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 100/100] tests: Avoid non-portable 'echo -ARG', Kevin Wolf, 2017/07/07