From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8B22E7FDD6 for ; Tue, 3 Feb 2026 12:02:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnF5u-00070l-Bx; Tue, 03 Feb 2026 07:01:22 -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 1vnF5j-0006uH-2D for qemu-devel@nongnu.org; Tue, 03 Feb 2026 07:01:11 -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 1vnF5h-0006sq-1q for qemu-devel@nongnu.org; Tue, 03 Feb 2026 07:01:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770120065; 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: in-reply-to:in-reply-to:references:references; bh=6BTfd3DVHyuhlHuHqWsWbjhhvmxq50j8LFrR/ot1mzY=; b=VXkKDa4K8ilz4Wu/nAzC3BinLvI6f0TK2j/Hc9gDL85puUhDp+eEEtBZFcwgYNt5r44Tvv bqycldRA5dph1cokB6zV9QqLkEbF8DGqqfAtar857G63wy/hHyLqtntwFV8K8vlLfgFTGa gThJr4ESQ/71kELBX0IoU7iUiK/QPUQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-681-R6xnPFESPsqewk4bkz6eMw-1; Tue, 03 Feb 2026 07:01:04 -0500 X-MC-Unique: R6xnPFESPsqewk4bkz6eMw-1 X-Mimecast-MFC-AGG-ID: R6xnPFESPsqewk4bkz6eMw_1770120064 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF580180044D; Tue, 3 Feb 2026 12:01:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.22]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9CAEE19560B2; Tue, 3 Feb 2026 12:01:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3685621E692D; Tue, 03 Feb 2026 13:01:01 +0100 (CET) From: Markus Armbruster To: Peter Krempa Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Kevin Wolf , Hanna Reitz , Eric Blake , Markus Armbruster Subject: Re: [PATCH v3 1/2] block: Wire up 'flat' mode also for 'query-block' In-Reply-To: (Peter Krempa's message of "Tue, 3 Feb 2026 09:49:26 +0100") References: Date: Tue, 03 Feb 2026 13:01:01 +0100 Message-ID: <87pl6m2g02.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Peter Krempa writes: > 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 [...] > diff --git a/block/qapi.c b/block/qapi.c > index 27e0ac6a32..3688d0e713 100644 > --- a/block/qapi.c > +++ b/block/qapi.c [...] > @@ -698,11 +698,12 @@ bdrv_query_bds_stats(BlockDriverState *bs, bool blk_level) > return s; > } > > -BlockInfoList *qmp_query_block(Error **errp) > +BlockInfoList *qmp_query_block(bool has_flat, bool flat, Error **errp) > { > BlockInfoList *head = NULL, **p_next = &head; > BlockBackend *blk; > Error *local_err = NULL; > + bool return_flat = has_flat && flat; This is fine. Just flat would also be fine: flat implies has_flat. > > GRAPH_RDLOCK_GUARD_MAINLOOP(); > > @@ -714,7 +715,7 @@ BlockInfoList *qmp_query_block(Error **errp) > } > > info = g_malloc0(sizeof(*info)); > - bdrv_query_info(blk, &info->value, &local_err); > + bdrv_query_info(blk, return_flat, &info->value, &local_err); > if (local_err) { > error_propagate(errp, local_err); > g_free(info); > diff --git a/qapi/block-core.json b/qapi/block-core.json > index b82af74256..a701f6bbee 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 (ie. the contents at > +# 'inserted.image.backing-image' are trimmed). > +# Default is false (Since 11.0) > +# s/ie./i.e./ Remind me: true suppresses member inserted.image.backing-image, i.e. it is absent then. Correct? > # 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 } > > ## [...]