summary refs log tree commit diff stats
path: root/blockjob.c
diff options
context:
space:
mode:
authorHanna Reitz <hreitz@redhat.com>2022-11-07 16:13:19 +0100
committerKevin Wolf <kwolf@redhat.com>2022-11-10 14:58:34 +0100
commitd5f8d79c2f1f22cb883ae404abff1ee8276d47f1 (patch)
tree110f3f8973f0df4c52a57a8bb9abcb4ec8bd85d5 /blockjob.c
parente56b0c66310feab14a14dd6a24fd58dae178e059 (diff)
downloadfocaccia-qemu-d5f8d79c2f1f22cb883ae404abff1ee8276d47f1.tar.gz
focaccia-qemu-d5f8d79c2f1f22cb883ae404abff1ee8276d47f1.zip
block: Make bdrv_child_get_parent_aio_context I/O
We want to use bdrv_child_get_parent_aio_context() from
bdrv_parent_drained_{begin,end}_single(), both of which are "I/O or GS"
functions.

Prior to 3ed4f708fe1, all the implementations were I/O code anyway.
3ed4f708fe1 has put block jobs' AioContext field under the job mutex, so
to make child_job_get_parent_aio_context() work in an I/O context, we
need to take that lock there.

Furthermore, blk_root_get_parent_aio_context() is not marked as
anything, but is safe to run in an I/O context, so mark it that way now.
(blk_get_aio_context() is an I/O code function.)

With that done, all implementations explicitly are I/O code, so we can
mark bdrv_child_get_parent_aio_context() as I/O code, too, so callers
know it is safe to run from both GS and I/O contexts.

Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20221107151321.211175-2-hreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockjob.c')
-rw-r--r--blockjob.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/blockjob.c b/blockjob.c
index 2d86014fa5..f51d4e18f3 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -173,7 +173,8 @@ static bool child_job_change_aio_ctx(BdrvChild *c, AioContext *ctx,
 static AioContext *child_job_get_parent_aio_context(BdrvChild *c)
 {
     BlockJob *job = c->opaque;
-    GLOBAL_STATE_CODE();
+    IO_CODE();
+    JOB_LOCK_GUARD();
 
     return job->job.aio_context;
 }