aboutsummaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2019-02-08 16:53:37 +0100
committerKevin Wolf <kwolf@redhat.com>2019-02-25 15:03:19 +0100
commitd70d595429ecd9ac4917e53453dd8979db8e5ffd (patch)
treebe89e6de257b5ad98488c7e3c6c00bec2b5db75b /block.c
parent247d2737715833525725d27e5cecf5840c62f900 (diff)
downloadqemu-d70d595429ecd9ac4917e53453dd8979db8e5ffd.zip
qemu-d70d595429ecd9ac4917e53453dd8979db8e5ffd.tar.gz
qemu-d70d595429ecd9ac4917e53453dd8979db8e5ffd.tar.bz2
block: Use normal drain for bdrv_set_aio_context()
Now that bdrv_set_aio_context() works inside drained sections, it can also use the real drain function instead of open coding something similar. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/block.c b/block.c
index aefb570..375a216 100644
--- a/block.c
+++ b/block.c
@@ -5268,18 +5268,16 @@ void bdrv_attach_aio_context(BlockDriverState *bs,
bs->walking_aio_notifiers = false;
}
+/* The caller must own the AioContext lock for the old AioContext of bs, but it
+ * must not own the AioContext lock for new_context (unless new_context is
+ * the same as the current context of bs). */
void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context)
{
- AioContext *ctx = bdrv_get_aio_context(bs);
-
- if (ctx == new_context) {
+ if (bdrv_get_aio_context(bs) == new_context) {
return;
}
- aio_disable_external(ctx);
- bdrv_parent_drained_begin(bs, NULL, false);
- bdrv_drain(bs); /* ensure there are no in-flight requests */
-
+ bdrv_drained_begin(bs);
bdrv_detach_aio_context(bs);
/* This function executes in the old AioContext so acquire the new one in
@@ -5287,8 +5285,7 @@ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context)
*/
aio_context_acquire(new_context);
bdrv_attach_aio_context(bs, new_context);
- bdrv_parent_drained_end(bs, NULL, false);
- aio_enable_external(ctx);
+ bdrv_drained_end(bs);
aio_context_release(new_context);
}