[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/20] blockjob: add block_job_get_aio_context()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 16/20] blockjob: add block_job_get_aio_context() |
Date: |
Mon, 20 Jun 2016 15:05:27 +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>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 06/20] libqos: drop duplicated virtio_blk.h definitions, (continued)
- [Qemu-devel] [PULL 06/20] libqos: drop duplicated virtio_blk.h definitions, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 08/20] libqos: drop duplicated virtio_pci.h definitions, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 07/20] libqos: drop duplicated virtio_scsi.h definitions, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 09/20] libqos: add qvirtqueue_cleanup(), Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 11/20] block: fix race in bdrv_co_discard with drive-mirror, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 10/20] block: fixed BdrvTrackedRequest filling in bdrv_co_discard, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 12/20] block: process before_write_notifiers in bdrv_co_discard, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 15/20] blockjob: add pause points, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 14/20] blockjob: rename block_job_is_paused(), Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 13/20] blockjob: move iostatus reset out of block_job_enter(), Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 16/20] blockjob: add block_job_get_aio_context(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 17/20] block: use safe iteration over AioContext notifiers, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 18/20] blockjob: add AioContext attached callback, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 20/20] backup: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/20
- [Qemu-devel] [PULL 19/20] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/20
- Re: [Qemu-devel] [PULL 00/20] Block patches, Peter Maydell, 2016/06/20