From nobody Thu Dec 18 13:25:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551108980483849.5585771623764; Mon, 25 Feb 2019 07:36:20 -0800 (PST) Received: from localhost ([127.0.0.1]:39237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyIIi-0003Tu-FS for importer@patchew.org; Mon, 25 Feb 2019 10:36:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI4h-00009x-A7 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:21:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI4e-0000sk-UE for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:21:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56138) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyI4X-0000mt-VL; Mon, 25 Feb 2019 10:21:41 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D23863082E07; Mon, 25 Feb 2019 15:21:35 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-243.ams2.redhat.com [10.36.117.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id C05035C221; Mon, 25 Feb 2019 15:21:34 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 25 Feb 2019 16:20:00 +0100 Message-Id: <20190225152053.15976-19-kwolf@redhat.com> In-Reply-To: <20190225152053.15976-1-kwolf@redhat.com> References: <20190225152053.15976-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 25 Feb 2019 15:21:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 18/71] block: Fix AioContext switch for drained node X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- block.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block.c b/block.c index 17bc1d3dca..aefb5701f5 100644 --- a/block.c +++ b/block.c @@ -5227,6 +5227,9 @@ void bdrv_detach_aio_context(BlockDriverState *bs) bdrv_detach_aio_context(child->bs); } =20 + if (bs->quiesce_counter) { + aio_enable_external(bs->aio_context); + } bs->aio_context =3D NULL; } =20 @@ -5240,6 +5243,10 @@ void bdrv_attach_aio_context(BlockDriverState *bs, return; } =20 + if (bs->quiesce_counter) { + aio_disable_external(new_context); + } + bs->aio_context =3D new_context; =20 QLIST_FOREACH(child, &bs->children, next) { --=20 2.20.1