From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, benoit.canet@irqsave.net, rjones@redhat.com,
jcody@redhat.com, armbru@redhat.com, ptoscano@redhat.com,
imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v17 12/14] block: Add blockdev-backup to transaction
Date: Mon, 10 Mar 2014 15:26:08 +0800 [thread overview]
Message-ID: <1394436370-8908-13-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1394436370-8908-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 f241455..8a6ae0a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1409,6 +1409,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");
@@ -1431,6 +1474,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 acff31a..6476d4a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1972,6 +1972,7 @@
'data': {
'blockdev-snapshot-sync': 'BlockdevSnapshot',
'drive-backup': 'DriveBackup',
+ 'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal'
} }
--
1.9.0
next prev parent reply other threads:[~2014-03-10 7:27 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 7:25 [Qemu-devel] [PATCH v17 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD Fam Zheng
2014-03-10 7:25 ` [Qemu-devel] [PATCH v17 01/14] block: Add BlockOpType enum Fam Zheng
2014-04-06 23:47 ` Jeff Cody
2014-03-10 7:25 ` [Qemu-devel] [PATCH v17 02/14] block: Introduce op_blockers to BlockDriverState Fam Zheng
2014-04-06 23:49 ` Jeff Cody
2014-04-08 6:56 ` Fam Zheng
2014-03-10 7:25 ` [Qemu-devel] [PATCH v17 03/14] block: Replace in_use with operation blocker Fam Zheng
2014-04-07 0:10 ` Jeff Cody
2014-04-07 0:24 ` Jeff Cody
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 04/14] block: Move op_blocker check from block_job_create to its caller Fam Zheng
2014-04-06 23:50 ` Jeff Cody
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 05/14] block: Add bdrv_set_backing_hd() Fam Zheng
2014-04-07 0:01 ` Jeff Cody
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 06/14] block: Add backing_blocker in BlockDriverState Fam Zheng
2014-04-07 0:31 ` Jeff Cody
2014-04-08 7:37 ` Fam Zheng
2014-04-09 18:29 ` Jeff Cody
2014-04-10 2:36 ` Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 07/14] block: Parse "backing" option to reference existing BDS Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 08/14] block: Support dropping active in bdrv_drop_intermediate Fam Zheng
2014-04-07 18:47 ` Jeff Cody
2014-04-08 8:15 ` Markus Armbruster
2014-04-08 9:07 ` Fam Zheng
2014-04-09 18:12 ` Jeff Cody
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 09/14] stream: Use bdrv_drop_intermediate and drop close_unused_images Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 10/14] qmp: Add command 'blockdev-backup' Fam Zheng
2014-04-07 21:07 ` Eric Blake
2014-04-08 7:00 ` Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 11/14] block: Allow backup on referenced named BlockDriverState Fam Zheng
2014-03-10 7:26 ` Fam Zheng [this message]
2014-04-07 21:11 ` [Qemu-devel] [PATCH v17 12/14] block: Add blockdev-backup to transaction Eric Blake
2014-04-10 2:15 ` Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 13/14] qemu-iotests: Test blockdev-backup in 055 Fam Zheng
2014-03-10 7:26 ` [Qemu-devel] [PATCH v17 14/14] qemu-iotests: Image fleecing test case 083 Fam Zheng
2014-04-02 6:01 ` [Qemu-devel] [PATCH v17 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD Fam Zheng
2014-04-03 1:53 ` Jeff Cody
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=1394436370-8908-13-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=armbru@redhat.com \
--cc=benoit.canet@irqsave.net \
--cc=imain@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=ptoscano@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).