Signed-off-by: Fam Zheng <f...@redhat.com> --- blockdev.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 4 ++++ qapi/block-core.json | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c index 5cbf93e..cf85e59 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1488,6 +1488,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"); @@ -1510,6 +1553,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 24379ab..1ddd395 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1254,11 +1254,15 @@ # # A discriminated record of operations that can be performed with # @transaction. +# +# Since 1.1 +# blockdev-backup since 2.3 ## { 'union': 'TransactionAction', 'data': { 'blockdev-snapshot-sync': 'BlockdevSnapshot', 'drive-backup': 'DriveBackup', + 'blockdev-backup': 'BlockdevBackup', 'abort': 'Abort', 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal' } } diff --git a/qapi/block-core.json b/qapi/block-core.json index 838b7d6..8c0592f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -698,7 +698,7 @@ # If an error occurs during a guest write request, the device's rerror/werror # actions will be used. # -# Since: 2.2 +# Since: 2.3 ## { 'type': 'BlockdevBackup', 'data': { 'device': 'str', 'target': 'str', -- 1.9.3