mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Add "drained begin/end" for transactional blockdev-backup

Browse Source 
Similar to the previous patch, make sure that external events are not
dispatched during transaction operations.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2015-10-23 11:08:12 +08:00 committed by Kevin Wolf
parent 1fdd4b7be3
commit ff52bf36a3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
blockdev.c
View File

@ -1756,6 +1756,11 @@ static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp)
return; return;
} }
if (!blk_is_available(blk)) {
error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, backup->device);
return;
}
target = blk_by_name(backup->target); target = blk_by_name(backup->target);
if (!target) { if (!target) {
error_setg(errp, "Device '%s' not found", backup->target); error_setg(errp, "Device '%s' not found", backup->target);
@ -1770,6 +1775,8 @@ static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp)
return; return;
} }
aio_context_acquire(state->aio_context); aio_context_acquire(state->aio_context);
state->bs = blk_bs(blk);
bdrv_drained_begin(state->bs);
qmp_blockdev_backup(backup->device, backup->target, qmp_blockdev_backup(backup->device, backup->target,
backup->sync, backup->sync,
@ -1782,7 +1789,6 @@ static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp)
return; return;
} }
state->bs = blk_bs(blk);
state->job = state->bs->job; state->job = state->bs->job;
} }
@ -1802,6 +1808,7 @@ static void blockdev_backup_clean(BlkTransactionState *common)
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
if (state->aio_context) { if (state->aio_context) {
bdrv_drained_end(state->bs);
aio_context_release(state->aio_context); aio_context_release(state->aio_context);
} }
} }