Commit eb738bb5 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

qmp: add autoload parameter to block-dirty-bitmap-add 



Optional. Default is false.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20170628120530.31251-25-vsementsov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent fd5ae4cc

blockdev.c

+16 −2
Original line number Diff line number Diff line
@@ -1984,6 +1984,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) {
@@ -2710,6 +2711,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)

{

    BlockDriverState *bs;
@@ -2739,6 +2741,15 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, 
    if (!has_persistent) {

        persistent = false;

    }

    if (!has_autoload) {

        autoload = false;

    }



    if (has_autoload && !persistent) {

        error_setg(errp, "Autoload flag must be used only for persistent "

                         "bitmaps");

        return;

    }



    if (persistent &&

        !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp))
@@ -2747,9 +2758,12 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, 
    }



    bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp);

    if (bitmap != NULL) {

        bdrv_dirty_bitmap_set_persistance(bitmap, persistent);

    if (bitmap == NULL) {

        return;

    }



    bdrv_dirty_bitmap_set_persistance(bitmap, persistent);

    bdrv_dirty_bitmap_set_autoload(bitmap, autoload);

}



void qmp_block_dirty_bitmap_remove(const char *node, const char *name,

qapi/block-core.json

+5 −1
Original line number Diff line number Diff line
@@ -1558,11 +1558,15 @@ 
#              Qcow2 disks support persistent bitmaps. Default is false for

#              block-dirty-bitmap-add. (Since: 2.10)

#

# @autoload: the bitmap will be automatically loaded when the image it is stored

#            in is opened. This flag may only be specified for 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',

            '*persistent': 'bool' } }

            '*persistent': 'bool', '*autoload': 'bool' } }



##

# @block-dirty-bitmap-add: