falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Hajnoczi 2016-06-16 17:56:25 +01:00
parent fc9c0a9c4b
commit 9f6bc648c4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
blockjob.c
View File

@ -60,6 +60,17 @@ BlockJob *block_job_next(BlockJob *job)
return QLIST_NEXT(job, job_list); 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, void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
int64_t speed, BlockCompletionFunc *cb, int64_t speed, BlockCompletionFunc *cb,
void *opaque, Error **errp) void *opaque, Error **errp)
@ -337,9 +348,7 @@ static int block_job_finish_sync(BlockJob *job,
return -EBUSY; return -EBUSY;
} }
while (!job->completed) { while (!job->completed) {
aio_poll(job->deferred_to_main_loop ? qemu_get_aio_context() : aio_poll(block_job_get_aio_context(job), true);
blk_get_aio_context(job->blk),
true);
} }
ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret; ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret;
block_job_unref(job); block_job_unref(job);