Commit c6490447 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

qmp: transaction support for x-block-dirty-bitmap-enable/disable 



Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Message-id: 20180606182449.1607-4-jsnow@redhat.com
[Added x- prefix. --js]
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 5c5d2e50

blockdev.c

+80 −1
Original line number Diff line number Diff line
@@ -2052,6 +2052,7 @@ typedef struct BlockDirtyBitmapState { 
    BlockDriverState *bs;

    HBitmap *backup;

    bool prepared;

    bool was_enabled;

} BlockDirtyBitmapState;



static void block_dirty_bitmap_add_prepare(BlkActionState *common,
@@ -2151,6 +2152,74 @@ static void block_dirty_bitmap_clear_commit(BlkActionState *common) 
    hbitmap_free(state->backup);

}



static void block_dirty_bitmap_enable_prepare(BlkActionState *common,

                                              Error **errp)

{

    BlockDirtyBitmap *action;

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);



    if (action_check_completion_mode(common, errp) < 0) {

        return;

    }



    action = common->action->u.x_block_dirty_bitmap_enable.data;

    state->bitmap = block_dirty_bitmap_lookup(action->node,

                                              action->name,

                                              NULL,

                                              errp);

    if (!state->bitmap) {

        return;

    }



    state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);

    bdrv_enable_dirty_bitmap(state->bitmap);

}



static void block_dirty_bitmap_enable_abort(BlkActionState *common)

{

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);



    if (!state->was_enabled) {

        bdrv_disable_dirty_bitmap(state->bitmap);

    }

}



static void block_dirty_bitmap_disable_prepare(BlkActionState *common,

                                               Error **errp)

{

    BlockDirtyBitmap *action;

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);



    if (action_check_completion_mode(common, errp) < 0) {

        return;

    }



    action = common->action->u.x_block_dirty_bitmap_disable.data;

    state->bitmap = block_dirty_bitmap_lookup(action->node,

                                              action->name,

                                              NULL,

                                              errp);

    if (!state->bitmap) {

        return;

    }



    state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);

    bdrv_disable_dirty_bitmap(state->bitmap);

}



static void block_dirty_bitmap_disable_abort(BlkActionState *common)

{

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);



    if (state->was_enabled) {

        bdrv_enable_dirty_bitmap(state->bitmap);

    }

}



static void abort_prepare(BlkActionState *common, Error **errp)

{

    error_setg(errp, "Transaction aborted using Abort action");
@@ -2211,6 +2280,16 @@ static const BlkActionOps actions[] = { 
        .prepare = block_dirty_bitmap_clear_prepare,

        .commit = block_dirty_bitmap_clear_commit,

        .abort = block_dirty_bitmap_clear_abort,

    },

    [TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_ENABLE] = {

        .instance_size = sizeof(BlockDirtyBitmapState),

        .prepare = block_dirty_bitmap_enable_prepare,

        .abort = block_dirty_bitmap_enable_abort,

    },

    [TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_DISABLE] = {

        .instance_size = sizeof(BlockDirtyBitmapState),

        .prepare = block_dirty_bitmap_disable_prepare,

        .abort = block_dirty_bitmap_disable_abort,

     }

};

qapi/transaction.json

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
# - @abort: since 1.6

# - @block-dirty-bitmap-add: since 2.5

# - @block-dirty-bitmap-clear: since 2.5

# - @x-block-dirty-bitmap-enable: since 3.0

# - @x-block-dirty-bitmap-disable: since 3.0

# - @blockdev-backup: since 2.3

# - @blockdev-snapshot: since 2.5

# - @blockdev-snapshot-internal-sync: since 1.7
@@ -59,6 +61,8 @@ 
       'abort': 'Abort',

       'block-dirty-bitmap-add': 'BlockDirtyBitmapAdd',

       'block-dirty-bitmap-clear': 'BlockDirtyBitmap',

       'x-block-dirty-bitmap-enable': 'BlockDirtyBitmap',

       'x-block-dirty-bitmap-disable': 'BlockDirtyBitmap',

       'blockdev-backup': 'BlockdevBackup',

       'blockdev-snapshot': 'BlockdevSnapshot',

       'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal',