[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v20 13/15] block: Add blockdev-backup to transaction
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v20 13/15] block: Add blockdev-backup to transaction |
Date: |
Tue, 20 May 2014 14:04:38 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
qapi-schema.json | 3 +++
2 files changed, 51 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 287a2d8..14c5be6 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1411,6 +1411,49 @@ static void drive_backup_abort(BlkTransactionState
*common)
}
}
+typedef struct BlockdevBackupState {
+ BlkTransactionState common;
+ BlockDriverState *bs;
+ BlockJob *job;
+} BlockdevBackupState;
+
+static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp)
+{
+ BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
+ BlockdevBackup *backup;
+ Error *local_err = NULL;
+
+ assert(common->action->kind == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
+ backup = common->action->blockdev_backup;
+
+ qmp_blockdev_backup(backup->device, backup->target,
+ backup->sync,
+ backup->has_speed, backup->speed,
+ backup->has_on_source_error, backup->on_source_error,
+ backup->has_on_target_error, backup->on_target_error,
+ &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ state->bs = NULL;
+ state->job = NULL;
+ return;
+ }
+
+ state->bs = bdrv_find(backup->device);
+ state->job = state->bs->job;
+}
+
+static void blockdev_backup_abort(BlkTransactionState *common)
+{
+ BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
+ BlockDriverState *bs = state->bs;
+
+ /* Only cancel if it's the job we started */
+ if (bs && bs->job && bs->job == state->job) {
+ block_job_cancel_sync(bs->job);
+ }
+}
+
static void abort_prepare(BlkTransactionState *common, Error **errp)
{
error_setg(errp, "Transaction aborted using Abort action");
@@ -1433,6 +1476,11 @@ static const BdrvActionOps actions[] = {
.prepare = drive_backup_prepare,
.abort = drive_backup_abort,
},
+ [TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP] = {
+ .instance_size = sizeof(BlockdevBackupState),
+ .prepare = blockdev_backup_prepare,
+ .abort = blockdev_backup_abort,
+ },
[TRANSACTION_ACTION_KIND_ABORT] = {
.instance_size = sizeof(BlkTransactionState),
.prepare = abort_prepare,
diff --git a/qapi-schema.json b/qapi-schema.json
index c6b10b9..510a8f8 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2001,11 +2001,14 @@
#
# A discriminated record of operations that can be performed with
# @transaction.
+#
+# Since 1.1, blockdev-backup since 2.1
##
{ 'union': 'TransactionAction',
'data': {
'blockdev-snapshot-sync': 'BlockdevSnapshot',
'drive-backup': 'DriveBackup',
+ 'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal'
} }
--
1.9.2
- Re: [Qemu-devel] [PATCH v20 06/15] block: Add backing_blocker in BlockDriverState, (continued)
Re: [Qemu-devel] [PATCH v20 06/15] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/21
[Qemu-devel] [PATCH v20 08/15] block: Support dropping active in bdrv_drop_intermediate, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 09/15] stream: Use bdrv_drop_intermediate and drop close_unused_images, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 10/15] commit: Use bdrv_drop_intermediate, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 11/15] qmp: Add command 'blockdev-backup', Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 12/15] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 13/15] block: Add blockdev-backup to transaction,
Fam Zheng <=
[Qemu-devel] [PATCH v20 14/15] qemu-iotests: Test blockdev-backup in 055, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 15/15] qemu-iotests: Image fleecing test case 089, Fam Zheng, 2014/05/20