[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 6/8] blockdev: place blockdev_backup_prepare with the other re
From: |
Sergio Lopez |
Subject: |
[PATCH v3 6/8] blockdev: place blockdev_backup_prepare with the other related transaction helpers |
Date: |
Tue, 12 Nov 2019 12:30:10 +0100 |
Move blockdev_backup_prepare() to be side by side with the other
related transaction helper functions.
Signed-off-by: Sergio Lopez <address@hidden>
---
blockdev.c | 70 +++++++++++++++++++++++++++---------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 128707cdc6..f94aaa98f0 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1940,6 +1940,41 @@ typedef struct BlockdevBackupState {
BlockJob *job;
} BlockdevBackupState;
+static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
+{
+ BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
+ BlockdevBackup *backup;
+ BlockDriverState *bs;
+ BlockDriverState *target_bs;
+ AioContext *aio_context;
+
+ assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
+ backup = common->action->u.blockdev_backup.data;
+
+ bs = bdrv_lookup_bs(backup->device, backup->device, errp);
+ if (!bs) {
+ return;
+ }
+
+ target_bs = bdrv_lookup_bs(backup->target, backup->target, errp);
+ if (!target_bs) {
+ return;
+ }
+
+ aio_context = bdrv_get_aio_context(bs);
+ aio_context_acquire(aio_context);
+ state->bs = bs;
+
+ /* Paired with .clean() */
+ bdrv_drained_begin(state->bs);
+
+ state->job = do_backup_common(qapi_BlockdevBackup_base(backup),
+ bs, target_bs, aio_context,
+ common->block_job_txn, errp);
+
+ aio_context_release(aio_context);
+}
+
static void blockdev_backup_commit(BlkActionState *common)
{
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
@@ -3654,41 +3689,6 @@ XDbgBlockGraph *qmp_x_debug_query_block_graph(Error
**errp)
return bdrv_get_xdbg_block_graph(errp);
}
-static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
-{
- BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
- BlockdevBackup *backup;
- BlockDriverState *bs;
- BlockDriverState *target_bs;
- AioContext *aio_context;
-
- assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
- backup = common->action->u.blockdev_backup.data;
-
- bs = bdrv_lookup_bs(backup->device, backup->device, errp);
- if (!bs) {
- return;
- }
-
- target_bs = bdrv_lookup_bs(backup->target, backup->target, errp);
- if (!target_bs) {
- return;
- }
-
- aio_context = bdrv_get_aio_context(bs);
- aio_context_acquire(aio_context);
- state->bs = bs;
-
- /* Paired with .clean() */
- bdrv_drained_begin(state->bs);
-
- state->job = do_backup_common(qapi_BlockdevBackup_base(backup),
- bs, target_bs, aio_context,
- common->block_job_txn, errp);
-
- aio_context_release(aio_context);
-}
-
void qmp_blockdev_backup(BlockdevBackup *arg, Error **errp)
{
BlockJob *job;
--
2.23.0
- [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Sergio Lopez, 2019/11/12
- [PATCH v3 1/8] blockdev: merge drive_backup_prepare with do_drive_backup, Sergio Lopez, 2019/11/12
- [PATCH v3 4/8] blockdev: change qmp_drive_backup to make use of transactions, Sergio Lopez, 2019/11/12
- [PATCH v3 2/8] blockdev: fix coding style issues in drive_backup_prepare, Sergio Lopez, 2019/11/12
- [PATCH v3 8/8] blockdev: honor bdrv_try_set_aio_context() context requirements, Sergio Lopez, 2019/11/12
- [PATCH v3 6/8] blockdev: place blockdev_backup_prepare with the other related transaction helpers,
Sergio Lopez <=
- [PATCH v3 7/8] blockdev: change qmp_blockdev_backup to make use of transactions, Sergio Lopez, 2019/11/12
- [PATCH v3 5/8] blockdev: merge blockdev_backup_prepare with do_blockdev_backup, Sergio Lopez, 2019/11/12
- [PATCH v3 3/8] blockdev: place drive_backup_prepare with the other related transaction functions, Sergio Lopez, 2019/11/12
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, no-reply, 2019/11/12
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Sergio Lopez, 2019/11/13
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Sergio Lopez, 2019/11/13
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Max Reitz, 2019/11/19
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Sergio Lopez, 2019/11/19
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Kevin Wolf, 2019/11/19
- Re: [PATCH v3 0/8] blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup, Sergio Lopez, 2019/11/19