From nobody Mon Apr 13 12:29:22 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772822349; cv=none; d=zohomail.com; s=zohoarc; b=CAISEIAJQO33LxFKsPVI7Z4Y7zQnm+BJWrQLu/AYnmwACeqOaZKvHHAa7/DqORnjBtsrmFkAXkqXAT0/m4sFDWBP9SavSJYdQzJrTkilBAX7kVE874YxfmJyivIYr05Afyw15jNfJh0iX8EvVtrweKpgftB488zMs4CTWP1p4PQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772822349; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MIeLdvVFIKObafQGe5aVUZvf+Z6x4t6Sc41WSfM/hm0=; b=WuhK3glNqPPFR1rrIJgojgQA74/WouSjXrn2oSPvLxFUv5knm8l+oWlztPtft9RlWB3Pm5JcBWWayuHPXqAi7A7SqiUtMUerBGSlOc3nFbTneuFHJkwx24bzdbRldaFCzGTpLetHNiKRjgFyPIDx5ygoVCrowuPIRZw9GvRyxgY= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772822349304961.6235679812156; Fri, 6 Mar 2026 10:39:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vya42-00010w-K6; Fri, 06 Mar 2026 13:38:18 -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 1vya41-0000zn-0x for qemu-devel@nongnu.org; Fri, 06 Mar 2026 13:38:17 -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 1vya3z-00062y-9n for qemu-devel@nongnu.org; Fri, 06 Mar 2026 13:38:16 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-wqoZU1tROkiVi6Q3mP4W_w-1; Fri, 06 Mar 2026 13:38:11 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 433B819560A1; Fri, 6 Mar 2026 18:38:10 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.45.224.210]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2BE41800576; Fri, 6 Mar 2026 18:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772822294; 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=MIeLdvVFIKObafQGe5aVUZvf+Z6x4t6Sc41WSfM/hm0=; b=fxc+x6ryC+4rvtiyocJxMhuKey45Oq9wdGvbx0GBLbx92M60ykOscJTAVb2gGuYGJzx8G+ e+QSL8fdQU8mXe4hrLlKv7OK4cqwF01ddPKDmVRAyRYrgjmsEH7l09EWvf9dwafumjaZUm Z+llftDlNO2bIKg/kGMx+SeHvAEC+aU= X-MC-Unique: wqoZU1tROkiVi6Q3mP4W_w-1 X-Mimecast-MFC-AGG-ID: wqoZU1tROkiVi6Q3mP4W_w_1772822290 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 02/12] block: Wire up 'flat' mode also for 'query-block' Date: Fri, 6 Mar 2026 19:36:55 +0100 Message-ID: <20260306183705.410357-3-kwolf@redhat.com> In-Reply-To: <20260306183705.410357-1-kwolf@redhat.com> References: <20260306183705.410357-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1772822351353158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Some time ago (commit facda5443f5a8) I've added 'flat' mode (which omits 'backing-image' key in reply) to 'query-named-block-nodes' to minimize the size of the returned JSON for deeper backing chains. While 'query-block' behaved slightly better it turns out that in libvirt we do call 'query-block' to figure out some information about the block device (e.g. throttling info) but we don't look at the backing chain itself. Wire up 'flat' for 'query-block' so that libvirt can ask for an abbreviated output. The implementation is much simpler as the internals are shared with 'query-named-block-nodes'. Signed-off-by: Peter Krempa Acked-by: Markus Armbruster Message-ID: Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- qapi/block-core.json | 5 +++++ block/monitor/block-hmp-cmds.c | 4 ++-- block/qapi.c | 8 ++++---- ui/cocoa.m | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index b82af742561..b66bf316e2f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -855,6 +855,10 @@ # # Get a list of `BlockInfo` for all virtual block devices. # +# @flat: Omit nested data about the backing image, i.e. `BlockInfo` +# member 'inserted.image.backing-image' will be absent. +# Default is false. (Since 11.0) +# # Returns: a list describing each virtual block device. Filter nodes # that were created implicitly are skipped over. # @@ -945,6 +949,7 @@ # } ## { 'command': 'query-block', 'returns': ['BlockInfo'], + 'data': { '*flat': 'bool' }, 'allow-preconfig': true } =20 ## diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 3391cee4d21..bde25bb5887 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -422,7 +422,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qd= ict) /* Then try adding all block devices. If one fails, close all and * exit. */ - block_list =3D qmp_query_block(NULL); + block_list =3D qmp_query_block(false, false, NULL); =20 for (info =3D block_list; info; info =3D info->next) { if (!info->value->inserted) { @@ -741,7 +741,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) =20 /* Print BlockBackend information */ if (!nodes) { - block_list =3D qmp_query_block(NULL); + block_list =3D qmp_query_block(false, false, NULL); } else { block_list =3D NULL; } diff --git a/block/qapi.c b/block/qapi.c index 27e0ac6a328..eabfbfc2585 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -456,7 +456,7 @@ fail: =20 /* @p_info will be set only on success. */ static void GRAPH_RDLOCK -bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, Error **errp) +bdrv_query_info(BlockBackend *blk, bool flat, BlockInfo **p_info, Error **= errp) { BlockInfo *info =3D g_malloc0(sizeof(*info)); BlockDriverState *bs =3D blk_bs(blk); @@ -488,7 +488,7 @@ bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, = Error **errp) } =20 if (bs && bs->drv) { - info->inserted =3D bdrv_block_device_info(blk, bs, false, errp); + info->inserted =3D bdrv_block_device_info(blk, bs, flat, errp); if (info->inserted =3D=3D NULL) { goto err; } @@ -698,7 +698,7 @@ bdrv_query_bds_stats(BlockDriverState *bs, bool blk_lev= el) return s; } =20 -BlockInfoList *qmp_query_block(Error **errp) +BlockInfoList *qmp_query_block(bool has_flat, bool flat, Error **errp) { BlockInfoList *head =3D NULL, **p_next =3D &head; BlockBackend *blk; @@ -714,7 +714,7 @@ BlockInfoList *qmp_query_block(Error **errp) } =20 info =3D g_malloc0(sizeof(*info)); - bdrv_query_info(blk, &info->value, &local_err); + bdrv_query_info(blk, flat, &info->value, &local_err); if (local_err) { error_propagate(errp, local_err); g_free(info); diff --git a/ui/cocoa.m b/ui/cocoa.m index 23b7a736d70..5b21fe3aead 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1849,7 +1849,7 @@ static void addRemovableDevicesMenuItems(void) BlockInfoList *currentDevice, *pointerToFree; NSString *deviceName; =20 - currentDevice =3D qmp_query_block(NULL); + currentDevice =3D qmp_query_block(false, false, NULL); pointerToFree =3D currentDevice; =20 menu =3D [[[NSApp mainMenu] itemWithTitle:@"Machine"] submenu]; --=20 2.53.0