diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-02-15 13:13:12 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-02-25 15:03:19 +0100 |
| commit | 6c75d761d0a6d8b235140dd97493006a0cd61af4 (patch) | |
| tree | a0dcafd549a80253fce6851d56b31b0f474e3622 /block.c | |
| parent | 28e0b2d2e13ef7c4dd645b1fd393f52009469803 (diff) | |
| download | qemu-6c75d761d0a6d8b235140dd97493006a0cd61af4.zip qemu-6c75d761d0a6d8b235140dd97493006a0cd61af4.tar.gz qemu-6c75d761d0a6d8b235140dd97493006a0cd61af4.tar.bz2 | |
block: Don't poll in bdrv_set_aio_context()
The explicit aio_poll() call in bdrv_set_aio_context() was added in
commit c2b6428d388 as a workaround for bdrv_drain() failing to achieve
to actually quiesce everything (specifically the NBD client code to
switch AioContext).
Now that the NBD client has been fixed to complete this operation during
bdrv_drain(), we don't need the workaround any more.
It was wrong anyway: aio_poll() must always be run in the home thread of
the AioContext.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -5273,10 +5273,6 @@ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context) bdrv_parent_drained_begin(bs, NULL, false); bdrv_drain(bs); /* ensure there are no in-flight requests */ - while (aio_poll(ctx, false)) { - /* wait for all bottom halves to execute */ - } - bdrv_detach_aio_context(bs); /* This function executes in the old AioContext so acquire the new one in |