From nobody Sun Feb 8 12:20:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667989054; cv=none; d=zohomail.com; s=zohoarc; b=bHEQ9+p24CXOkZJ0FJaoiycTpAqw13sHcwAXcgba/aWpck80nhV/QtXgckr4okdeaVWIIZ7RJWgwDBySbb3yGOxxoGM2o0L6zIbU3tOJLr2pJ2pUEEeo2Rh30KKc9+fkbe6ugxMCNA+81/00fMw8rBfFIGnlCIfuKiRhU789ltw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667989054; h=Content-Type:Content-Transfer-Encoding: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=X6NIYqX9BQmvB4sExQ7f2zqV2LNI5XTWlacbaBod2Is=; b=Gwv0GiJ7t7pT6TOWMy8vLxs//YPEWLeEtcae58Ss9DISuYLscxwskBDiTQ2kyd3YYl+LRAOIlX2bRUCpAfnE5x5ssJrGurSXgavEasew1oR/6XPNNRfA6jF4jRj0FiEeARiiRPRzRZExM9EZMzVwuUvglBJJUf2FU3Xp9J/UJkg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667989054635922.2365475051182; Wed, 9 Nov 2022 02:17:34 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-3-_yryB0OaN2qQH_-XTYsZLg-1; Wed, 09 Nov 2022 05:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F8F8811E81; Wed, 9 Nov 2022 10:17:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C546140EBF5; Wed, 9 Nov 2022 10:17:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2D6AF194658F; Wed, 9 Nov 2022 10:17:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D84231946A44 for ; Wed, 9 Nov 2022 10:17:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C791A2166B30; Wed, 9 Nov 2022 10:17:23 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-16.brq.redhat.com [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 209302166B29 for ; Wed, 9 Nov 2022 10:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667989053; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=X6NIYqX9BQmvB4sExQ7f2zqV2LNI5XTWlacbaBod2Is=; b=AOXUXxCwYIam7RWlyz3qERhVddVDU+1bmL4g8UwxbbeiFbbmhunAhyHBm84pz7OKBCScBY OyU52CSfsL5LI7hOQjcmcyNhNUneOWoiZaR1B0PZ6Vh24oN49Xm8anaoUl9zrXaM/wGG6q 71DZki7Xtkmm3J5dXWP2wg5lwg6iT4Y= X-MC-Unique: _yryB0OaN2qQH_-XTYsZLg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] qemuMonitorJSONQueryNamedBlockNodes: Drop 'flat' argument Date: Wed, 9 Nov 2022 11:17:15 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667989055076100005 Content-Type: text/plain; charset="utf-8" All callers pass the equivalent of looking up whether qemu supports QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT. Use 'mon->queryNamedBlockNodesFlat' directly and refactor all callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 4 +--- src/qemu/qemu_monitor.c | 7 ++----- src/qemu/qemu_monitor.h | 3 +-- src/qemu/qemu_monitor_json.c | 12 +++++------- src/qemu/qemu_monitor_json.h | 3 +-- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e98b5d4739..8a6f601b29 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2611,13 +2611,11 @@ qemuBlockGetNamedNodeData(virDomainObj *vm, { qemuDomainObjPrivate *priv =3D vm->privateData; GHashTable *blockNamedNodeData =3D NULL; - bool supports_flat =3D virQEMUCapsGet(priv->qemuCaps, - QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NO= DES_FLAT); if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return NULL; - blockNamedNodeData =3D qemuMonitorBlockGetNamedNodeData(priv->mon, sup= ports_flat); + blockNamedNodeData =3D qemuMonitorBlockGetNamedNodeData(priv->mon); qemuDomainObjExitMonitor(vm); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index dd394cd19b..cd9f43071e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1990,20 +1990,17 @@ qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMon= itor *mon, /** * qemuMonitorBlockGetNamedNodeData: * @mon: monitor object - * @supports_flat: don't query data for backing store * * Uses 'query-named-block-nodes' to retrieve information about individual * storage nodes and returns them in a hash table of qemuBlockNamedNodeDat= a *s * filled with the data. The hash table keys are node names. */ GHashTable * -qemuMonitorBlockGetNamedNodeData(qemuMonitor *mon, - bool supports_flat) +qemuMonitorBlockGetNamedNodeData(qemuMonitor *mon) { QEMU_CHECK_MONITOR_NULL(mon); - VIR_DEBUG("supports_flat=3D%d", supports_flat); - return qemuMonitorJSONBlockGetNamedNodeData(mon, supports_flat); + return qemuMonitorJSONBlockGetNamedNodeData(mon); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5a84a4d095..62f1bc1299 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -712,8 +712,7 @@ struct _qemuBlockNamedNodeData { }; GHashTable * -qemuMonitorBlockGetNamedNodeData(qemuMonitor *mon, - bool supports_flat); +qemuMonitorBlockGetNamedNodeData(qemuMonitor *mon); int qemuMonitorBlockResize(qemuMonitor *mon, const char *device, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0e34cb55ad..74967afb24 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2037,14 +2037,13 @@ qemuMonitorJSONSetDBusVMStateIdList(qemuMonitor *mo= n, * Returns: NULL on error, reply on success */ static virJSONValue * -qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon, - bool flat) +qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; if (!(cmd =3D qemuMonitorJSONMakeCommand("query-named-block-nodes", - "B:flat", flat, + "B:flat", mon->queryNamedBlockN= odesFlat, NULL))) return NULL; @@ -2503,7 +2502,7 @@ qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuM= onitor *mon, { g_autoptr(virJSONValue) nodes =3D NULL; - if (!(nodes =3D qemuMonitorJSONQueryNamedBlockNodes(mon, mon->queryNam= edBlockNodesFlat))) + if (!(nodes =3D qemuMonitorJSONQueryNamedBlockNodes(mon))) return -1; if (virJSONValueArrayForeachSteal(nodes, @@ -2669,12 +2668,11 @@ qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONVal= ue *nodes) GHashTable * -qemuMonitorJSONBlockGetNamedNodeData(qemuMonitor *mon, - bool supports_flat) +qemuMonitorJSONBlockGetNamedNodeData(qemuMonitor *mon) { g_autoptr(virJSONValue) nodes =3D NULL; - if (!(nodes =3D qemuMonitorJSONQueryNamedBlockNodes(mon, supports_flat= ))) + if (!(nodes =3D qemuMonitorJSONQueryNamedBlockNodes(mon))) return NULL; return qemuMonitorJSONBlockGetNamedNodeDataJSON(nodes); diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index c0abc9dd4f..4c65838b7e 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -105,8 +105,7 @@ GHashTable * qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValue *nodes); GHashTable * -qemuMonitorJSONBlockGetNamedNodeData(qemuMonitor *mon, - bool supports_flat); +qemuMonitorJSONBlockGetNamedNodeData(qemuMonitor *mon); int qemuMonitorJSONBlockResize(qemuMonitor *mon, --=20 2.37.3