From nobody Wed May 15 10:27:17 2024 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1693594032; cv=none; d=zohomail.com; s=zohoarc; b=AudVp5eHeegEdjleQDuj5jk4WfgebTLg0FhCSkdszrZt8sZiERiK6WzC+KvMv3wIcag8e5CZMBAiun0Ta4OhsQLgNURmFLHF3ROe7w1CxudtyHfbyp5rmi26D5eKHHfZb55L45qExFIsks+2cgUclfa9C1KozfKj20gCBUJOfaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693594032; 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=RXj0EuXOLKtqtlvBCvBMqLRUqLmYf6zo5k0zO0GeMwE=; b=U0uhoQobd+Y15cpSu/hS4YEC1ne6OIZDNASxcU2JIgYQocgVGKJJfkuhK6xQX0Th9HX32ob2UGHPqw0Y7mqACB0VySDIFcxM+3RXlh6hvg4mvlMQ4nebLj2I4bVYLFax27dNlantQyWZGlrjvl2MMQg85WIkca2vJGG8cWpOrUw= 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 1693594032310506.3802657856754; Fri, 1 Sep 2023 11:47:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qc99z-00046b-7f; Fri, 01 Sep 2023 14:46:23 -0400 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 1qc99r-00045k-WF; Fri, 01 Sep 2023 14:46:19 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qc99p-0004YT-Pl; Fri, 01 Sep 2023 14:46:15 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4A2A21F74B; Fri, 1 Sep 2023 18:46:11 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BC5A213582; Fri, 1 Sep 2023 18:46:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wCxRIXEx8mSQVgAAMHmgww (envelope-from ); Fri, 01 Sep 2023 18:46:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1693593971; h=from:from:reply-to: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=RXj0EuXOLKtqtlvBCvBMqLRUqLmYf6zo5k0zO0GeMwE=; b=s8DI6As8tvoow1aez7fY+55jPVnarjVoDkdfepKy33fco2s1K+nydJrfLFKtBpvTuF0iyQ YOQ+U1JJKPehmLANCifUYPiL1OhYQE3/lvjQjI8rvJ3unQ6Uk9GdZPl9ijAB5+42XSfzMX PhyfHfCmkeRZPsRn6lRiUXQ7M1KMtNU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1693593971; h=from:from:reply-to: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=RXj0EuXOLKtqtlvBCvBMqLRUqLmYf6zo5k0zO0GeMwE=; b=O+ln7/q+5jTto4+tdcWpG6qt4db1tjwYQLBeId9I9TqC+BQAPqTRwNktWR71YpUHGhrS+F 0kGHI2W+Uv8We8Bw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Claudio Fontana , Kevin Wolf , Hanna Reitz Subject: [PATCH RESEND 1/2] block: Remove bdrv_query_block_node_info Date: Fri, 1 Sep 2023 15:46:04 -0300 Message-Id: <20230901184605.32260-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230901184605.32260-1-farosas@suse.de> References: <20230901184605.32260-1-farosas@suse.de> MIME-Version: 1.0 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=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1693594034380100001 Content-Type: text/plain; charset="utf-8" The last call site of this function has been removed by commit c04d0ab026 ("qemu-img: Let info print block graph"). Reviewed-by: Claudio Fontana Signed-off-by: Fabiano Rosas --- block/qapi.c | 27 --------------------------- include/block/qapi.h | 3 --- 2 files changed, 30 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index f34f95e0ef..79bf80c503 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -309,33 +309,6 @@ out: aio_context_release(bdrv_get_aio_context(bs)); } =20 -/** - * bdrv_query_block_node_info: - * @bs: block node to examine - * @p_info: location to store node information - * @errp: location to store error information - * - * Store image information about @bs in @p_info. - * - * @p_info will be set only on success. On error, store error in @errp. - */ -void bdrv_query_block_node_info(BlockDriverState *bs, - BlockNodeInfo **p_info, - Error **errp) -{ - BlockNodeInfo *info; - ERRP_GUARD(); - - info =3D g_new0(BlockNodeInfo, 1); - bdrv_do_query_node_info(bs, info, errp); - if (*errp) { - qapi_free_BlockNodeInfo(info); - return; - } - - *p_info =3D info; -} - /** * bdrv_query_image_info: * @bs: block node to examine diff --git a/include/block/qapi.h b/include/block/qapi.h index 18d48ddb70..8663971c58 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -36,9 +36,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, int bdrv_query_snapshot_info_list(BlockDriverState *bs, SnapshotInfoList **p_list, Error **errp); -void bdrv_query_block_node_info(BlockDriverState *bs, - BlockNodeInfo **p_info, - Error **errp); void bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat, --=20 2.35.3 From nobody Wed May 15 10:27:17 2024 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1693594032; cv=none; d=zohomail.com; s=zohoarc; b=lIeSqs5QOH+10phWupJCX7Y4pz8+dhorI/i6I6vHUc/EOWQG3eCySn/iUtF0oZRze34MGKHUnDqq67Jduw6zkaXKkQksmgsCVZjmRubdF1XUcETJry7Pd85bJVLX/FIeFc8rUO+Y+t6GdXCEwMdka8aSZQZmXocTwxLP97IlhRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693594032; 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=0/w8zdoisvVJ4YCLwfJ6mIWVKjAa3skUegEf5BvHmvw=; b=MzZp2JjTOiynaFY3IJLeBcEQZACnf4PtefGenDvVsz89yim7exfatElcXmmhuROGkxrDZJdytcixkAA4vIGo7Ia81gGvx9uZPB+uBjL0+XmL7sINVMA9cX1IL2kLa09Tq7oxgsc2IecULtwpdmV5gvnPFwHMb9zpvbdSMAvDTZU= 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 1693594032856872.4750059861608; Fri, 1 Sep 2023 11:47:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qc9A2-00047G-Fw; Fri, 01 Sep 2023 14:46:26 -0400 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 1qc99v-00045z-9V; Fri, 01 Sep 2023 14:46:19 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qc99r-0004ZA-Ek; Fri, 01 Sep 2023 14:46:17 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3550A21847; Fri, 1 Sep 2023 18:46:13 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B296913582; Fri, 1 Sep 2023 18:46:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OK7cHnMx8mSQVgAAMHmgww (envelope-from ); Fri, 01 Sep 2023 18:46:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1693593973; h=from:from:reply-to: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=0/w8zdoisvVJ4YCLwfJ6mIWVKjAa3skUegEf5BvHmvw=; b=x6X1wWyJWwtKxdZV92ULPvaTo5tFJUg9kQHI+7wrGfvtWlbpfpDrsJDipl6s6YBbHX1/1f CjyFASku4fEsAh2Lt4nzA5CRjdrnL9AGx6DPon9BUia6FTlAT3CjZHfOmXMSpVo4Ty5zIT DIvs8ODraAE5wgBy32Doikb4MbvI+TE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1693593973; h=from:from:reply-to: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=0/w8zdoisvVJ4YCLwfJ6mIWVKjAa3skUegEf5BvHmvw=; b=vLxY1DQ9l3/R2SAN2NIQNatDhAkBclQgVNukJ0vvAlgg5whrv7BsxQILNLKgON25hUV7aC w1zUGdaFVUuNfoDQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz Subject: [PATCH RESEND 2/2] block: Remove unnecessary variable in bdrv_block_device_info Date: Fri, 1 Sep 2023 15:46:05 -0300 Message-Id: <20230901184605.32260-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230901184605.32260-1-farosas@suse.de> References: <20230901184605.32260-1-farosas@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=195.135.220.28; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1693594034428100003 The commit 5d8813593f ("block/qapi: Let bdrv_query_image_info() recurse") removed the loop where we set the 'bs0' variable, so now it is just the same as 'bs'. Signed-off-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qapi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 79bf80c503..1cbb0935ff 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -48,7 +48,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, { ImageInfo **p_image_info; ImageInfo *backing_info; - BlockDriverState *bs0, *backing; + BlockDriverState *backing; BlockDeviceInfo *info; ERRP_GUARD(); =20 @@ -145,7 +145,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *b= lk, =20 info->write_threshold =3D bdrv_write_threshold_get(bs); =20 - bs0 =3D bs; p_image_info =3D &info->image; info->backing_file_depth =3D 0; =20 @@ -153,7 +152,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *b= lk, * Skip automatically inserted nodes that the user isn't aware of for * query-block (blk !=3D NULL), but not for query-named-block-nodes */ - bdrv_query_image_info(bs0, p_image_info, flat, blk !=3D NULL, errp); + bdrv_query_image_info(bs, p_image_info, flat, blk !=3D NULL, errp); if (*errp) { qapi_free_BlockDeviceInfo(info); return NULL; --=20 2.35.3