[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/8] blockjob: add block_job_get_aio_context()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v5 4/8] blockjob: add block_job_get_aio_context() |
Date: |
Thu, 16 Jun 2016 17:56:25 +0100 |
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 <address@hidden>
---
blockjob.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 9357456..18722b0 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
- [Qemu-devel] [PATCH v5 0/8] blockjob: AioContext change support for mirror and backup, Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 4/8] blockjob: add block_job_get_aio_context(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v5 2/8] blockjob: rename block_job_is_paused(), Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 3/8] blockjob: add pause points, Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 6/8] blockjob: add AioContext attached callback, Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 1/8] blockjob: move iostatus reset out of block_job_enter(), Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 8/8] backup: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 7/8] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/16
- [Qemu-devel] [PATCH v5 5/8] block: use safe iteration over AioContext notifiers, Stefan Hajnoczi, 2016/06/16
- Re: [Qemu-devel] [PATCH v5 0/8] blockjob: AioContext change support for mirror and backup, Paolo Bonzini, 2016/06/16
- Re: [Qemu-devel] [PATCH v5 0/8] blockjob: AioContext change support for mirror and backup, Stefan Hajnoczi, 2016/06/17