diff options
| author | Paolo Bonzini | 2017-02-13 14:52:31 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-02-21 12:39:39 +0100 |
| commit | 1919631e6b5562e474690853eca3c35610201e16 (patch) | |
| tree | f2a7e1da7d7d0ad988faa4801309a45a68c78b60 /block/io.c | |
| parent | block: explicitly acquire aiocontext in callbacks that need it (diff) | |
| download | qemu-1919631e6b5562e474690853eca3c35610201e16.tar.gz qemu-1919631e6b5562e474690853eca3c35610201e16.tar.xz qemu-1919631e6b5562e474690853eca3c35610201e16.zip | |
block: explicitly acquire aiocontext in bottom halves that need it
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170213135235.12274-15-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/io.c')
| -rw-r--r-- | block/io.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/io.c b/block/io.c index dd6c74f62c..8486e27677 100644 --- a/block/io.c +++ b/block/io.c @@ -189,7 +189,7 @@ static void bdrv_co_drain_bh_cb(void *opaque) bdrv_dec_in_flight(bs); bdrv_drained_begin(bs); data->done = true; - qemu_coroutine_enter(co); + aio_co_wake(co); } static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs) @@ -2152,9 +2152,13 @@ static void bdrv_co_complete(BlockAIOCBCoroutine *acb) static void bdrv_co_em_bh(void *opaque) { BlockAIOCBCoroutine *acb = opaque; + BlockDriverState *bs = acb->common.bs; + AioContext *ctx = bdrv_get_aio_context(bs); assert(!acb->need_bh); + aio_context_acquire(ctx); bdrv_co_complete(acb); + aio_context_release(ctx); } static void bdrv_co_maybe_schedule_bh(BlockAIOCBCoroutine *acb) |