From nobody Tue Mar 24 01:23:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1773071196; cv=none; d=zohomail.com; s=zohoarc; b=dcxK35w+7yGvmT8e+AH9iDAhc9eZKjazBMBViUaEIoRB2aiP6nEpyw2jTay31blPHsv1UC6Qbc6IVxvQ7w3abP2K3G723avcMoLyupm+RksKjLCFg4Hmud0p1kEmYS+vvYnNx7eIqVcy8O0BJEqq2bvot+lvOpHvXa1YbsP7M+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071196; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=sMg/AkvUNsIABPB8PB2GuJLGlc4SNdefcyvAfaDbwIA=; b=PHb6OVMfWYjTGU9qcJKJSUxJHpyM1jBJC4fEWLpLNfi4WQZ4KILMc47/xc7cEixL74Jy1FMCtklhnmeLOoM4te8UrAWkiWoZHQKeXRLiWZ+SmUm2YmHHCH7VgrHy7BsLsgIAKx7j6qHn2vPySQHBCPkWWFgMXs3wD88Be40CaBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1773071196471105.79049385791541; Mon, 9 Mar 2026 08:46:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B35F3418C5; Mon, 9 Mar 2026 11:46:35 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CA7C93F375; Mon, 9 Mar 2026 11:45:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 82BD54199B; Mon, 9 Mar 2026 11:44:57 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8EF9C417D2 for ; Mon, 9 Mar 2026 11:44:10 -0400 (EDT) Received: from mx-prod-mc-06.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-282-1gS4DDFFPQa9Dd6qPpGnDA-1; Mon, 09 Mar 2026 11:44:09 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27E9E180062D for ; Mon, 9 Mar 2026 15:44:08 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.45.242.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6F43030001A2 for ; Mon, 9 Mar 2026 15:44:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773071050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sMg/AkvUNsIABPB8PB2GuJLGlc4SNdefcyvAfaDbwIA=; b=Z+9RZLX9MkYhQq2j5b0rlPYulpmdaIo3LH/gXWPVyuXwZ11yZkO+thinUzwI2+axoSnecX b+9bA/0G6Q+dlpsBNgpAgcWmjgynv4doTBq0DgfCxf8vG27fbWYv8xk1tU48uSORcyJghQ Nx8/VYyLgGgjpdXEmtftJ36fgasHZxo= X-MC-Unique: 1gS4DDFFPQa9Dd6qPpGnDA-1 X-Mimecast-MFC-AGG-ID: 1gS4DDFFPQa9Dd6qPpGnDA_1773071048 To: devel@lists.libvirt.org Subject: [PATCH 4/4] qemu: monitor: Use 'flat' mode of 'query-block' Date: Mon, 9 Mar 2026 16:44:00 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: PRBaFGB0eiaN1Z3MEbDedC3Xa55ttbGsKuNeRBAQKnk_1773071048 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: S3ZXWYEI3XLJAY43NXWLGRIKOCZAH4YD X-Message-ID-Hash: S3ZXWYEI3XLJAY43NXWLGRIKOCZAH4YD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1773071200811154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We don't actually look at any of the information in 'backing-image' field so we can ask qemu not to send it to us. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor_json.c | 12 ++++++++++-- src/qemu/qemu_monitor_priv.h | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 05334fabd5..b94aaf741b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -585,6 +585,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, if (priv) { mon->blockjobMaskProtocol =3D virQEMUCapsGet(priv->qemuCaps, QEMU_= CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); + mon->queryBlockFlat =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_Q= UERY_BLOCK_FLAT); } if (virSetCloseExec(mon->fd) < 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f876367959..f9b0470ed4 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2243,7 +2243,9 @@ qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon) * @mon: Monitor pointer * * This helper will attempt to make a "query-block" call and check for - * errors before returning with the reply. + * errors before returning with the reply. If qemu supports 'flat' mode + * (which ommits 'backing-image' field in the reply objects) we will enable + * it as no callers need that information. * * Returns: NULL on error, reply on success */ @@ -2252,8 +2254,14 @@ qemuMonitorJSONQueryBlock(qemuMonitor *mon) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; + virTristateBool flat =3D VIR_TRISTATE_BOOL_ABSENT; + + if (mon->queryBlockFlat) + flat =3D VIR_TRISTATE_BOOL_YES; - if (!(cmd =3D qemuMonitorJSONMakeCommand("query-block", NULL))) + if (!(cmd =3D qemuMonitorJSONMakeCommand("query-block", + "T:flat", flat, + NULL))) return NULL; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0 || diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 198105007e..ee644123ca 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -90,6 +90,9 @@ struct _qemuMonitor { /* use the backing-mask-protocol flag of block-commit/stream */ bool blockjobMaskProtocol; + + /* 'query-block' supports flat mode */ + bool queryBlockFlat; }; --=20 2.53.0