Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- qapi/transaction.json | 2 ++ blockdev.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/qapi/transaction.json b/qapi/transaction.json index d7e4274550..f9da6ad47f 100644 --- a/qapi/transaction.json +++ b/qapi/transaction.json @@ -48,6 +48,7 @@ # - @block-dirty-bitmap-clear: since 2.5 # - @x-block-dirty-bitmap-enable: since 3.0 # - @x-block-dirty-bitmap-disable: since 3.0 +# - @x-block-dirty-bitmap-merge: since 3.0 # - @blockdev-backup: since 2.3 # - @blockdev-snapshot: since 2.5 # - @blockdev-snapshot-internal-sync: since 1.7 @@ -63,6 +64,7 @@ 'block-dirty-bitmap-clear': 'BlockDirtyBitmap', 'x-block-dirty-bitmap-enable': 'BlockDirtyBitmap', 'x-block-dirty-bitmap-disable': 'BlockDirtyBitmap', + 'x-block-dirty-bitmap-merge': 'BlockDirtyBitmapMerge', 'blockdev-backup': 'BlockdevBackup', 'blockdev-snapshot': 'BlockdevSnapshot', 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal', diff --git a/blockdev.c b/blockdev.c index 63c4d33124..d0f2d1a4e9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1946,6 +1946,13 @@ typedef struct BlockDirtyBitmapState { bool was_enabled; } BlockDirtyBitmapState; +typedef struct BlockDirtyBitmapMergeState { + BlkActionState common; + BlockDriverState *bs; + BdrvDirtyBitmap *dst; + BdrvDirtyBitmap *src; +} BlockDirtyBitmapMergeState; + static void block_dirty_bitmap_add_prepare(BlkActionState *common, Error **errp) { @@ -2112,6 +2119,45 @@ static void block_dirty_bitmap_disable_abort(BlkActionState *common) } } +static void block_dirty_bitmap_merge_prepare(BlkActionState *common, + Error **errp) +{ + BlockDirtyBitmapMerge *action; + BlockDirtyBitmapMergeState *state = DO_UPCAST(BlockDirtyBitmapMergeState, + common, common); + + if (action_check_completion_mode(common, errp) < 0) { + return; + } + + action = common->action->u.x_block_dirty_bitmap_merge.data; + state->dst = block_dirty_bitmap_lookup(action->node, + action->dst_name, + &state->bs, + errp); + if (!state->dst) { + return; + } + + state->src = bdrv_find_dirty_bitmap(state->bs, action->src_name); + if (!state->src) { + return; + } + + if (!bdrv_can_merge_dirty_bitmap(state->dst, state->src, errp)) { + return; + } +} + +static void block_dirty_bitmap_merge_commit(BlkActionState *common) +{ + BlockDirtyBitmapMergeState *state = DO_UPCAST(BlockDirtyBitmapMergeState, + common, common); + + /* success is guaranteed by bdrv_can_merge_dirty_bitmap() */ + bdrv_merge_dirty_bitmap(state->dst, state->src, &error_abort); +} + static void abort_prepare(BlkActionState *common, Error **errp) { error_setg(errp, "Transaction aborted using Abort action"); @@ -2182,7 +2228,12 @@ static const BlkActionOps actions[] = { .instance_size = sizeof(BlockDirtyBitmapState), .prepare = block_dirty_bitmap_disable_prepare, .abort = block_dirty_bitmap_disable_abort, - } + }, + [TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_MERGE] = { + .instance_size = sizeof(BlockDirtyBitmapMergeState), + .prepare = block_dirty_bitmap_merge_prepare, + .commit = block_dirty_bitmap_merge_commit, + } }; /** -- 2.11.1