From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEzqB-00083V-0W for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEzq8-00078x-4R for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:06:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEzq7-00078g-Ri for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:06:12 -0400 From: Stefan Hajnoczi Date: Mon, 20 Jun 2016 15:05:27 +0100 Message-Id: <1466431531-17806-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1466431531-17806-1-git-send-email-stefanha@redhat.com> References: <1466431531-17806-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 16/20] blockjob: add block_job_get_aio_context() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi 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 Reviewed-by: Paolo Bonzini Reviewed-by: Fam Zheng Message-id: 1466096189-6477-5-git-send-email-stefanha@redhat.com --- blockjob.c | 15 ++++++++++++--- 1 file 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); -- 2.5.5