From nobody Wed Dec 17 05:38:21 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=1625069499; cv=none; d=zohomail.com; s=zohoarc; b=XR/ZkPA18zK8vEmlZgR7t1v3AU62gYfL1hkrvwLs+TvVcVsrHJuHtu+yzaNbxQ69SV+RfBZx1EmVbLDHbx0hSGKQt6vYa4x7vjIapw3AjkfXPYhObWz+XCjkl0gEs791EQGZBd5klTb2JGJHJRVjyTiNNSkHUyMawjRR5pMylw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625069499; 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=4c5/u9scxRPXvTvAEM+hG0QOBGUVzKNr3U3susJdclU=; b=eBjY0STEIn4eriHS+fg8M88+HJmzAuxyepxMnbk3JBa2MWhhCUbLqZ+7pDz2B7N+D9QRnh3QeO65oj05jk+zkFkoDBnLpxc/ST7lQMwrzl4EwOOsgASddAPdMCQWVqC0b9DnXtLPOws3H2UOhWE5K+scop/OFj8UpHtAD+RgqQg= 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 1625069499008940.9123818486515; Wed, 30 Jun 2021 09:11:39 -0700 (PDT) Received: from localhost ([::1]:34516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lycoL-0002rG-Ly for importer@patchew.org; Wed, 30 Jun 2021 12:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lycfQ-0002dp-6V for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:02:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lycfO-0006yW-EY for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:02:23 -0400 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-356-iXPCSrI9OBKb1xyUB6ZCRQ-1; Wed, 30 Jun 2021 12:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5C6F10C1ADC; Wed, 30 Jun 2021 16:02:18 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-114.ams2.redhat.com [10.36.114.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id F246F604CD; Wed, 30 Jun 2021 16:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625068941; 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=4c5/u9scxRPXvTvAEM+hG0QOBGUVzKNr3U3susJdclU=; b=SjSBvvYkH17lj0ied5ThuEz13F7qlFddFw2LQSJYUZWjg4B6HHuSJjFhZNJxmUn4sN7B1t 8rAzvmeL1IdHTpTOEsKdJTa5VEMV8UDyMJ708G1CIFyM7ZAuTbpdrOXhL9E8ypPoBWUQff BFh2z+4XLOL6t9+3yeyY0tL1w0t9c50= X-MC-Unique: iXPCSrI9OBKb1xyUB6ZCRQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 06/24] block: introduce bdrv_remove_file_or_backing_child() Date: Wed, 30 Jun 2021 18:01:48 +0200 Message-Id: <20210630160206.276439-7-kwolf@redhat.com> In-Reply-To: <20210630160206.276439-1-kwolf@redhat.com> References: <20210630160206.276439-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 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) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy To be used for reopen in future commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210610120537.196183-2-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf --- block.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 9518f0e087..7eceef0afa 100644 --- a/block.c +++ b/block.c @@ -4795,17 +4795,16 @@ static TransactionActionDrv bdrv_remove_filter_or_c= ow_child_drv =3D { }; =20 /* - * A function to remove backing-chain child of @bs if exists: cow child for - * format nodes (always .backing) and filter child for filters (may be .fi= le or - * .backing) - * + * A function to remove backing or file child of @bs. * Function doesn't update permissions, caller is responsible for this. */ -static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, - Transaction *tran) +static void bdrv_remove_file_or_backing_child(BlockDriverState *bs, + BdrvChild *child, + Transaction *tran) { BdrvRemoveFilterOrCowChild *s; - BdrvChild *child =3D bdrv_filter_or_cow_child(bs); + + assert(child =3D=3D bs->backing || child =3D=3D bs->file); =20 if (!child) { return; @@ -4830,6 +4829,17 @@ static void bdrv_remove_filter_or_cow_child(BlockDri= verState *bs, } } =20 +/* + * A function to remove backing-chain child of @bs if exists: cow child for + * format nodes (always .backing) and filter child for filters (may be .fi= le or + * .backing) + */ +static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, + Transaction *tran) +{ + bdrv_remove_file_or_backing_child(bs, bdrv_filter_or_cow_child(bs), tr= an); +} + static int bdrv_replace_node_noperm(BlockDriverState *from, BlockDriverState *to, bool auto_skip, Transaction *tran, --=20 2.31.1