[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] qmp: transaction support for block-dirty-bitmap
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 3/4] qmp: transaction support for block-dirty-bitmap-enable/disable |
Date: |
Mon, 13 Nov 2017 19:20:52 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
qapi/transaction.json | 4 +++
blockdev.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/qapi/transaction.json b/qapi/transaction.json
index bd312792da..b643d848f8 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
+# - @block-dirty-bitmap-enable: since 2.12
+# - @block-dirty-bitmap-disable: since 2.12
# - @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',
+ 'block-dirty-bitmap-enable': 'BlockDirtyBitmap',
+ 'block-dirty-bitmap-disable': 'BlockDirtyBitmap',
'blockdev-backup': 'BlockdevBackup',
'blockdev-snapshot': 'BlockdevSnapshot',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal',
diff --git a/blockdev.c b/blockdev.c
index fe1eb751f0..f6595ddcd3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1962,6 +1962,7 @@ typedef struct BlockDirtyBitmapState {
AioContext *aio_context;
HBitmap *backup;
bool prepared;
+ bool was_enabled;
} BlockDirtyBitmapState;
static void block_dirty_bitmap_add_prepare(BlkActionState *common,
@@ -2069,6 +2070,74 @@ static void
block_dirty_bitmap_clear_clean(BlkActionState *common)
}
}
+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.block_dirty_bitmap_enable.data;
+ state->bitmap = block_dirty_bitmap_lookup(action->node,
+ action->name,
+ &state->bs,
+ 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.block_dirty_bitmap_disable.data;
+ state->bitmap = block_dirty_bitmap_lookup(action->node,
+ action->name,
+ &state->bs,
+ 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");
@@ -2130,6 +2199,16 @@ static const BlkActionOps actions[] = {
.commit = block_dirty_bitmap_clear_commit,
.abort = block_dirty_bitmap_clear_abort,
.clean = block_dirty_bitmap_clear_clean,
+ },
+ [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_ENABLE] = {
+ .instance_size = sizeof(BlockDirtyBitmapState),
+ .prepare = block_dirty_bitmap_enable_prepare,
+ .abort = block_dirty_bitmap_enable_abort,
+ },
+ [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_DISABLE] = {
+ .instance_size = sizeof(BlockDirtyBitmapState),
+ .prepare = block_dirty_bitmap_disable_prepare,
+ .abort = block_dirty_bitmap_disable_abort,
}
};
--
2.11.1
- [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, Vladimir Sementsov-Ogievskiy, 2017/11/13
- [Qemu-devel] [PATCH 1/4] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2017/11/13
- [Qemu-devel] [PATCH 3/4] qmp: transaction support for block-dirty-bitmap-enable/disable,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 4/4] qapi: add block-dirty-bitmap-merge, Vladimir Sementsov-Ogievskiy, 2017/11/13
- [Qemu-devel] [PATCH 2/4] qapi: add block-dirty-bitmap-enable/disable, Vladimir Sementsov-Ogievskiy, 2017/11/13
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, John Snow, 2017/11/15
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, Vladimir Sementsov-Ogievskiy, 2017/11/16
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, John Snow, 2017/11/16
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, Vladimir Sementsov-Ogievskiy, 2017/11/17
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, John Snow, 2017/11/17
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, Kevin Wolf, 2017/11/21
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, John Snow, 2017/11/21
- Re: [Qemu-devel] [PATCH for-2.12 0/4] qmp dirty bitmap API, Vladimir Sementsov-Ogievskiy, 2017/11/22