From nobody Mon Apr 7 20:37:27 2025 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=1636988733; cv=none; d=zohomail.com; s=zohoarc; b=k0zlBPTCPkvNUJz694B9IB69DP9rR9VmDsfL23qDfG9QmTIN9ZnW+sxptTen45En8tNA1YJt4hoeSp2kVEhPy15OqRsusjv+ISd+tDIDj9K+SKoFZjhiktAKom1si85MItgJtOiOl1vQg+SywIXqWqB7u0scrTq34Ux2DoWzoKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636988733; h=Content-Type: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=pxiQ+5VQoVocv97B4ROLz32XbzrxQBW1M52T/UdBuBI=; b=Yb3oAB3GHzO0KQkPU2ghNpkamxitgJU9oEZjxCV9Z2Y5jei2jozx0AX7XRjbQ8dhZWEmH/N21jSAQvCzqrb+fRwMOHsON89YYEv+Anmdp6IHBa6NIKEfY3/hN7xePeQAaOosrFefLrXLRwmq9/wU/oXqRPrW39CUN6zgixabk5g= 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 1636988733483758.5150097967531; Mon, 15 Nov 2021 07:05:33 -0800 (PST) Received: from localhost ([::1]:51726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmdY4-0000HZ-DV for importer@patchew.org; Mon, 15 Nov 2021 10:05:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmdNQ-0003k5-MS for qemu-devel@nongnu.org; Mon, 15 Nov 2021 09:54:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmdNP-0007p1-4p for qemu-devel@nongnu.org; Mon, 15 Nov 2021 09:54:32 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-Ujgwm5cBOXyOvMpKTSeaQQ-1; Mon, 15 Nov 2021 09:54:23 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 956C015728; Mon, 15 Nov 2021 14:54:22 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A85E19723; Mon, 15 Nov 2021 14:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636988070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pxiQ+5VQoVocv97B4ROLz32XbzrxQBW1M52T/UdBuBI=; b=IJagvL+LLrDdKM4iRed8AiwNPmLox1KyPgBZd0aX0Wp3lOOAuhR2nb+ig0V5p662K2f/xF iHLuDfG/X/xMzPUE34xqccJHXfpAgpb84o07eqhXfv6Zw/W/it+78dUh5Q/TL3d/vOSC6y j0qzS4QXGOoz/I1oXJO+WTtIA5Yia+Q= X-MC-Unique: Ujgwm5cBOXyOvMpKTSeaQQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 06/13] block: Restructure remove_file_or_backing_child() Date: Mon, 15 Nov 2021 15:54:02 +0100 Message-Id: <20211115145409.176785-7-kwolf@redhat.com> In-Reply-To: <20211115145409.176785-1-kwolf@redhat.com> References: <20211115145409.176785-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, 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=unavailable 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: , 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636988855534100001 Content-Type: text/plain; charset="utf-8" From: Hanna Reitz As of a future patch, bdrv_replace_child_tran() will take a BdrvChild ** pointer. Prepare for that by getting such a pointer and using it where applicable, and (dereferenced) as a parameter for bdrv_replace_child_tran(). Signed-off-by: Hanna Reitz Message-Id: <20211111120829.81329-7-hreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- block.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index d668156eca..8da057f800 100644 --- a/block.c +++ b/block.c @@ -4887,30 +4887,33 @@ static void bdrv_remove_file_or_backing_child(Block= DriverState *bs, BdrvChild *child, Transaction *tran) { + BdrvChild **childp; BdrvRemoveFilterOrCowChild *s; =20 - assert(child =3D=3D bs->backing || child =3D=3D bs->file); - if (!child) { return; } =20 + if (child =3D=3D bs->backing) { + childp =3D &bs->backing; + } else if (child =3D=3D bs->file) { + childp =3D &bs->file; + } else { + g_assert_not_reached(); + } + if (child->bs) { - bdrv_replace_child_tran(child, NULL, tran); + bdrv_replace_child_tran(*childp, NULL, tran); } =20 s =3D g_new(BdrvRemoveFilterOrCowChild, 1); *s =3D (BdrvRemoveFilterOrCowChild) { .child =3D child, - .is_backing =3D (child =3D=3D bs->backing), + .is_backing =3D (childp =3D=3D &bs->backing), }; tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s); =20 - if (s->is_backing) { - bs->backing =3D NULL; - } else { - bs->file =3D NULL; - } + *childp =3D NULL; } =20 /* --=20 2.31.1