From nobody Tue Oct 28 17:34:52 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=1760023559; cv=none; d=zohomail.com; s=zohoarc; b=aUX7dYr/BJTzKXr8U5ESXhhD7f6EWtmYBDydDnOKuV6mu8SE2875r4DJoqMTLC8JNJVPJP84DjwqDlfrFrWek0D9Uat+79tGuqOTDiTWIpjy0d7J5Qbye4t9XpiJZQDvdy+Fn3TnrarxUHRof48EX0pBxp/o8sfYOjZvMpLkDSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760023559; 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=Xq/AyZFOW5S//e2PyibUlNQ9Uvh/AAs0OTIj8eAt6KY=; b=QqsY+BXno4PluhC14/CK98IOgIwxd6uktFK1UqOCE0km559wqyM+S+vUljsEe+ujyCivARa1JOA3mNuDwoUsGD1ua2HEpbbhFBKWFgKm6anlvjmcpQoeI6OtT8UOuhvVd8fX+Fcmq3zDq9bXvdF9N+BnRS2anR+yz5RlSDdvYmg= 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 1760023559576453.8423261838924; Thu, 9 Oct 2025 08:25:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F23EF41A7E; Thu, 9 Oct 2025 11:25:57 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 59C7443F95; Thu, 9 Oct 2025 11:17:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9763B43E48; Thu, 9 Oct 2025 11:16:28 -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 6E79F43E87 for ; Thu, 9 Oct 2025 11:16:27 -0400 (EDT) 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-454-MszMnAj2MEKTBYr70P65yw-1; Thu, 09 Oct 2025 11:16:25 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93F4E19560A7 for ; Thu, 9 Oct 2025 15:16:24 +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 B03CA1953947 for ; Thu, 9 Oct 2025 15:16:23 +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=1760022987; 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=Xq/AyZFOW5S//e2PyibUlNQ9Uvh/AAs0OTIj8eAt6KY=; b=YK3t5SFjAgvOnv/w4Pr1Z1k2E/bPN2n+Ivl3ObnxwFWdJKDZgaKHOBt9r4WQJdSXr48NXm dB0qSBXvwVGHeeff1gd35AH4HENxtNz9QJuExm77mXmenjhXkl2JatN4NPVDcCWpAH+enq OVts9kuPwiqoq1LHFBN4ShWpP9CN5ZY= X-MC-Unique: MszMnAj2MEKTBYr70P65yw-1 X-Mimecast-MFC-AGG-ID: MszMnAj2MEKTBYr70P65yw_1760022984 To: devel@lists.libvirt.org Subject: [RFC PATCH 04/16] qemu: monitor: Rework qemuBlockStats into a g_object Date: Thu, 9 Oct 2025 17:16:04 +0200 Message-ID: <37c97d037108086029bdaf748495a263c8b14193.1760022633.git.pkrempa@redhat.com> 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: EcJOYWDzpHNVTUFpSWuyAx9cxMOYXN3-50jqMaIL9Dg_1760022984 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: US36KK7JZ5KLHFRGFM6PP32Z5ON2YU5Y X-Message-ID-Hash: US36KK7JZ5KLHFRGFM6PP32Z5ON2YU5Y 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: 1760023562632154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Create the g_object boilerplate and store references in the hash table instead of copies. This will simplify upcoming code which will add allocated fields into qemuBlockStats. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 32 ++++++----------------- src/qemu/qemu_monitor.c | 38 ++++++++++++++++++++++++++- src/qemu/qemu_monitor.h | 7 ++++- src/qemu/qemu_monitor_json.c | 50 ++++++++---------------------------- 4 files changed, 62 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ac72ea5cb0..b6d83f1dc6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9613,7 +9613,6 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, qemuDomainObjPrivate *priv =3D vm->privateData; virDomainDiskDef *disk =3D NULL; g_autoptr(GHashTable) blockstats =3D NULL; - qemuBlockStats *stats; size_t i; int nstats; int rc =3D 0; @@ -9654,29 +9653,15 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, if (nstats < 0 || rc < 0) return -1; - *retstats =3D g_new0(qemuBlockStats, 1); - if (entryname) { - qemuBlockStats *capstats; - - if (!(stats =3D virHashLookup(blockstats, entryname))) { + if (!(*retstats =3D virHashSteal(blockstats, entryname))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find statistics for device '%1$s'"), = entryname); return -1; } - - **retstats =3D *stats; - - /* capacity are reported only per node-name so we need to transfer= them */ - if (disk && disk->src && - (capstats =3D virHashLookup(blockstats, qemuBlockStorageSource= GetEffectiveNodename(disk->src)))) { - (*retstats)->capacity =3D capstats->capacity; - (*retstats)->physical =3D capstats->physical; - (*retstats)->wr_highest_offset =3D capstats->wr_highest_offset; - (*retstats)->wr_highest_offset_valid =3D capstats->wr_highest_= offset_valid; - (*retstats)->write_threshold =3D capstats->write_threshold; - } } else { + g_autoptr(qemuBlockStats) stats =3D qemuBlockStatsNew(); + for (i =3D 0; i < vm->def->ndisks; i++) { disk =3D vm->def->disks[i]; entryname =3D disk->info.alias; @@ -9699,6 +9684,8 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, qemuDomainBlockStatsGatherTotals(stats, *retstats); } + + *retstats =3D g_steal_pointer(&stats); } return nstats; @@ -9710,7 +9697,7 @@ qemuDomainBlockStats(virDomainPtr dom, const char *path, virDomainBlockStatsPtr stats) { - qemuBlockStats *blockstats =3D NULL; + g_autoptr(qemuBlockStats) blockstats =3D NULL; int ret =3D -1; virDomainObj *vm; @@ -9747,7 +9734,6 @@ qemuDomainBlockStats(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(blockstats); return ret; } @@ -9760,7 +9746,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, unsigned int flags) { virDomainObj *vm; - qemuBlockStats *blockstats =3D NULL; + g_autoptr(qemuBlockStats) blockstats =3D NULL; int nstats; int ret =3D -1; @@ -9833,7 +9819,6 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, virDomainObjEndJob(vm); cleanup: - VIR_FREE(blockstats); virDomainObjEndAPI(&vm); return ret; } @@ -10565,7 +10550,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, int ret =3D -1; virDomainDiskDef *disk; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - qemuBlockStats *entry =3D NULL; + g_autoptr(qemuBlockStats) entry =3D NULL; virCheckFlags(0, -1); @@ -10663,7 +10648,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, endjob: virDomainObjEndJob(vm); cleanup: - VIR_FREE(entry); virDomainObjEndAPI(&vm); return ret; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7b09792c5d..ce6220fbfb 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1967,6 +1967,42 @@ qemuMonitorGetBlockInfo(qemuMonitor *mon) } +G_DEFINE_TYPE(qemuBlockStats, qemu_block_stats, G_TYPE_OBJECT); + +static void +qemu_block_stats_init(qemuBlockStats *stats G_GNUC_UNUSED) +{ +} + + +static void +qemuBlockStatsFinalize(GObject *object) +{ + qemuBlockStats *stats =3D QEMU_BLOCK_STATS(object); + + if (!stats) + return; + + G_OBJECT_CLASS(qemu_block_stats_parent_class)->finalize(object); +} + + +static void +qemu_block_stats_class_init(qemuBlockStatsClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D qemuBlockStatsFinalize; +} + + +qemuBlockStats * +qemuBlockStatsNew(void) +{ + return g_object_new(qemu_block_stats_get_type(), NULL); +} + + /** * qemuMonitorGetAllBlockStatsInfo: * @mon: monitor object @@ -1982,7 +2018,7 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon, GHashTable **ret_stats) { int ret; - g_autoptr(GHashTable) stats =3D virHashNew(g_free); + g_autoptr(GHashTable) stats =3D virHashNew(g_object_unref); QEMU_CHECK_MONITOR(mon); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 82354a83d9..4f94edb05f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -789,8 +789,9 @@ qemuMonitorBlockIOStatusToError(const char *status); GHashTable * qemuMonitorGetBlockInfo(qemuMonitor *mon); -typedef struct _qemuBlockStats qemuBlockStats; struct _qemuBlockStats { + GObject parent; + unsigned long long rd_req; unsigned long long rd_bytes; unsigned long long wr_req; @@ -810,6 +811,10 @@ struct _qemuBlockStats { /* write_threshold is valid only if it's non-zero, conforming to qemu = semantics */ unsigned long long write_threshold; }; +G_DECLARE_FINAL_TYPE(qemuBlockStats, qemu_block_stats, QEMU, BLOCK_STATS, = GObject); + +qemuBlockStats * +qemuBlockStatsNew(void); int qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2dbaa7a798..7b7d446b3a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2390,7 +2390,7 @@ static qemuBlockStats * qemuMonitorJSONBlockStatsCollectData(virJSONValue *dev, int *nstats) { - g_autofree qemuBlockStats *bstats =3D NULL; + g_autoptr(qemuBlockStats) bstats =3D NULL; virJSONValue *parent; virJSONValue *parentstats; virJSONValue *stats; @@ -2401,7 +2401,7 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValue *de= v, return NULL; } - bstats =3D g_new0(qemuBlockStats, 1); + bstats =3D qemuBlockStatsNew(); #define QEMU_MONITOR_BLOCK_STAT_GET(NAME, VAR, MANDATORY) \ if (MANDATORY || virJSONValueObjectHasKey(stats, NAME)) { \ @@ -2433,34 +2433,13 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValue *= dev, } -static int -qemuMonitorJSONAddOneBlockStatsInfo(qemuBlockStats *bstats, - const char *name, - GHashTable *stats) -{ - qemuBlockStats *copy =3D NULL; - - copy =3D g_new0(qemuBlockStats, 1); - - if (bstats) - *copy =3D *bstats; - - if (virHashAddEntry(stats, name, copy) < 0) { - VIR_FREE(copy); - return -1; - } - - return 0; -} - - static int qemuMonitorJSONGetOneBlockStatsInfo(virJSONValue *dev, const char *dev_name, int depth, GHashTable *hash) { - g_autofree qemuBlockStats *bstats =3D NULL; + g_autoptr(qemuBlockStats) bstats =3D NULL; int nstats =3D 0; const char *qdevname =3D NULL; const char *nodename =3D NULL; @@ -2482,17 +2461,14 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValue *d= ev, if (!(bstats =3D qemuMonitorJSONBlockStatsCollectData(dev, &nstats))) return -1; - if (devicename && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, devicename, hash) < 0) - return -1; + if (devicename) + g_hash_table_insert(hash, g_strdup(devicename), g_object_ref(bstat= s)); - if (qdevname && STRNEQ_NULLABLE(qdevname, devicename) && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, qdevname, hash) < 0) - return -1; + if (qdevname && STRNEQ_NULLABLE(qdevname, devicename)) + g_hash_table_insert(hash, g_strdup(qdevname), g_object_ref(bstats)= ); - if (nodename && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, nodename, hash) < 0) - return -1; + if (nodename) + g_hash_table_insert(hash, g_strdup(nodename), g_object_ref(bstats)= ); if ((backing =3D virJSONValueObjectGetObject(dev, "backing")) && qemuMonitorJSONGetOneBlockStatsInfo(backing, dev_name, depth + 1, = hash) < 0) @@ -2617,12 +2593,8 @@ qemuMonitorJSONBlockStatsUpdateCapacityData(virJSONV= alue *image, qemuBlockStats *bstats; if (!(bstats =3D virHashLookup(stats, name))) { - bstats =3D g_new0(qemuBlockStats, 1); - - if (virHashAddEntry(stats, name, bstats) < 0) { - VIR_FREE(bstats); - return -1; - } + bstats =3D qemuBlockStatsNew(); + g_hash_table_insert(stats, g_strdup(name), bstats); } if (entry) --=20 2.51.0