[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-block] [PATCH v2 3/5] qmp: transaction support fo
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [Qemu-block] [PATCH v2 3/5] qmp: transaction support for x-block-dirty-bitmap-enable/disable |
Date: |
Wed, 6 Jun 2018 23:21:08 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Wed, Jun 06, 2018 at 02:24:47PM -0400, John Snow wrote:
> From: Vladimir Sementsov-Ogievskiy <address@hidden>
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> [Added x- prefix. --js]
> Signed-off-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> blockdev.c | 81
> ++++++++++++++++++++++++++++++++++++++++++++++++++-
> qapi/transaction.json | 4 +++
> 2 files changed, 84 insertions(+), 1 deletion(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index fb402edc94..af705738cd 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -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,7 +2280,17 @@ 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,
> + }
> };
>
> /**
> diff --git a/qapi/transaction.json b/qapi/transaction.json
> index bd312792da..d7e4274550 100644
> --- a/qapi/transaction.json
> +++ b/qapi/transaction.json
> @@ -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',
> --
> 2.14.3
>
>
- [Qemu-devel] [PATCH v2 0/5] block dirty bitmaps: support libvirt API, John Snow, 2018/06/06
- [Qemu-devel] [PATCH v2 1/5] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap, John Snow, 2018/06/06
- [Qemu-devel] [PATCH v2 4/5] qapi: add x-block-dirty-bitmap-merge, John Snow, 2018/06/06
- [Qemu-devel] [PATCH v2 2/5] qapi: add x-block-dirty-bitmap-enable/disable, John Snow, 2018/06/06
- [Qemu-devel] [PATCH v2 3/5] qmp: transaction support for x-block-dirty-bitmap-enable/disable, John Snow, 2018/06/06
- Re: [Qemu-devel] [Qemu-block] [PATCH v2 3/5] qmp: transaction support for x-block-dirty-bitmap-enable/disable,
Jeff Cody <=
- [Qemu-devel] [PATCH v2 5/5] qapi: add disabled parameter to block-dirty-bitmap-add, John Snow, 2018/06/06
- Re: [Qemu-devel] [PATCH v2 0/5] block dirty bitmaps: support libvirt API, John Snow, 2018/06/08