From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmdBP-0006Qk-8n for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmdBI-0001UK-W7 for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmdBI-0001U9-Nm for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:44 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4K65idw008152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 May 2014 02:05:44 -0400 From: Fam Zheng Date: Tue, 20 May 2014 14:04:38 +0800 Message-Id: <1400565880-13409-14-git-send-email-famz@redhat.com> In-Reply-To: <1400565880-13409-1-git-send-email-famz@redhat.com> References: <1400565880-13409-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v20 13/15] block: Add blockdev-backup to transaction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, hbrock@redhat.com, rjones@redhat.com, armbru@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com Signed-off-by: Fam Zheng --- 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