From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, rjones@redhat.com, armbru@redhat.com,
imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v13 12/14] block: Add blockdev-backup to transaction
Date: Wed, 29 Jan 2014 13:07:39 +0800 [thread overview]
Message-ID: <1390972061-26560-13-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1390972061-26560-1-git-send-email-famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
blockdev.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
qapi-schema.json | 1 +
2 files changed, 49 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index b346cc1..7372721 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1382,6 +1382,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 (error_is_set(&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");
@@ -1404,6 +1447,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 a92e1be..d22651c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1893,6 +1893,7 @@
'data': {
'blockdev-snapshot-sync': 'BlockdevSnapshot',
'drive-backup': 'DriveBackup',
+ 'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal'
} }
--
1.8.5.3
next prev parent reply other threads:[~2014-01-29 5:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 5:07 [Qemu-devel] [PATCH v13 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 01/14] block: Add BlockOpType enum Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 02/14] block: Introduce op_blockers to BlockDriverState Fam Zheng
2014-02-13 12:24 ` Benoît Canet
2014-02-17 13:30 ` Fam Zheng
2014-02-13 12:37 ` Benoît Canet
2014-02-17 13:30 ` Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 03/14] block: Replace in_use with operation blocker Fam Zheng
2014-02-13 12:34 ` Benoît Canet
2014-02-17 13:21 ` Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 04/14] block: Move op_blocker check from block_job_create to its caller Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 05/14] block: Add bdrv_set_backing_hd() Fam Zheng
2014-02-13 12:49 ` Benoît Canet
2014-02-17 13:31 ` Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 06/14] block: Add backing_blocker in BlockDriverState Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 07/14] block: Parse "backing" option to reference existing BDS Fam Zheng
2014-02-13 13:17 ` Benoît Canet
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 08/14] block: Support dropping active in bdrv_drop_intermediate Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 09/14] stream: Use bdrv_drop_intermediate and drop close_unused_images Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 10/14] qmp: Add command 'blockdev-backup' Fam Zheng
2014-02-13 13:48 ` Benoît Canet
2014-02-17 13:32 ` Fam Zheng
2014-02-17 14:23 ` Benoît Canet
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 11/14] block: Allow backup on referenced named BlockDriverState Fam Zheng
2014-01-29 5:07 ` Fam Zheng [this message]
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 13/14] qemu-iotests: Test blockdev-backup in 055 Fam Zheng
2014-01-29 5:07 ` [Qemu-devel] [PATCH v13 14/14] qemu-iotests: Image fleecing test case 081 Fam Zheng
2014-02-01 3:00 ` [Qemu-devel] [PATCH v13 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD Ian Main
2014-02-01 15:21 ` Fam Zheng
2014-02-02 1:13 ` Ian Main
2014-02-12 17:22 ` Ian Main
2014-02-12 18:27 ` Richard W.M. Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390972061-26560-13-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=armbru@redhat.com \
--cc=imain@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).