summaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2015-10-23 11:08:11 +0800
committerKevin Wolf <kwolf@redhat.com>2015-10-23 18:18:24 +0200
commit1fdd4b7be3655d39c3594bc215eb1df5ce225c7d (patch)
tree3bc0dfa56410b2993c17b74df388f5e42c351ef3 /blockdev.c
parentda763e83012c066ebe3effbaa8e7e7c8f78b0fbf (diff)
downloadqemu-1fdd4b7be3655d39c3594bc215eb1df5ce225c7d.tar.gz
qemu-1fdd4b7be3655d39c3594bc215eb1df5ce225c7d.tar.bz2
qemu-1fdd4b7be3655d39c3594bc215eb1df5ce225c7d.zip
block: Add "drained begin/end" for transactional backup
This ensures the atomicity of the transaction by avoiding processing of external requests such as those from ioeventfd. Move the assignment to state->bs up right after bdrv_drained_begin, so that we can use it in the clean callback. The abort callback will still check bs->job and state->job, so it's OK. 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>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c
index e4a5eb43b8..0a7848bd66 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1684,9 +1684,16 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp)
return;
}
+ if (!blk_is_available(blk)) {
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, backup->device);
+ return;
+ }
+
/* AioContext is released in .clean() */
state->aio_context = blk_get_aio_context(blk);
aio_context_acquire(state->aio_context);
+ bdrv_drained_begin(blk_bs(blk));
+ state->bs = blk_bs(blk);
qmp_drive_backup(backup->device, backup->target,
backup->has_format, backup->format,
@@ -1702,7 +1709,6 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp)
return;
}
- state->bs = blk_bs(blk);
state->job = state->bs->job;
}
@@ -1722,6 +1728,7 @@ static void drive_backup_clean(BlkTransactionState *common)
DriveBackupState *state = DO_UPCAST(DriveBackupState, common, common);
if (state->aio_context) {
+ bdrv_drained_end(state->bs);
aio_context_release(state->aio_context);
}
}