From nobody Thu Nov 13 13:37:44 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=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 1580420903798260.09001436664187; Thu, 30 Jan 2020 13:48:23 -0800 (PST) Received: from localhost ([::1]:39728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHfi-00014W-PX for importer@patchew.org; Thu, 30 Jan 2020 16:48:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHcG-0004S9-4F for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixHcF-0003OJ-0L for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:48 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33558 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixHcE-0003M5-RT for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:46 -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-344-JBtIOu1cNbmREPExzFMkkg-1; Thu, 30 Jan 2020 16:44:41 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5EE81005F76; Thu, 30 Jan 2020 21:44:40 +0000 (UTC) Received: from localhost (ovpn-204-145.brq.redhat.com [10.40.204.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CDE360BE1; Thu, 30 Jan 2020 21:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580420686; 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=YkqxlVGYqeQ2kN5TdDYnJb9onnZj65OuIAqL7EzEkck=; b=bmhMj6KvLbCjV3B6JhlnJaTk1t6tzCjpRXPEjOqMyUPXOg+ZdXjaOo0Aomucg+iBJXZt0x +Iuk+mX1eIA/ImMcTr3r+rV8PKjrcVaPO8fPQTEQ1V6aWewWDb88nxlYz0c7lV9gL8nhW9 4LUT9trzLCF/rKWczJUcHcoTyVSPCsA= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 03/21] block: Drop bdrv_is_first_non_filter() Date: Thu, 30 Jan 2020 22:44:13 +0100 Message-Id: <20200130214431.333510-4-mreitz@redhat.com> In-Reply-To: <20200130214431.333510-1-mreitz@redhat.com> References: <20200130214431.333510-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: JBtIOu1cNbmREPExzFMkkg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It is unused now. (And it was ugly because it needed to explore all BDS chains from the top.) Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 26 -------------------------- include/block/block.h | 1 - 2 files changed, 27 deletions(-) diff --git a/block.c b/block.c index 99ce26d64d..6f58a4900f 100644 --- a/block.c +++ b/block.c @@ -6212,32 +6212,6 @@ bool bdrv_recurse_is_first_non_filter(BlockDriverSta= te *bs, return false; } =20 -/* This function checks if the candidate is the first non filter bs down i= t's - * bs chain. Since we don't have pointers to parents it explore all bs cha= ins - * from the top. Some filters can choose not to pass down the recursion. - */ -bool bdrv_is_first_non_filter(BlockDriverState *candidate) -{ - BlockDriverState *bs; - BdrvNextIterator it; - - /* walk down the bs forest recursively */ - for (bs =3D bdrv_first(&it); bs; bs =3D bdrv_next(&it)) { - bool perm; - - /* try to recurse in this top level bs */ - perm =3D bdrv_recurse_is_first_non_filter(bs, candidate); - - /* candidate is the first non filter */ - if (perm) { - bdrv_next_cleanup(&it); - return true; - } - } - - return false; -} - BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, const char *node_name, Error **err= p) { diff --git a/include/block/block.h b/include/block/block.h index e9dcfef7fa..8f6a0cad9c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -404,7 +404,6 @@ int bdrv_amend_options(BlockDriverState *bs_new, QemuOp= ts *opts, /* external snapshots */ bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs, BlockDriverState *candidate); -bool bdrv_is_first_non_filter(BlockDriverState *candidate); =20 /* check if a named node can be replaced when doing drive-mirror */ BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, --=20 2.24.1