From nobody Mon Feb 9 03:12:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668793408; cv=none; d=zohomail.com; s=zohoarc; b=a38SF8lEpB8/6wF6Xt7MuvcRpj1p9y+7BviX3RdQfq4fownUgZu1NzdagfsKtAIIymHyWMJnfdLqSLLddUSjrdjYpEr0DsGHBmJJ3zYCMBHB5GOXG2Waz9zJeKIWd58eop9oWjok5i5r77Zp+aX1xNshqV6u48ji0jXOo+UwHS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668793408; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rl+fzsBx59LYW8sGc8ntS9i9ULrJiALOFToltQrQgj8=; b=Y0aocxw0o89HgrDWHDx6W9S8A3Dpd52yNvYz+N1sCjEyn3oztC53fWMNiO2L+FeMi3pLyyFqPXPhbt5syI4Fm59EOGYZ3K5KiPBET0u57o4fHv94VivV7QontGHuI8wtzSXShJMvKOhEoTgoz3z5spuLYMlaazV4MiCHe2F9utE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668793408615929.3808730031243; Fri, 18 Nov 2022 09:43:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ow5Mz-0006EB-T6; Fri, 18 Nov 2022 12:41:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow5Mx-0006Ct-Nk for qemu-devel@nongnu.org; Fri, 18 Nov 2022 12:41:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow5Mw-0002W1-9M for qemu-devel@nongnu.org; Fri, 18 Nov 2022 12:41:39 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-339-1d6RdKQgODO3PrLkq8yvFA-1; Fri, 18 Nov 2022 12:41:34 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 02AD23C10146; Fri, 18 Nov 2022 17:41:34 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB428492B04; Fri, 18 Nov 2022 17:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668793297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rl+fzsBx59LYW8sGc8ntS9i9ULrJiALOFToltQrQgj8=; b=DFVwGqMzRLaO4amH87H3tMn2HP99QzdK88d54fhmOiTcWF5r3vstJbcMrpSm8h0Tm2NvXI 7dCy2mbIFlFnsNBSJNcKB3IfRCtpEMyvKNRfJZZjQJ1YDrzXTqEKVC5yp+mfeGdYHN8qJD CNF+d03SiF/5Qy9sYKnGvojB0W4H3Vc= X-MC-Unique: 1d6RdKQgODO3PrLkq8yvFA-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, eesposit@redhat.com, stefanha@redhat.com, hreitz@redhat.com, pbonzini@redhat.com, vsementsov@yandex-team.ru, qemu-devel@nongnu.org Subject: [PATCH v2 08/15] block: Don't use subtree drains in bdrv_drop_intermediate() Date: Fri, 18 Nov 2022 18:41:03 +0100 Message-Id: <20221118174110.55183-9-kwolf@redhat.com> In-Reply-To: <20221118174110.55183-1-kwolf@redhat.com> References: <20221118174110.55183-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668793411013100003 Content-Type: text/plain; charset="utf-8" Instead of using a subtree drain from the top node (which also drains child nodes of base that we're not even interested in), use a normal drain for base, which automatically drains all of the parents, too. Signed-off-by: Kevin Wolf Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 59eafcc54c..298954d514 100644 --- a/block.c +++ b/block.c @@ -5599,7 +5599,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, Blo= ckDriverState *base, GLOBAL_STATE_CODE(); =20 bdrv_ref(top); - bdrv_subtree_drained_begin(top); + bdrv_drained_begin(base); =20 if (!top->drv || !base->drv) { goto exit; @@ -5672,7 +5672,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, Blo= ckDriverState *base, =20 ret =3D 0; exit: - bdrv_subtree_drained_end(top); + bdrv_drained_end(base); bdrv_unref(top); return ret; } --=20 2.38.1