164 lines
5.7 KiB
Diff
164 lines
5.7 KiB
Diff
From f694daf74067ada6720659a7133224f727f98ed3 Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Wed, 18 Jul 2018 22:54:39 +0200
|
|
Subject: [PATCH 221/268] qmp: transaction support for
|
|
x-block-dirty-bitmap-enable/disable
|
|
|
|
RH-Author: John Snow <jsnow@redhat.com>
|
|
Message-id: <20180718225511.14878-4-jsnow@redhat.com>
|
|
Patchwork-id: 81410
|
|
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 03/35] qmp: transaction support for x-block-dirty-bitmap-enable/disable
|
|
Bugzilla: 1207657
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
|
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
Message-id: 20180606182449.1607-4-jsnow@redhat.com
|
|
[Added x- prefix. --js]
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
(cherry picked from commit c6490447402f574bbe45f45c318e0bdd19121baf)
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
blockdev.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
qapi/transaction.json | 4 +++
|
|
2 files changed, 84 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index 9e435f4..b74b7d4 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -2053,6 +2053,7 @@ typedef struct BlockDirtyBitmapState {
|
|
BlockDriverState *bs;
|
|
HBitmap *backup;
|
|
bool prepared;
|
|
+ bool was_enabled;
|
|
} BlockDirtyBitmapState;
|
|
|
|
static void block_dirty_bitmap_add_prepare(BlkActionState *common,
|
|
@@ -2152,6 +2153,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");
|
|
@@ -2212,7 +2281,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 bd31279..d7e4274 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',
|
|
--
|
|
1.8.3.1
|
|
|