[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 38/45] qapi: add x-blockdev-replace transaction action
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 38/45] qapi: add x-blockdev-replace transaction action |
Date: |
Thu, 31 Mar 2022 00:28:55 +0300 |
Support blockdev-replace in a transaction.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>
---
block.c | 4 ++--
blockdev.c | 29 ++++++++++++++++++++++++-----
include/block/block-global-state.h | 2 ++
qapi/transaction.json | 15 ++++++++++++++-
4 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index 4b5b7d8794..efe0ec0f00 100644
--- a/block.c
+++ b/block.c
@@ -2381,8 +2381,8 @@ static TransactionActionDrv bdrv_replace_child_drv = {
};
/* Caller is responsible to refresh permissions in @refresh_list */
-static void bdrv_replace_child_tran(BdrvChild *child, BlockDriverState *new_bs,
- GSList **refresh_list, Transaction *tran)
+void bdrv_replace_child_tran(BdrvChild *child, BlockDriverState *new_bs,
+ GSList **refresh_list, Transaction *tran)
{
BdrvReplaceChildState *s = g_new(BdrvReplaceChildState, 1);
*s = (BdrvReplaceChildState) {
diff --git a/blockdev.c b/blockdev.c
index 3d84cb6f92..89167fbc08 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2166,8 +2166,9 @@ static void abort_commit(void *opaque)
g_assert_not_reached(); /* this action never succeeds */
}
-static int blockdev_replace(BlockdevReplace *repl, Transaction *tran,
- Error **errp)
+/* Caller is responsible to update permission of nodes added to @update_list */
+static int blockdev_replace(BlockdevReplace *repl, GSList **refresh_list,
+ Transaction *tran, Error **errp)
{
BdrvChild *child = NULL;
BlockDriverState *new_child_bs;
@@ -2220,14 +2221,27 @@ static int blockdev_replace(BlockdevReplace *repl,
Transaction *tran,
return -EINVAL;
}
- return bdrv_replace_child_bs(child, new_child_bs, tran, errp);
+ bdrv_replace_child_tran(child, new_child_bs, refresh_list, tran);
+ return 0;
}
void qmp_x_blockdev_replace(BlockdevReplace *repl, Error **errp)
{
+ int ret;
Transaction *tran = tran_new();
- int ret = blockdev_replace(repl, tran, errp);
+ g_autoptr(GSList) update_list = NULL;
+
+ ret = blockdev_replace(repl, &update_list, tran, errp);
+ if (ret < 0) {
+ goto out;
+ }
+ ret = bdrv_list_refresh_perms(update_list, NULL, tran, errp);
+ if (ret < 0) {
+ goto out;
+ }
+
+out:
tran_finalize(tran, ret);
}
@@ -2287,6 +2301,10 @@ static void transaction_action(TransactionAction *act,
JobTxn *block_job_txn,
blockdev_add(act->u.blockdev_add.data,
refresh_list, tran, errp);
return;
+ case TRANSACTION_ACTION_KIND_X_BLOCKDEV_REPLACE:
+ blockdev_replace(act->u.x_blockdev_replace.data,
+ refresh_list, tran, errp);
+ return;
/*
* Where are transactions for MIRROR, COMMIT and STREAM?
* Although these blockjobs use transaction callbacks like the backup job,
@@ -2355,7 +2373,8 @@ void qmp_transaction(TransactionActionList *actions,
if (refresh_list &&
type != TRANSACTION_ACTION_KIND_BLOCKDEV_DEL &&
- type != TRANSACTION_ACTION_KIND_BLOCKDEV_ADD)
+ type != TRANSACTION_ACTION_KIND_BLOCKDEV_ADD &&
+ type != TRANSACTION_ACTION_KIND_X_BLOCKDEV_REPLACE)
{
ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp);
if (ret < 0) {
diff --git a/include/block/block-global-state.h
b/include/block/block-global-state.h
index fa5f698228..253cc28a9a 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -66,6 +66,8 @@ int bdrv_replace_node(BlockDriverState *from,
BlockDriverState *to,
Error **errp);
int bdrv_replace_child_bs(BdrvChild *child, BlockDriverState *new_bs,
Transaction *tran, Error **errp);
+void bdrv_replace_child_tran(BdrvChild *child, BlockDriverState *new_bs,
+ GSList **refresh_list, Transaction *tran);
BlockDriverState *bdrv_insert_node(BlockDriverState *bs, QDict *node_options,
int flags, Error **errp);
int bdrv_drop_filter(BlockDriverState *bs, Error **errp);
diff --git a/qapi/transaction.json b/qapi/transaction.json
index 000dd16bb7..61cb2d2312 100644
--- a/qapi/transaction.json
+++ b/qapi/transaction.json
@@ -54,10 +54,13 @@
# @blockdev-snapshot-sync: since 1.1
# @drive-backup: Since 1.6
# @blockdev-del: since 7.1
+# @blockdev-add: since 7.1
+# @x-blockdev-replace: since 7.1
#
# Features:
# @deprecated: Member @drive-backup is deprecated. Use member
# @blockdev-backup instead.
+# @unstable: Member @x-blockdev-replace is experimental
#
# Since: 1.1
##
@@ -68,6 +71,7 @@
'blockdev-backup', 'blockdev-snapshot',
'blockdev-snapshot-internal-sync', 'blockdev-snapshot-sync',
'blockdev-del', 'blockdev-add',
+ { 'name': 'x-blockdev-replace', 'features': [ 'unstable' ] },
{ 'name': 'drive-backup', 'features': [ 'deprecated' ] } ] }
##
@@ -158,6 +162,14 @@
{ 'struct': 'BlockdevAddWrapper',
'data': { 'data': 'BlockdevOptions' } }
+##
+# @BlockdevReplaceWrapper:
+#
+# Since: 7.1
+##
+{ 'struct': 'BlockdevReplaceWrapper',
+ 'data': { 'data': 'BlockdevReplace' } }
+
##
# @TransactionAction:
#
@@ -183,7 +195,8 @@
'blockdev-snapshot-sync': 'BlockdevSnapshotSyncWrapper',
'blockdev-del': 'BlockdevDelWrapper',
'blockdev-add': 'BlockdevAddWrapper',
- 'drive-backup': 'DriveBackupWrapper'
+ 'drive-backup': 'DriveBackupWrapper',
+ 'x-blockdev-replace': 'BlockdevReplaceWrapper'
} }
##
--
2.35.1
- [PATCH v5 04/45] test-bdrv-graph-mod: update test_parallel_perm_update test case, (continued)
- [PATCH v5 04/45] test-bdrv-graph-mod: update test_parallel_perm_update test case, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 05/45] tests-bdrv-drain: bdrv_replace_test driver: declare supports_backing, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 08/45] block/snapshot: stress that we fallback to primary child, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 14/45] block/snapshot: drop indirection around bdrv_snapshot_fallback_ptr, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 17/45] block: drop bdrv_remove_filter_or_cow_child, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 28/45] qapi: block: add blockdev-del transaction action, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 35/45] block: make bdrv_find_child() function public, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 09/45] Revert "block: Let replace_child_noperm free children", Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 10/45] Revert "block: Let replace_child_tran keep indirect pointer", Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 13/45] block: Manipulate bs->file / bs->backing pointers in .attach/.detach, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 38/45] qapi: add x-blockdev-replace transaction action,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 41/45] iotests.py: introduce VM.assert_edges_list() method, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 40/45] iotests.py: qemu_img_create: use imgfmt by default, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 06/45] test-bdrv-graph-mod: fix filters to be filters, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 11/45] Revert "block: Restructure remove_file_or_backing_child()", Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 18/45] block: bdrv_refresh_perms(): allow external tran, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 21/45] block: add bdrv_try_set_aio_context_tran transaction action, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 22/45] block: implemet bdrv_unref_tran(), Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 23/45] blockdev: refactor transaction to use Transaction API, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 45/45] block/copy-before-write: correct permission scheme, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 03/45] block/blklogwrites: don't care to remove bs->file child on failure, Vladimir Sementsov-Ogievskiy, 2022/03/30