From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvldR-0006LX-18 for qemu-devel@nongnu.org; Mon, 18 Feb 2019 11:19:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvldQ-0002R9-4O for qemu-devel@nongnu.org; Mon, 18 Feb 2019 11:19:13 -0500 From: Kevin Wolf Date: Mon, 18 Feb 2019 17:18:21 +0100 Message-Id: <20190218161822.3573-12-kwolf@redhat.com> In-Reply-To: <20190218161822.3573-1-kwolf@redhat.com> References: <20190218161822.3573-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 11/12] block: Use normal drain for bdrv_set_aio_context() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, stefanha@redhat.com, berrange@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org 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 --- block.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index aefb5701f5..7024172db8 100644 --- a/block.c +++ b/block.c @@ -5268,18 +5268,15 @@ void bdrv_attach_aio_context(BlockDriverState *bs= , bs->walking_aio_notifiers =3D false; } =20 +/* The caller must own the AioContext lock for the old AioContext of bs,= but it + * must not own the AioContext lock for new_context. */ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context) { - AioContext *ctx =3D bdrv_get_aio_context(bs); - - if (ctx =3D=3D new_context) { + if (bdrv_get_aio_context(bs) =3D=3D new_context) { return; } =20 - 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); =20 /* This function executes in the old AioContext so acquire the new o= ne in @@ -5287,8 +5284,7 @@ void bdrv_set_aio_context(BlockDriverState *bs, Aio= Context *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); } =20 --=20 2.20.1