From ee7b9d7867634d052f2c695fcebf68f585fe59c0 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 14 Aug 2019 08:42:27 +0100 Subject: [PATCH 04/10] block: Fix AioContext switch for drained node RH-Author: Kevin Wolf Message-id: <20190814084229.6458-4-kwolf@redhat.com> Patchwork-id: 89969 O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 3/5] block: Fix AioContext switch for drained node Bugzilla: 1716349 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz RH-Acked-by: Paolo Bonzini When a drained node changes its AioContext, we need to move its aio_disable_external() to the new context, too. Without this fix, drain_end will try to reenable the new context, which has never been disabled, so an assertion failure is triggered. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake (cherry picked from commit e64f25f30b80a71bd4e409ed518c39eeb5905166) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block.c b/block.c index 82b16df..9d9b8a9 100644 --- a/block.c +++ b/block.c @@ -4948,6 +4948,9 @@ void bdrv_detach_aio_context(BlockDriverState *bs) bdrv_detach_aio_context(child->bs); } + if (bs->quiesce_counter) { + aio_enable_external(bs->aio_context); + } bs->aio_context = NULL; } @@ -4961,6 +4964,10 @@ void bdrv_attach_aio_context(BlockDriverState *bs, return; } + if (bs->quiesce_counter) { + aio_disable_external(new_context); + } + bs->aio_context = new_context; QLIST_FOREACH(child, &bs->children, next) { -- 1.8.3.1