[23/29] qmp: add autoload parameter to block-dirty-bitmap-add

Commit Message

Vladimir Sementsov-Ogievskiy Aug. 8, 2016, 3:05 p.m. UTC

Optional. Default is false.

Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Signed-off-by: Denis V. Lunev <[e-mail]>
---
 blockdev.c           | 22 ++++++++++++++++++++--
 qapi/block-core.json |  2 +-
 qmp-commands.hx      |  4 +++-
 3 files changed, 24 insertions(+), 4 deletions(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index cf5ebb9..f2416e9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2032,6 +2032,7 @@  static void block_dirty_bitmap_add_prepare(BlkActionState *common,
     qmp_block_dirty_bitmap_add(action->node, action->name,
                                action->has_granularity, action->granularity,
                                action->has_persistent, action->persistent,
+                               action->has_autoload, action->autoload,
                                &local_err);
 
     if (!local_err) {
@@ -2736,6 +2737,7 @@  out:
 void qmp_block_dirty_bitmap_add(const char *node, const char *name,
                                 bool has_granularity, uint32_t granularity,
                                 bool has_persistent, bool persistent,
+                                bool has_autoload, bool autoload,
                                 Error **errp)
 {
     AioContext *aio_context;
@@ -2769,10 +2771,26 @@  void qmp_block_dirty_bitmap_add(const char *node, const char *name,
     if (!has_persistent) {
         persistent = false;
     }
+    if (!has_autoload) {
+        autoload = false;
+    }
+
+    if (autoload && !persistent) {
+        error_setg(errp, "Autoload flag must be used only for persistent"
+                         "bitmaps");
+        goto out;
+    }
 
     bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp);
-    if (bitmap != NULL) {
-        bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
+    if (bitmap == NULL) {
+        goto out;
+    }
+
+    if (persistent) {
+        bdrv_dirty_bitmap_set_persistance(bitmap, true);
+        if (autoload) {
+            bdrv_dirty_bitmap_set_autoload(bitmap, true);
+        }
     }
 
  out:
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 73c1aaf..c1d4bdf 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1225,7 +1225,7 @@ 
 ##
 { 'struct': 'BlockDirtyBitmapAdd',
   'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',
-  '*persistent': 'bool' } }
+  '*persistent': 'bool', '*autoload': 'bool' } }
 
 ##
 # @block-dirty-bitmap-add
diff --git a/qmp-commands.hx b/qmp-commands.hx
index f7d75bb..90205c8 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1435,7 +1435,7 @@  EQMP
 
     {
         .name       = "block-dirty-bitmap-add",
-        .args_type  = "node:B,name:s,granularity:i?,persistent:b?",
+        .args_type  = "node:B,name:s,granularity:i?,persistent:b?,autoload:b?",
         .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_add,
     },
 
@@ -1455,6 +1455,8 @@  Arguments:
 - "persistent": bitmap will be saved to corresponding block device
                 on quit. Block driver should maintain persistent bitmaps
                 (json-bool, optional, default false)
+- "autoload": only for persistent bitmaps. Bitmap will be autoloaded on it's
+              storage image open. (json-bool, optional, default false)
 
 Example: