aboutsummaryrefslogtreecommitdiff
path: root/blockjob.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2016-06-16 17:56:25 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2016-06-20 14:25:41 +0100
commit9f6bc648c40da61a50ea1f51048368faeea5d9a1 (patch)
treedfea544ae34692c3bd1418b67cf878520b7ab6ce /blockjob.c
parentfc9c0a9c4b2c07cf2b8683f2617af584f14c93e7 (diff)
downloadqemu-9f6bc648c40da61a50ea1f51048368faeea5d9a1.zip
qemu-9f6bc648c40da61a50ea1f51048368faeea5d9a1.tar.gz
qemu-9f6bc648c40da61a50ea1f51048368faeea5d9a1.tar.bz2
blockjob: add block_job_get_aio_context()
Add a helper function to document why block jobs sometimes run in the QEMU main loop and to avoid code duplication in a following patch. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Message-id: 1466096189-6477-5-git-send-email-stefanha@redhat.com
Diffstat (limited to 'blockjob.c')
-rw-r--r--blockjob.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/blockjob.c b/blockjob.c
index 874b573..096a1b8 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -60,6 +60,17 @@ BlockJob *block_job_next(BlockJob *job)
return QLIST_NEXT(job, job_list);
}
+/* Normally the job runs in its BlockBackend's AioContext. The exception is
+ * block_job_defer_to_main_loop() where it runs in the QEMU main loop. Code
+ * that supports both cases uses this helper function.
+ */
+static AioContext *block_job_get_aio_context(BlockJob *job)
+{
+ return job->deferred_to_main_loop ?
+ qemu_get_aio_context() :
+ blk_get_aio_context(job->blk);
+}
+
void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
int64_t speed, BlockCompletionFunc *cb,
void *opaque, Error **errp)
@@ -337,9 +348,7 @@ static int block_job_finish_sync(BlockJob *job,
return -EBUSY;
}
while (!job->completed) {
- aio_poll(job->deferred_to_main_loop ? qemu_get_aio_context() :
- blk_get_aio_context(job->blk),
- true);
+ aio_poll(block_job_get_aio_context(job), true);
}
ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret;
block_job_unref(job);