From nobody Tue Oct 28 17:30:15 2025 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=1760023851; cv=none; d=zohomail.com; s=zohoarc; b=atpJRMMhdTLOeYqrObb+Nkz8tJZHS6ABHaLTCz4K+dIkUeMI0Gqi1g5c1PNy26J4JBpv6WnaUxySKaFL0ZCj8BWyxeWzzwSsWPZOD1xfIhIrkTWvA4cBqEuvMyQRnD7YF8DvJGx3QuxgraE55rhpM87KRYnDR1TRvgFuq3niyr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760023851; 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=0xPXE7YtQbmhBwbF5Z7Mv8v6YMMWLRlEwB01TqWXDBo=; b=NBmWUl7r/yRe57unGD/iHlf6wCLt6jI8KDvVw2VV0Vd88N7HjxAQ/VlzWZAOSqNYNKc3Oes1lK1TBh7LJ+n2vYCNbl3zxau/Ibe3x9bWwKkQkb4de+OpNx3tcTPALUFZEG+wwejmS7TcyTM/StXvaN5PClfAX++7yei/lr9IZqc= 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 1760023851356287.2944720610951; Thu, 9 Oct 2025 08:30:51 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EA7744424D; Thu, 9 Oct 2025 11:30:47 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6E5C144788; Thu, 9 Oct 2025 11:17:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EB89C442E7; Thu, 9 Oct 2025 11:16:44 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 B6D6143F58 for ; Thu, 9 Oct 2025 11:16:32 -0400 (EDT) Received: from mx-prod-mc-03.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-67-eRCqmTlQN4O96kXQyQ1axw-1; Thu, 09 Oct 2025 11:16:30 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 86DB119560AA for ; Thu, 9 Oct 2025 15:16:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.12]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BEA171955F22 for ; Thu, 9 Oct 2025 15:16:28 +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=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, 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=1760022992; 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=0xPXE7YtQbmhBwbF5Z7Mv8v6YMMWLRlEwB01TqWXDBo=; b=Ux2GB6mxkPftQbBxYEi+U6XFt9Tzd9EfMOuaIETYFW0p0lIpJl5lpv/daycIeLzXRbgxdR TiU8kmHEPqMT6gQsK9rNDhkjciSqLqcnU/I6NPGUTUkCN7ufxsI+aZULBV8Kuh9WbZx/GD Rnj7pPUYfQgxGr0uyichX2izIZtc13k= X-MC-Unique: eRCqmTlQN4O96kXQyQ1axw-1 X-Mimecast-MFC-AGG-ID: eRCqmTlQN4O96kXQyQ1axw_1760022989 To: devel@lists.libvirt.org Subject: [RFC PATCH 08/16] Remove qemuMonitorBlockStatsUpdateCapacityBlockdev Date: Thu, 9 Oct 2025 17:16:08 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TLsBARNob08dHlfOeAqtOtoxy8SidFQfAFps6xTGqcg_1760022989 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QW3YHGXDVT2WGW54CQSCDWN3SQ34IZET X-Message-ID-Hash: QW3YHGXDVT2WGW54CQSCDWN3SQ34IZET 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: 1760023855619116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Remove the function and address the ripple effect the removal has. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 16 +++------------- src/qemu/qemu_monitor.c | 12 ------------ src/qemu/qemu_monitor.h | 5 ----- src/qemu/qemu_monitor_json.c | 9 --------- src/qemu/qemu_monitor_json.h | 3 --- 5 files changed, 3 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6d83f1dc6..806408115f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9597,7 +9597,6 @@ qemuDomainBlockStatsGatherTotals(qemuBlockStats *data, * @driver: driver object * @vm: domain object * @path: to gather the statistics for - * @capacity: refresh capacity of the backing image * @retstats: returns pointer to structure holding the stats * * Gathers the block statistics for use in qemuDomainBlockStats* APIs. @@ -9607,7 +9606,6 @@ qemuDomainBlockStatsGatherTotals(qemuBlockStats *data, static int qemuDomainBlocksStatsGather(virDomainObj *vm, const char *path, - bool capacity, qemuBlockStats **retstats) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -9644,10 +9642,6 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, qemuDomainObjEnterMonitor(vm); nstats =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats); - - if (capacity && nstats >=3D 0) - rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, bloc= kstats); - qemuDomainObjExitMonitor(vm); if (nstats < 0 || rc < 0) @@ -9713,7 +9707,7 @@ qemuDomainBlockStats(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainBlocksStatsGather(vm, path, false, &blockstats) < 0) + if (qemuDomainBlocksStatsGather(vm, path, &blockstats) < 0) goto endjob; if (VIR_ASSIGN_IS_OVERFLOW(stats->rd_req, blockstats->rd_req) || @@ -9769,8 +9763,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if ((nstats =3D qemuDomainBlocksStatsGather(vm, path, false, - &blockstats)) < 0) + if ((nstats =3D qemuDomainBlocksStatsGather(vm, path, &blockstats)) < = 0) goto endjob; /* return count of supported stats */ @@ -10603,7 +10596,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, goto endjob; } - if (qemuDomainBlocksStatsGather(vm, path, true, &entry) < 0) + if (qemuDomainBlocksStatsGather(vm, path, &entry) < 0) goto endjob; if (!entry->wr_highest_offset_valid) { @@ -17724,9 +17717,6 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, rc =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &stats); - if (rc >=3D 0) - rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, = stats); - qemuDomainObjExitMonitor(dom); /* failure to retrieve stats is fine at this point */ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ce6220fbfb..f9b320f765 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2032,18 +2032,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon, } -int -qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon, - GHashTable *stats) -{ - VIR_DEBUG("stats=3D%p", stats); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(mon, stats); -} - - /** * qemuMonitorBlockGetNamedNodeData: * @mon: monitor object diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 4f94edb05f..0555bcbf8e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -821,11 +821,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon, GHashTable **ret_stats) ATTRIBUTE_NONNULL(2); -int -qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon, - GHashTable *stats) - ATTRIBUTE_NONNULL(2); - typedef struct _qemuBlockNamedNodeDataBitmap qemuBlockNamedNodeDataBitmap; struct _qemuBlockNamedNodeDataBitmap { char *name; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0aa74e226d..e00bc0cf1b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2629,15 +2629,6 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, } -int -qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon G_GNUC_UN= USED, - GHashTable *stats G_GNUC_U= NUSED) -{ - - return 0; -} - - static void qemuMonitorJSONBlockNamedNodeDataBitmapFree(qemuBlockNamedNodeDataBitmap *= bitmap) { diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5944aec917..8b06b7599e 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -94,9 +94,6 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, GHashTable *hash); -int -qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon, - GHashTable *stats); GHashTable * qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValue *nodes); --=20 2.51.0