From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042155368162.0083346778415; Thu, 20 Feb 2025 01:02:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 62C7F1CF7; Thu, 20 Feb 2025 04:02:34 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7BAAD1D57; Thu, 20 Feb 2025 04:01:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E42301CF7; Thu, 20 Feb 2025 04:01:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6BAD01CF6 for ; Thu, 20 Feb 2025 04:01:42 -0500 (EST) 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-132-sMpR_jNEOSeOtX9gV3MHSA-1; Thu, 20 Feb 2025 04:01:40 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 3DDCF1800360 for ; Thu, 20 Feb 2025 09:01:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 422E319412A3 for ; Thu, 20 Feb 2025 09:01:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042102; 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=ft4bkvD4EvCaifcESo4Kw0eEoHQ1U9QazNCoa8TvaG8=; b=hWb3SPbfRYqVjI6GKlvNe9nnfIiJ1K/JNjRT+ItPKb9kPZ68/rgaZ5se6aqQIvSzxksH0L EjW0N70L3k75gYtPNvJwa4IqL5Jwz8hgYoPdiKbG/r06c4Ocl6ZvJTU1wl2IT9wmmbEpSt GgrGA8Xr0Y2WE760fkycRZBoXIWsi0I= X-MC-Unique: sMpR_jNEOSeOtX9gV3MHSA-1 X-Mimecast-MFC-AGG-ID: sMpR_jNEOSeOtX9gV3MHSA_1740042099 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 01/21] qemuDomainGetStatsBlockExportHeader: Remove return value Date: Thu, 20 Feb 2025 10:01:14 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KND99pNMq3Ya7Z50deO2uNcDCYh3wQBD3BsDW8plEkc_1740042099 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W3UVSAASISHFNCSZU4DNRZ5ON3JOXRFZ X-Message-ID-Hash: W3UVSAASISHFNCSZU4DNRZ5ON3JOXRFZ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042158320019100 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1d0da1028f..7a39e83d39 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17359,7 +17359,7 @@ qemuDomainGetStatsBlockExportFrontend(const char *f= rontendname, } -static int +static void qemuDomainGetStatsBlockExportHeader(virDomainDiskDef *disk, virStorageSource *src, size_t recordnr, @@ -17372,8 +17372,6 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDe= f *disk, if (src->id) virTypedParamListAddUInt(params, src->id, "block.%zu.backingIndex"= , recordnr); - - return 0; } @@ -17399,10 +17397,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, VIR_INFO("optional disk '%s' source file is missing, " "skip getting stats", disk->dst); - if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, - params) < 0) { - return -1; - } + qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, pa= rams); (*recordnr)++; @@ -17411,10 +17406,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, /* vhost-user disk doesn't support getting block stats */ if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { - if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, - params) < 0) { - return -1; - } + qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, pa= rams); (*recordnr)++; @@ -17445,8 +17437,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, backendstoragealias =3D alias; } - if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params= ) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params); /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { @@ -17479,8 +17470,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, if (disk->mirror && disk->mirrorJob =3D=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { - if (qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *r= ecordnr, params) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *recor= dnr, params); if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceGetEffect= iveNodename(disk->mirror), @@ -17507,9 +17497,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, continue; if (backupdisk->store) { - if (qemuDomainGetStatsBlockExportHeader(disk, backupdi= sk->store, - *recordnr, par= ams) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, backupdisk->= store, + *recordnr, params); if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceG= etEffectiveNodename(backupdisk->store), --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174004217982629.978209237512147; Thu, 20 Feb 2025 01:02:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1BCFB1DAD; Thu, 20 Feb 2025 04:02:59 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 77DA11E8A; Thu, 20 Feb 2025 04:01:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 216B01E4E; Thu, 20 Feb 2025 04:01:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id ED0911D61 for ; Thu, 20 Feb 2025 04:01:44 -0500 (EST) Received: from mx-prod-mc-02.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-139-CUHzo_NJMQW9mCC8uJJZQA-1; Thu, 20 Feb 2025 04:01:43 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C789C18EB2CE for ; Thu, 20 Feb 2025 09:01:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D7CAE19412A3 for ; Thu, 20 Feb 2025 09:01:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042104; 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=+5dbOKaVNRBkvUfJq59VRR64XpGpj0gRPEXcHOfTKiA=; b=e8sgqroGnm2O4i+pjGsJBPisICZs2SdIPOolxpzZqXcWX3oTzTi7PDEaqY/eRcLsNm3MFS +0lwdS3ZuR8xyKDwZYW5h379RhVc509AaMbKvP67Qo5F+8SpSlYTjKs+xGSKTjGrbE9GyK H2Sy5hbh62c7OjGlC5PWqt69eVDhBq0= X-MC-Unique: CUHzo_NJMQW9mCC8uJJZQA-1 X-Mimecast-MFC-AGG-ID: CUHzo_NJMQW9mCC8uJJZQA_1740042100 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 02/21] qemuDomainGetStatsBlockExportFrontend: Remove return value Date: Thu, 20 Feb 2025 10:01:15 +0100 Message-ID: <43bf2ae27c92a9cca2eb831b672a1b01d8307f8c.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rTsEHSRc9lLfemXa04ObGj6iLFFp7MsSXPWKZQCa93U_1740042100 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LHRVVTEM3KPDNMLLN3JNG2UTZQDUGB5A X-Message-ID-Hash: LHRVVTEM3KPDNMLLN3JNG2UTZQDUGB5A X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042180391019000 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7a39e83d39..3dee0a4a91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17332,7 +17332,7 @@ qemuDomainGetStatsBlockExportBackendStorage(const c= har *entryname, } -static int +static void qemuDomainGetStatsBlockExportFrontend(const char *frontendname, GHashTable *stats, size_t idx, @@ -17344,7 +17344,7 @@ qemuDomainGetStatsBlockExportFrontend(const char *f= rontendname, * trying to refresh the stats from the disk. Inability to provide sta= ts is * usually caused by blocked storage so this would make libvirtd hang = */ if (!stats || !frontendname || !(en =3D virHashLookup(stats, frontendn= ame))) - return 0; + return; virTypedParamListAddULLong(par, en->rd_req, "block.%zu.rd.reqs", idx); virTypedParamListAddULLong(par, en->rd_bytes, "block.%zu.rd.bytes", id= x); @@ -17354,8 +17354,6 @@ qemuDomainGetStatsBlockExportFrontend(const char *f= rontendname, virTypedParamListAddULLong(par, en->wr_total_times, "block.%zu.wr.time= s", idx); virTypedParamListAddULLong(par, en->flush_req, "block.%zu.fl.reqs", id= x); virTypedParamListAddULLong(par, en->flush_total_times, "block.%zu.fl.t= imes", idx); - - return 0; } @@ -17441,9 +17439,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { - if (qemuDomainGetStatsBlockExportFrontend(frontendalias, stats= , *recordnr, - params) < 0) - return -1; + qemuDomainGetStatsBlockExportFrontend(frontendalias, stats, *r= ecordnr, + params); } if (qemuDomainGetStatsOneBlock(cfg, dom, params, --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042201049256.18439162426375; Thu, 20 Feb 2025 01:03:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0B1EA1D82; Thu, 20 Feb 2025 04:03:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D956B1E22; Thu, 20 Feb 2025 04:01:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9F6281DAE; Thu, 20 Feb 2025 04:01:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 039AC1D77 for ; Thu, 20 Feb 2025 04:01:44 -0500 (EST) 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-287-Ph2OfHrROuCejlTe7Stacg-1; Thu, 20 Feb 2025 04:01:42 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 2ECDB180034E for ; Thu, 20 Feb 2025 09:01:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 583BD19412A3 for ; Thu, 20 Feb 2025 09:01:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042104; 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=c8Pwaeh024dEuOE4qQlbjfBqNVjnWHbjgPRf5lDCP8c=; b=DteSM8UrPP0BQ1ZrHdlEu4jtKnkYWbguth6YF90eBVr+KSFKx+X39sfVklD2/RFtxzoE+n jtnxT6OVWihC2uOhG8juspQScKyqpT8Im8WNiZfvGaYuWFN4wEQ+9CBhSUoCym4jKlS6Iz nEAvxGZsqJK0coqvFL1XRSK4A/GfL+g= X-MC-Unique: Ph2OfHrROuCejlTe7Stacg-1 X-Mimecast-MFC-AGG-ID: Ph2OfHrROuCejlTe7Stacg_1740042102 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/21] qemuDomainGetStatsBlockExportBackendStorage: Remove return value Date: Thu, 20 Feb 2025 10:01:16 +0100 Message-ID: <635e150b1b9632b3415ae41c4145d8fed93e1578.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hE8giYC7qJBZ3mrJhdY6uLmbsVTfYdoC0VLstlcU-8o_1740042102 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UGV4IWASP3UEP3YPN77GNY7GRYV5ZXIR X-Message-ID-Hash: UGV4IWASP3UEP3YPN77GNY7GRYV5ZXIR X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042202566019100 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3dee0a4a91..327edfe506 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17314,7 +17314,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, } -static int +static void qemuDomainGetStatsBlockExportBackendStorage(const char *entryname, GHashTable *stats, size_t recordnr, @@ -17323,12 +17323,10 @@ qemuDomainGetStatsBlockExportBackendStorage(const= char *entryname, qemuBlockStats *entry; if (!stats || !entryname || !(entry =3D virHashLookup(stats, entryname= ))) - return 0; + return; if (entry->write_threshold) virTypedParamListAddULLong(params, entry->write_threshold, "block.= %zu.threshold", recordnr); - - return 0; } @@ -17448,10 +17446,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, - stats, *recordnr, - params) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(backendstoragealias, + stats, *recordnr, para= ms); (*recordnr)++; @@ -17476,10 +17472,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStora= geSourceGetStorageNodename(disk->mirror), - stats, *record= nr, - params) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStorageSo= urceGetStorageNodename(disk->mirror), + stats, *recordnr, = params); (*recordnr)++; } @@ -17504,10 +17498,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(qemuBl= ockStorageSourceGetStorageNodename(backupdisk->store), - stats,= *recordnr, - params= ) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(qemuBlockS= torageSourceGetStorageNodename(backupdisk->store), + stats, *re= cordnr, + params); (*recordnr)++; } --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042220536714.6067075878889; Thu, 20 Feb 2025 01:03:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D68B71F11; Thu, 20 Feb 2025 04:03:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0BC061E76; Thu, 20 Feb 2025 04:02:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id C03E71DFD; Thu, 20 Feb 2025 04:01:55 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 595DE1E18 for ; Thu, 20 Feb 2025 04:01:46 -0500 (EST) 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-300-9l4qtIlEMmaXnXqQnmy8OQ-1; Thu, 20 Feb 2025 04:01:44 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 99B3C1800982 for ; Thu, 20 Feb 2025 09:01:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B985119412A3 for ; Thu, 20 Feb 2025 09:01:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042106; 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=ClzrRLeqR9gs3X5quKNnEMxZU0KUZjYwx3xwGkymbEU=; b=BJeffgFk+VxRnbp6VHhd4IhQQSeJYqSCnnj08Cu9Z8kYXwLQ1unZ3tv5ZdEHVPFynFzIhi aKONB4s916P/t5fUSf9vicj6yN+3y3wLRrprtKBJtjzrjUZaCcDMBS7Fdsx/iMrliKfaDi KTkQNw/2jg35JgvwGGRuPQYP2IJcOEg= X-MC-Unique: 9l4qtIlEMmaXnXqQnmy8OQ-1 X-Mimecast-MFC-AGG-ID: 9l4qtIlEMmaXnXqQnmy8OQ_1740042103 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/21] qemuDomainGetStatsOneBlockFallback: Remove return value Date: Thu, 20 Feb 2025 10:01:17 +0100 Message-ID: <7cec31ccd57c610340517776f79145adb557f0b4.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pWAkatualDkwp1xPsRhHv4LjAaPZRePRrqIz1kUzWMI_1740042103 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6K5JWVNU5Y3FD3TEQ6RRKYLH4S6YKEK5 X-Message-ID-Hash: 6K5JWVNU5Y3FD3TEQ6RRKYLH4S6YKEK5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042222516019000 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 327edfe506..7318c145d0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17242,22 +17242,20 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver= G_GNUC_UNUSED, #undef QEMU_ADD_NET_PARAM /* refresh information by opening images on the disk */ -static int +static void qemuDomainGetStatsOneBlockFallback(virQEMUDriverConfig *cfg, virDomainObj *dom, virTypedParamList *params, virStorageSource *src, size_t block_idx) { - if (virStorageSourceIsEmpty(src)) - return 0; - - if (virStorageSourceIsFD(src)) - return 0; + if (virStorageSourceIsEmpty(src) || + virStorageSourceIsFD(src)) + return; if (qemuStorageLimitsRefresh(cfg, dom, src, true) <=3D 0) { virResetLastError(); - return 0; + return; } if (src->allocation) @@ -17268,8 +17266,6 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverCon= fig *cfg, if (src->physical) virTypedParamListAddULLong(params, src->physical, "block.%zu.physi= cal", block_idx); - - return 0; } @@ -17287,8 +17283,8 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, /* the VM is offline so we have to go and load the stast from the disk= by * ourselves */ if (!virDomainObjIsActive(dom)) { - return qemuDomainGetStatsOneBlockFallback(cfg, dom, params, - src, block_idx); + qemuDomainGetStatsOneBlockFallback(cfg, dom, params, src, block_id= x); + return 0; } /* In case where qemu didn't provide the stats we stop here rather than --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042247586845.8769913089182; Thu, 20 Feb 2025 01:04:07 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 059541E4E; Thu, 20 Feb 2025 04:04:07 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 79A631DA6; Thu, 20 Feb 2025 04:02:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A703C1E35; Thu, 20 Feb 2025 04:01:57 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5B50E1E40 for ; Thu, 20 Feb 2025 04:01:47 -0500 (EST) 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-473-yZ7myy3JNX-UzBKie1DVfw-1; Thu, 20 Feb 2025 04:01:45 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 F1157180056F for ; Thu, 20 Feb 2025 09:01:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2002619412A3 for ; Thu, 20 Feb 2025 09:01:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042107; 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=kCM6CsW69bA9XDFbNKcCuqsZseweVQzqpYiG8+e+aNo=; b=AsuzkxGZZyi5G63zbLUzOEUKsGNNa+8nvixMxEGjvFG/lqOaiw9UMhZi/dsXeXvSRGPpke 8/DloM345aJazTUCN6fKiwWtlx8GqDCwnopmfhbPJWAuMP3sSPcWqExtwqgMGXltsg2uw3 uz2O36MmdZmLnnTebZfAXgrzjp2rLfE= X-MC-Unique: yZ7myy3JNX-UzBKie1DVfw-1 X-Mimecast-MFC-AGG-ID: yZ7myy3JNX-UzBKie1DVfw_1740042105 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/21] qemuDomainGetStatsOneBlock: Remove return value Date: Thu, 20 Feb 2025 10:01:18 +0100 Message-ID: <6e13bd74439bbacd8e46017db297a48a7bf9f83c.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ni85sXMFOMyPVttuoMcdL2dTFXFmqlbuSEo9Igays7I_1740042105 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XUESGJBFUAOO6UFKEFIBAWN5R2GUEPUG X-Message-ID-Hash: XUESGJBFUAOO6UFKEFIBAWN5R2GUEPUG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042248566019000 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7318c145d0..aee66b2bc7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17269,7 +17269,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverCon= fig *cfg, } -static int +static void qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, virDomainObj *dom, virTypedParamList *params, @@ -17284,14 +17284,14 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *c= fg, * ourselves */ if (!virDomainObjIsActive(dom)) { qemuDomainGetStatsOneBlockFallback(cfg, dom, params, src, block_id= x); - return 0; + return; } /* In case where qemu didn't provide the stats we stop here rather than * trying to refresh the stats from the disk. Inability to provide sta= ts is * usually caused by blocked storage so this would make libvirtd hang = */ if (!stats || !entryname || !(entry =3D virHashLookup(stats, entryname= ))) - return 0; + return; virTypedParamListAddULLong(params, entry->wr_highest_offset, "block.%z= u.allocation", block_idx); @@ -17305,8 +17305,6 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, virTypedParamListAddULLong(params, src->physical, "block.%zu.p= hysical", block_idx); } } - - return 0; } @@ -17437,10 +17435,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, params); } - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - backendalias, n, *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + backendalias, n, *recordnr, stats); qemuDomainGetStatsBlockExportBackendStorage(backendstoragealias, stats, *recordnr, para= ms); @@ -17461,12 +17457,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, disk->mirrorJob =3D=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *recor= dnr, params); - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - qemuBlockStorageSourceGetEffect= iveNodename(disk->mirror), - disk->mirror, - *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + qemuBlockStorageSourceGetEffectiveN= odename(disk->mirror), + disk->mirror, *recordnr, stats); qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStorageSo= urceGetStorageNodename(disk->mirror), stats, *recordnr, = params); @@ -17487,12 +17480,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, qemuDomainGetStatsBlockExportHeader(disk, backupdisk->= store, *recordnr, params); - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - qemuBlockStorageSourceG= etEffectiveNodename(backupdisk->store), - backupdisk->store, - *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + qemuBlockStorageSourceGetEf= fectiveNodename(backupdisk->store), + backupdisk->store, *recordn= r, stats); qemuDomainGetStatsBlockExportBackendStorage(qemuBlockS= torageSourceGetStorageNodename(backupdisk->store), stats, *re= cordnr, --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042266173989.4686679056529; Thu, 20 Feb 2025 01:04:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1FA231E09; Thu, 20 Feb 2025 04:04:25 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C86281DC4; Thu, 20 Feb 2025 04:02:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E6E21E60; Thu, 20 Feb 2025 04:02:02 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4A78F1D56 for ; Thu, 20 Feb 2025 04:01:49 -0500 (EST) 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-621-5VY6xOJZMtONcTneOWmZ6A-1; Thu, 20 Feb 2025 04:01:47 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 56E55190FF83 for ; Thu, 20 Feb 2025 09:01:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 78FEC19412A3 for ; Thu, 20 Feb 2025 09:01:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042109; 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=JRc7lKaiq3ATkEijO3Fiv01KVpMI6xHPloD62wx+uUM=; b=XA+owpo/hvRTj/VW+4xaRK0LkNu5wzSY117/RdCluBpFqFowRvRG7r+t1Ua0N08yMu+DZa T3cY86EHg7SCedGgC7sqXCoC9N54cTPX0E1IJBr9Bdj8YIA3uNdJRNX6WMLDD2LQHX7ZJ6 hRhNOxgWTdq1lohpifqRlOk72r2D10Y= X-MC-Unique: 5VY6xOJZMtONcTneOWmZ6A-1 X-Mimecast-MFC-AGG-ID: 5VY6xOJZMtONcTneOWmZ6A_1740042106 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 06/21] qemuDomainStorageAlias: Remove NULL checks from callers Date: Thu, 20 Feb 2025 10:01:19 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hZS2MfJw53__eXvA05SlpJemrDJQOo2uttZ2I-x_nQQ_1740042106 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DP32KQZYMZXDPVBL7VASOYFCKR6MA2EV X-Message-ID-Hash: DP32KQZYMZXDPVBL7VASOYFCKR6MA2EV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042269078019100 Content-Type: text/plain; charset="utf-8" 'qemuDomainStorageAlias' always returns non-NULL pointer if it gets a non-NULL string on input. Remove unneeded checks from callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 5 ++--- src/qemu/qemu_monitor_json.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aee66b2bc7..877fefaa38 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17415,9 +17415,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, backendstoragealias =3D qemuBlockStorageSourceGetStorageNodena= me(n); } else { /* alias may be NULL if the VM is not running */ - if (disk->info.alias && - !(alias =3D qemuDomainStorageAlias(disk->info.alias, n->id= ))) - return -1; + if (disk->info.alias) + alias =3D qemuDomainStorageAlias(disk->info.alias, n->id); /* for 'sd' disks we won't be displaying stats for the backing= chain * as we don't update the stats correctly */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 554572b13d..74420b2ee7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2332,9 +2332,8 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValue *dev, g_autofree char *devicename =3D NULL; virJSONValue *backing; - if (dev_name && - !(devicename =3D qemuDomainStorageAlias(dev_name, depth))) - return -1; + if (dev_name) + devicename =3D qemuDomainStorageAlias(dev_name, depth); qdevname =3D virJSONValueObjectGetString(dev, "qdev"); nodename =3D virJSONValueObjectGetString(dev, "node-name"); --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042283376291.3525243266985; Thu, 20 Feb 2025 01:04:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 596231DA1; Thu, 20 Feb 2025 04:04:42 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9297D1E35; Thu, 20 Feb 2025 04:02:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2E66D1E6A; Thu, 20 Feb 2025 04:02:03 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B4ABC1DAE for ; Thu, 20 Feb 2025 04:01:50 -0500 (EST) 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-223-XjkBWVi6OAGWJnMvuqY20w-1; Thu, 20 Feb 2025 04:01:48 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 BF89A190F9EE for ; Thu, 20 Feb 2025 09:01:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E278D19412A3 for ; Thu, 20 Feb 2025 09:01:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042110; 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=QR/i6i9UaXsil9nNoyHjKO4TphmzWXWa56XM00FUyFU=; b=Yxc1B7eZmXfMOHZkabODffE9wlcBCN4SJ0Xh5xN2QAEO6mWsL6kqGQdlCQu+eFfMJRfPGD GXrT6EMdZMdgLU2YzseuI6GX9MH9TN24dLQygAEjQTeBn6dueVdJ/inyAZSHKAGOiGlDD3 Lldi8A+n7Vr21eMmR7hbSHx+dhINXkU= X-MC-Unique: XjkBWVi6OAGWJnMvuqY20w-1 X-Mimecast-MFC-AGG-ID: XjkBWVi6OAGWJnMvuqY20w_1740042107 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/21] qemuDomainGetStatsBlockExportHeader: Remove return value Date: Thu, 20 Feb 2025 10:01:20 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ys_7HukIywI4nv1Mb7WFlmqAYAnKrvGANWo5Vawo1iA_1740042107 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4AUDQCJ3S2M3FJNZIQYV6WOS4XKUTFUX X-Message-ID-Hash: 4AUDQCJ3S2M3FJNZIQYV6WOS4XKUTFUX X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042284918019100 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 877fefaa38..174dad64b0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17365,7 +17365,7 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDe= f *disk, } -static int +static void qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk, GHashTable *stats, virTypedParamList *params, @@ -17391,7 +17391,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, (*recordnr)++; - return 0; + return; } /* vhost-user disk doesn't support getting block stats */ @@ -17400,7 +17400,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, (*recordnr)++; - return 0; + return; } for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { @@ -17494,8 +17494,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, } } } - - return 0; } @@ -17530,10 +17528,8 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, } for (i =3D 0; i < dom->def->ndisks; i++) { - if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, - blockparams, &visited, - visitBacking, cfg, dom) < 0) - return -1; + qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, block= params, + &visited, visitBacking, cfg, dom= ); } virTypedParamListAddUInt(params, visited, "block.count"); --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042301513901.7069001153897; Thu, 20 Feb 2025 01:05:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 797691F27; Thu, 20 Feb 2025 04:05:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 462941DD4; Thu, 20 Feb 2025 04:02:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5A9BB1E55; Thu, 20 Feb 2025 04:02:04 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C7F201DC8 for ; Thu, 20 Feb 2025 04:01:51 -0500 (EST) 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-81-XzGI-TdPNQKYDlzKQF6rkA-1; Thu, 20 Feb 2025 04:01:49 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 324501800991 for ; Thu, 20 Feb 2025 09:01:49 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 50F7719412A4 for ; Thu, 20 Feb 2025 09:01:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042111; 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=M1KxUhKXj4e6rwfJF+ZieWe2W9/RoB4kft0ha4zflOc=; b=SgoQEz/6VJEe8zdJ1wcRDzmu9yIrJXP8HPWsH9hDC3j6lff5pyjzVl9Vwkn7RuMTEMj1bl b1Nz0TC/zB6QXFvOGIPtD2GtuCDzRNuT9WBxKnq70eQDfealDsAPwAA+07ksQ9nOLQd2kJ wDLCpteHtf2+Q56HBlyAlWOZwrQU9vg= X-MC-Unique: XzGI-TdPNQKYDlzKQF6rkA-1 X-Mimecast-MFC-AGG-ID: XzGI-TdPNQKYDlzKQF6rkA_1740042109 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 08/21] virBitmapFormat: Clarify returned values Date: Thu, 20 Feb 2025 10:01:21 +0100 Message-ID: <15f478f87dd4caea604659259aba3ab029322a94.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HeL5dPJPeHN8OsNQfxTHveO7U65dzxnSxHzf9lEyotM_1740042109 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BJCEESVNO5WAZ5CWERWMIMREGIISL7XM X-Message-ID-Hash: BJCEESVNO5WAZ5CWERWMIMREGIISL7XM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042302972019100 Content-Type: text/plain; charset="utf-8" NULL can't be returned; don't mention it in the docs. Avoid extra cofusing variable when returning copy of empty string. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virbitmap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 138c1ac5af..e42f5b872c 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -327,8 +327,8 @@ virBitmapToString(virBitmap *bitmap) * * If bitmap is NULL or it has no bits set, an empty string is returned. * - * Returns the string on success or NULL otherwise. Caller should call - * VIR_FREE to free the string. + * Returns the formatted string. Caller is responsible for freeing the ret= urned + * string. */ char * virBitmapFormat(virBitmap *bitmap) @@ -337,11 +337,8 @@ virBitmapFormat(virBitmap *bitmap) bool first =3D true; int start, cur, prev; - if (!bitmap || (cur =3D virBitmapNextSetBit(bitmap, -1)) < 0) { - char *ret; - ret =3D g_strdup(""); - return ret; - } + if (!bitmap || (cur =3D virBitmapNextSetBit(bitmap, -1)) < 0) + return g_strdup(""); start =3D prev =3D cur; while (prev >=3D 0) { --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042345647902.3478946798159; Thu, 20 Feb 2025 01:05:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8CF301ED0; Thu, 20 Feb 2025 04:05:44 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2768F1F0F; Thu, 20 Feb 2025 04:02:17 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 083811E4C; Thu, 20 Feb 2025 04:02:09 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9DB401DAD for ; Thu, 20 Feb 2025 04:01:53 -0500 (EST) 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-92-pDhKbLKiMDaNm6NszgCezQ-1; Thu, 20 Feb 2025 04:01:51 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 9FB0719560B9 for ; Thu, 20 Feb 2025 09:01:50 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0F8F19412A3 for ; Thu, 20 Feb 2025 09:01:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042113; 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=QIPj0WYTkcuL900vpW7ITs9QHy+KyejNxgJtkdpvY5g=; b=Y4PBAUwtasDO/zAVBIniYrRTbszBGtosd/Wk7OeoHFBit+jmBh/eOIltxXstQ2IKIaZ25d fAiD/nNdOxSOKEydWZAAHUlvvhEYiCNgugbW8BC67qQnBM/V30uwNu40vX6qa3/g1u0IFW D9cssTDe1f/vcDVDMkN1olRi/TZQ5TU= X-MC-Unique: pDhKbLKiMDaNm6NszgCezQ-1 X-Mimecast-MFC-AGG-ID: pDhKbLKiMDaNm6NszgCezQ_1740042110 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 09/21] virDomainResctrlMonDefParse: Refactor temporary variables Date: Thu, 20 Feb 2025 10:01:22 +0100 Message-ID: <62f51f3ae7a8f718542f12a5b8be6af3315f140c.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dfne0n-6NZ9nuCnMOri1Xvp6h-zVkM4pcp7a52EYkg4_1740042110 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LEUXWKMQFGXMBNUU6EBHEEOFIIRORDCP X-Message-ID-Hash: LEUXWKMQFGXMBNUU6EBHEEOFIIRORDCP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042347119019100 Content-Type: text/plain; charset="utf-8" Decrease scope of temporary variables so that they don't have to be autofreed and VIR_FREE()d at the same time. Remove unneeded checks and temporary variables. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 49555efc56..1da59cf83a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18144,8 +18144,6 @@ virDomainResctrlMonDefParse(virDomainDef *def, int rv =3D -1; int ret =3D -1; g_autofree xmlNodePtr *nodes =3D NULL; - g_autofree char *tmp =3D NULL; - g_autofree char *id =3D NULL; ctxt->node =3D node; @@ -18153,6 +18151,8 @@ virDomainResctrlMonDefParse(virDomainDef *def, goto cleanup; for (i =3D 0; i < n; i++) { + g_autofree char *id =3D NULL; + domresmon =3D g_new0(virDomainResctrlMonDef, 1); domresmon->tag =3D tag; @@ -18188,12 +18188,9 @@ virDomainResctrlMonDefParse(virDomainDef *def, * associated allocation, set monitor's id to the same value * as the allocation. */ if (rv =3D=3D 1) { - const char *alloc_id =3D virResctrlAllocGetID(resctrl->alloc); - - id =3D g_strdup(alloc_id); + id =3D g_strdup(virResctrlAllocGetID(resctrl->alloc)); } else { - if (!(tmp =3D virBitmapFormat(domresmon->vcpus))) - goto cleanup; + g_autofree char *tmp =3D virBitmapFormat(domresmon->vcpus); id =3D g_strdup_printf("vcpus_%s", tmp); } @@ -18204,9 +18201,6 @@ virDomainResctrlMonDefParse(virDomainDef *def, goto cleanup; VIR_APPEND_ELEMENT(resctrl->monitors, resctrl->nmonitors, domresmo= n); - - VIR_FREE(id); - VIR_FREE(tmp); } ret =3D 0; --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042322543756.1126875212012; Thu, 20 Feb 2025 01:05:22 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 79D7E1F52; Thu, 20 Feb 2025 04:05:21 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 364981D89; Thu, 20 Feb 2025 04:02:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F0D921E20; Thu, 20 Feb 2025 04:02:08 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 392A51E20 for ; Thu, 20 Feb 2025 04:01:55 -0500 (EST) 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-168-0ylzDbp4N5Sk8zrr2wiZIw-1; Thu, 20 Feb 2025 04:01:52 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 0DF0A18D95DE for ; Thu, 20 Feb 2025 09:01:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2AB4D19412A3 for ; Thu, 20 Feb 2025 09:01:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042114; 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=01wvFsgNKbZAoHUYsR6k8rdfsQ5dS9S9Yi2aDb44jOU=; b=hjOwe4phKMlnzCkq99Y8uSfaLjMshfmzuK1NPHunWzickPT4/isiQq1prg76lL7NUV/YhD kQ3cu+YHFEZudhp4wXYVFBQZW8ktr6IUhgKnNqLZ4uqlGRDlG6deQkYeS0i6Rk6LeWEx1W zVwovSlqaeLSXmzrOZXJKESSKcSC+GM= X-MC-Unique: 0ylzDbp4N5Sk8zrr2wiZIw-1 X-Mimecast-MFC-AGG-ID: 0ylzDbp4N5Sk8zrr2wiZIw_1740042112 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 10/21] virDomainCputuneDefFormat: Refactor bitmap formatting Date: Thu, 20 Feb 2025 10:01:23 +0100 Message-ID: <60a469b6b7605000c10a01390ca554a97b036c0f.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 11QLgv4s6uB6yVH5ueH0lPfw6dSbMQmXrnHHAhcZBrw_1740042112 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YBIFZ2ZNETGBY7BC6UGY6QWC3437JDVT X-Message-ID-Hash: YBIFZ2ZNETGBY7BC6UGY6QWC3437JDVT X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042325095019100 Content-Type: text/plain; charset="utf-8" Use g_autofree for the temporary variables, remove error checks for virBitmapFormat and simplify formatting of multiple attributes. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1da59cf83a..c79831fe0b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27479,47 +27479,35 @@ virDomainCputuneDefFormat(virBuffer *buf, def->cputune.iothread_quota); for (i =3D 0; i < def->maxvcpus; i++) { - char *cpumask; + g_autofree char *cpumask =3D NULL; virDomainVcpuDef *vcpu =3D def->vcpus[i]; if (!vcpu->cpumask) continue; - if (!(cpumask =3D virBitmapFormat(vcpu->cpumask))) - return -1; + cpumask =3D virBitmapFormat(vcpu->cpumask); virBufferAsprintf(&childrenBuf, "\n", i, cp= umask); - - VIR_FREE(cpumask); } if (def->cputune.emulatorpin) { - char *cpumask; - virBufferAddLit(&childrenBuf, "cputune.emulatorpin))) - return -1; + g_autofree char *cpumask =3D virBitmapFormat(def->cputune.emulator= pin); - virBufferAsprintf(&childrenBuf, "cpuset=3D'%s'/>\n", cpumask); - VIR_FREE(cpumask); + virBufferAsprintf(&childrenBuf, "\n", = cpumask); } for (i =3D 0; i < def->niothreadids; i++) { - char *cpumask; + g_autofree char *cpumask =3D NULL; /* Ignore iothreadids with no cpumask */ if (!def->iothreadids[i]->cpumask) continue; - virBufferAsprintf(&childrenBuf, "iothreadids[i]->iothread_id); - - if (!(cpumask =3D virBitmapFormat(def->iothreadids[i]->cpumask))) - return -1; + cpumask =3D virBitmapFormat(def->iothreadids[i]->cpumask); - virBufferAsprintf(&childrenBuf, "cpuset=3D'%s'/>\n", cpumask); - VIR_FREE(cpumask); + virBufferAsprintf(&childrenBuf, "\n", + def->iothreadids[i]->iothread_id, cpumask); } if (def->cputune.emulatorsched) { --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042425770641.349861783821; Thu, 20 Feb 2025 01:07:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9D3CD1E3D; Thu, 20 Feb 2025 04:07:04 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5A8291E03; Thu, 20 Feb 2025 04:02:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 55DB71CF6; Thu, 20 Feb 2025 04:02:14 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1101C1E83 for ; Thu, 20 Feb 2025 04:01:57 -0500 (EST) 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-622-RX__9jzYN8KCpJ5wDpkBlw-1; Thu, 20 Feb 2025 04:01:54 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 6F2691800873 for ; Thu, 20 Feb 2025 09:01:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 90E7E19412A3 for ; Thu, 20 Feb 2025 09:01:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042116; 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=X+ZNlkg7koNp5GkaEXYSgLieXuEde2VgVtePa+b1Q/A=; b=OCrHqx5cgTFWEgatLVwEp1ISltzVw/myyyxvIlH5Rhl7aNotaSfkN2twMhlJY8OzqzyCqW gap8XYZtQZ1EqGeGFmVgN9NCT2gOUCLANZ3a+aMl2Y/LeeOEa1cCV1nckek/3634YIFh8U GYmVX59ifibd1nBQGEiiSL6CbtXiYB4= X-MC-Unique: RX__9jzYN8KCpJ5wDpkBlw-1 X-Mimecast-MFC-AGG-ID: RX__9jzYN8KCpJ5wDpkBlw_1740042113 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 11/21] virBitmapFormat: Don't check return value Date: Thu, 20 Feb 2025 10:01:24 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: q5ZcpPOJNlNJIivtmQ0Zqd79sv1f4ldOKFWGGWWJ9WE_1740042113 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: O2P3G6M45JJM3HV3NLOQXXRX6EBNMOIP X-Message-ID-Hash: O2P3G6M45JJM3HV3NLOQXXRX6EBNMOIP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042427906019100 Content-Type: text/plain; charset="utf-8" 'virBitmapFormat' always returns a string; remove pointless checks. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/ch/ch_driver.c | 3 +-- src/conf/capabilities.c | 9 +-------- src/conf/domain_conf.c | 27 +++++++-------------------- src/conf/numa_conf.c | 18 ++++++------------ src/conf/virnetworkobj.c | 3 --- src/hypervisor/domain_cgroup.c | 6 ++---- src/libxl/libxl_driver.c | 3 +-- src/libxl/xen_common.c | 6 ++---- src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_domain.c | 10 ++++------ src/qemu/qemu_driver.c | 21 ++++++--------------- src/util/vircgroup.c | 5 +---- src/vz/vz_sdk.c | 3 +-- 13 files changed, 33 insertions(+), 84 deletions(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index fa6e4edcf6..3bdcf66ebd 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -2083,8 +2083,7 @@ chDomainSetNumaParamsLive(virDomainObj *vm, return -1; /* Ensure the cpuset string is formatted before passing to cgroup */ - if (!(nodeset_str =3D virBitmapFormat(nodeset))) - return -1; + nodeset_str =3D virBitmapFormat(nodeset); if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR, 0, false, &cgroup_temp) < 0 || diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3d0602e1b6..1821e36e61 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -816,8 +816,7 @@ virCapsHostNUMACellCPUFormat(virBuffer *buf, if (cpus[j].siblings) { g_autofree char *siblings =3D NULL; - if (!(siblings =3D virBitmapFormat(cpus[j].siblings))) - return -1; + siblings =3D virBitmapFormat(cpus[j].siblings); virBufferAsprintf(&childBuf, " socket_id=3D'%d' die_id=3D'%d' cluster_id= =3D'%d' core_id=3D'%d' siblings=3D'%s'", @@ -954,9 +953,6 @@ virCapabilitiesFormatCaches(virBuffer *buf, const char *unit =3D NULL; unsigned long long short_size =3D virFormatIntPretty(bank->size, &= unit); - if (!cpus_str) - return -1; - /* * Let's just *hope* the size is aligned to KiBs so that it does n= ot * bite is back in the future @@ -1038,9 +1034,6 @@ virCapabilitiesFormatMemoryBandwidth(virBuffer *buf, virResctrlInfoMemBWPerNode *control =3D &node->control; g_autofree char *cpus_str =3D virBitmapFormat(node->cpus); - if (!cpus_str) - return -1; - virBufferAsprintf(&attrBuf, " id=3D'%u' cpus=3D'%s'", node->id, cpus_str); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c79831fe0b..7db4368b2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18223,8 +18223,6 @@ virDomainResctrlNew(xmlNodePtr node, /* We need to format it back because we need to be consistent in the n= aming * even when users specify some "sub-optimal" string there. */ vcpus_str =3D virBitmapFormat(vcpus); - if (!vcpus_str) - return NULL; if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) alloc_id =3D virXMLPropString(node, "id"); @@ -25881,8 +25879,7 @@ virDomainMemorySourceDefFormat(virBuffer *buf, switch (def->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: if (def->source.dimm.nodes) { - if (!(bitmap =3D virBitmapFormat(def->source.dimm.nodes))) - return -1; + bitmap =3D virBitmapFormat(def->source.dimm.nodes); virBufferAsprintf(&childBuf, "%s\n", bitm= ap); } @@ -25893,8 +25890,7 @@ virDomainMemorySourceDefFormat(virBuffer *buf, break; case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: if (def->source.virtio_mem.nodes) { - if (!(bitmap =3D virBitmapFormat(def->source.virtio_mem.nodes)= )) - return -1; + bitmap =3D virBitmapFormat(def->source.virtio_mem.nodes); virBufferAsprintf(&childBuf, "%s\n", bitm= ap); } @@ -25921,8 +25917,7 @@ virDomainMemorySourceDefFormat(virBuffer *buf, case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: if (def->source.sgx_epc.nodes) { - if (!(bitmap =3D virBitmapFormat(def->source.sgx_epc.nodes))) - return -1; + bitmap =3D virBitmapFormat(def->source.sgx_epc.nodes); virBufferAsprintf(&childBuf, "%s\n", bitm= ap); } @@ -26992,9 +26987,8 @@ virDomainHugepagesFormatBuf(virBuffer *buf, hugepage->size); if (hugepage->nodemask) { - g_autofree char *nodeset =3D NULL; - if (!(nodeset =3D virBitmapFormat(hugepage->nodemask))) - return -1; + g_autofree char *nodeset =3D virBitmapFormat(hugepage->nodemask); + virBufferAsprintf(buf, " nodeset=3D'%s'", nodeset); } @@ -27321,8 +27315,6 @@ virDomainResctrlMonDefFormatHelper(virDomainResctrl= MonDef *domresmon, } vcpus =3D virBitmapFormat(domresmon->vcpus); - if (!vcpus) - return -1; virBufferAsprintf(buf, "vcpus=3D'%s'/>\n", vcpus); @@ -27356,8 +27348,6 @@ virDomainCachetuneDefFormat(virBuffer *buf, return 0; vcpus =3D virBitmapFormat(resctrl->vcpus); - if (!vcpus) - return -1; virBufferAsprintf(&attrBuf, " vcpus=3D'%s'", vcpus); @@ -27415,8 +27405,6 @@ virDomainMemorytuneDefFormat(virBuffer *buf, return 0; vcpus =3D virBitmapFormat(resctrl->vcpus); - if (!vcpus) - return -1; virBufferAsprintf(&attrBuf, " vcpus=3D'%s'", vcpus); @@ -27545,15 +27533,14 @@ virDomainCpuDefFormat(virBuffer *buf, { virDomainVcpuDef *vcpu; size_t i; - g_autofree char *cpumask =3D NULL; virBufferAddLit(buf, "placement= _mode)); if (def->cpumask && !virBitmapIsAllSet(def->cpumask)) { - if ((cpumask =3D virBitmapFormat(def->cpumask)) =3D=3D NULL) - return -1; + g_autofree char *cpumask =3D virBitmapFormat(def->cpumask); + virBufferAsprintf(buf, " cpuset=3D'%s'", cpumask); } if (virDomainDefHasVcpusOffline(def)) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 0a0e2911f7..6bc54f9405 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -273,7 +273,6 @@ virDomainNumatuneFormatXML(virBuffer *buf, virDomainNuma *numatune) { const char *tmp =3D NULL; - char *nodeset =3D NULL; bool nodesetSpecified =3D false; size_t i =3D 0; @@ -298,10 +297,9 @@ virDomainNumatuneFormatXML(virBuffer *buf, virBufferAsprintf(buf, "memory.placement =3D=3D VIR_DOMAIN_NUMATUNE_PLACEMEN= T_STATIC) { - if (!(nodeset =3D virBitmapFormat(numatune->memory.nodeset))) - return -1; + char *nodeset =3D virBitmapFormat(numatune->memory.nodeset); + virBufferAsprintf(buf, "nodeset=3D'%s'/>\n", nodeset); - VIR_FREE(nodeset); } else if (numatune->memory.placement) { tmp =3D virDomainNumatunePlacementTypeToString(numatune->memor= y.placement); virBufferAsprintf(buf, "placement=3D'%s'/>\n", tmp); @@ -310,19 +308,18 @@ virDomainNumatuneFormatXML(virBuffer *buf, for (i =3D 0; i < numatune->nmem_nodes; i++) { virDomainNumaNode *mem_node =3D &numatune->mem_nodes[i]; + g_autofree char *nodeset =3D NULL; if (!mem_node->nodeset) continue; - if (!(nodeset =3D virBitmapFormat(mem_node->nodeset))) - return -1; + nodeset =3D virBitmapFormat(mem_node->nodeset); virBufferAsprintf(buf, "\n", i, virDomainNumatuneMemModeTypeToString(mem_node->m= ode), nodeset); - VIR_FREE(nodeset); } virBufferAdjustIndent(buf, -2); @@ -461,9 +458,8 @@ virDomainNumatuneMaybeFormatNodeset(virDomainNuma *numa= tune, cellid) < 0) return -1; - if (nodeset && - !(*mask =3D virBitmapFormat(nodeset))) - return -1; + if (nodeset) + *mask =3D virBitmapFormat(nodeset); return 0; } @@ -1010,8 +1006,6 @@ virDomainNumaDefFormatXML(virBuffer *buf, if (cpumask) { g_autofree char *cpustr =3D virBitmapFormat(cpumask); - if (!cpustr) - return -1; virBufferAsprintf(&attrBuf, " cpus=3D'%s'", cpustr); } virBufferAsprintf(&attrBuf, " memory=3D'%llu'", diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 5abc295506..4405645d6d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -799,9 +799,6 @@ virNetworkObjFormat(virNetworkObj *obj, char *classIdStr =3D virBitmapFormat(obj->classIdMap); size_t i; - if (!classIdStr) - return NULL; - virBufferAddLit(&buf, "\n"); virBufferAdjustIndent(&buf, 2); virBufferAsprintf(&buf, "\n", classIdStr); diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index 2b9a1cc9b1..fda495faf5 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/src/hypervisor/domain_cgroup.c @@ -410,8 +410,7 @@ virDomainCgroupRestoreCgroupState(virDomainObj *vm, if (!(all_nodes =3D virNumaGetHostMemoryNodeset())) goto error; - if (!(mem_mask =3D virBitmapFormat(all_nodes))) - goto error; + mem_mask =3D virBitmapFormat(all_nodes); if (virCgroupHasEmptyTasks(cgroup, VIR_CGROUP_CONTROLLER_CPUSET) <=3D = 0) goto error; @@ -648,8 +647,7 @@ virDomainCgroupEmulatorAllNodesAllow(virCgroup *cgroup, if (!(all_nodes =3D virNumaGetHostMemoryNodeset())) goto cleanup; - if (!(all_nodes_str =3D virBitmapFormat(all_nodes))) - goto cleanup; + all_nodes_str =3D virBitmapFormat(all_nodes); data =3D g_new0(virCgroupEmulatorAllNodesData, 1); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index edf7b37581..512b456bfe 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5051,8 +5051,7 @@ libxlDomainGetNumaParameters(virDomainPtr dom, } } - if (!(nodeset =3D virBitmapFormat(nodes))) - goto cleanup; + nodeset =3D virBitmapFormat(nodes); if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) <= 0) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 3a64f565f7..b7ec552631 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2030,10 +2030,8 @@ xenFormatCPUAllocation(virConf *conf, virDomainDef *= def) if (xenConfigSetInt(conf, "vcpus", virDomainDefGetVcpus(def)) < 0) return -1; - if ((def->cpumask !=3D NULL) && - ((cpus =3D virBitmapFormat(def->cpumask)) =3D=3D NULL)) { - return -1; - } + if (def->cpumask !=3D NULL) + cpus =3D virBitmapFormat(def->cpumask); if (cpus && xenConfigSetString(conf, "cpus", cpus) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 54130ac4f0..d898e548e1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7498,8 +7498,7 @@ qemuBuildNumaCPUs(virBuffer *buf, if (!cpu) return 0; - if (!(cpumask =3D virBitmapFormat(cpu))) - return -1; + cpumask =3D virBitmapFormat(cpu); for (tmpmask =3D cpumask; tmpmask; tmpmask =3D next) { if ((next =3D strchr(tmpmask, ','))) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index df1ed0223d..a9bcd62123 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2306,13 +2306,11 @@ qemuDomainObjPrivateXMLFormatAutomaticPlacement(vir= Buffer *buf, if (!priv->autoNodeset && !priv->autoCpuset) return 0; - if (priv->autoNodeset && - !((nodeset =3D virBitmapFormat(priv->autoNodeset)))) - return -1; + if (priv->autoNodeset) + nodeset =3D virBitmapFormat(priv->autoNodeset); - if (priv->autoCpuset && - !((cpuset =3D virBitmapFormat(priv->autoCpuset)))) - return -1; + if (priv->autoCpuset) + cpuset =3D virBitmapFormat(priv->autoCpuset); virBufferAddLit(buf, "online) { /* Configure the corresponding cpuset cgroup before set affinity. = */ @@ -8233,9 +8231,7 @@ qemuDomainSetNumaParamsLive(virDomainObj *vm, if (!virNumaNodesetIsAvailable(nodeset)) return -1; - /* Ensure the cpuset string is formatted before passing to cgroup */ - if (!(nodeset_str =3D virBitmapFormat(nodeset))) - return -1; + nodeset_str =3D virBitmapFormat(nodeset); if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR, 0, false, &cgroup_thread) < 0 || @@ -16682,9 +16678,7 @@ qemuDomainGetResctrlMonData(virQEMUDriver *driver, * res.vcpus is assigned with an memory space holding it, * let this newly allocated memory buffer to be freed along wi= th * the free of 'res' */ - if (!(res->vcpus =3D virBitmapFormat(domresmon->vcpus))) - goto error; - + res->vcpus =3D virBitmapFormat(domresmon->vcpus); res->name =3D g_strdup(virResctrlMonitorGetID(monitor)); if (virResctrlMonitorGetStats(monitor, (const char **)features, @@ -18451,9 +18445,7 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, #define ADD_BITMAP(name) \ do { \ - g_autofree char *tmp =3D NULL; \ - if (!(tmp =3D virBitmapFormat(name))) \ - goto cleanup; \ + g_autofree char *tmp =3D virBitmapFormat(name); \ if (virTypedParamsAddString(&par, &npar, &maxpar, #name, tmp) < 0)= \ goto cleanup; \ } while (0) @@ -18583,10 +18575,9 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, } if (!virBitmapIsAllClear(map)) { - char *tmp =3D virBitmapFormat(map); + g_autofree char *tmp =3D virBitmapFormat(map); virReportError(VIR_ERR_INVALID_ARG, - _("guest is missing vCPUs '%1$s'"), NULLSTR(tmp)); - VIR_FREE(tmp); + _("guest is missing vCPUs '%1$s'"), tmp); goto endjob; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index b424e1b5d4..1daa95e178 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3946,10 +3946,7 @@ virCgroupSetupBlkioDeviceWriteBps(virCgroup *cgroup,= const char *path, int virCgroupSetupCpusetCpus(virCgroup *cgroup, virBitmap *cpumask) { - g_autofree char *new_cpus =3D NULL; - - if (!(new_cpus =3D virBitmapFormat(cpumask))) - return -1; + g_autofree char *new_cpus =3D virBitmapFormat(cpumask); if (virCgroupSetCpusetCpus(cgroup, new_cpus) < 0) return -1; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index b20d454fb8..b5a78d3668 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3903,8 +3903,7 @@ prlsdkDoApplyConfig(struct _vzDriver *driver, pret =3D PrlVmCfg_SetCpuCount(sdkdom, virDomainDefGetVcpus(def)); prlsdkCheckRetGoto(pret, error); - if (!(mask =3D virBitmapFormat(def->cpumask))) - goto error; + mask =3D virBitmapFormat(def->cpumask); pret =3D PrlVmCfg_SetCpuMask(sdkdom, mask); prlsdkCheckRetGoto(pret, error); --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042363278495.0382593895257; Thu, 20 Feb 2025 01:06:03 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BE12C1F50; Thu, 20 Feb 2025 04:06:02 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E6B5F1DB7; Thu, 20 Feb 2025 04:02:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A9FD11E6D; Thu, 20 Feb 2025 04:02:13 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 86C191D87 for ; Thu, 20 Feb 2025 04:01:57 -0500 (EST) 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-669-bvXAWeDMOgCEZwaTZcJwIw-1; Thu, 20 Feb 2025 04:01:55 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 D1D5D180098F for ; Thu, 20 Feb 2025 09:01:54 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F322019412A3 for ; Thu, 20 Feb 2025 09:01:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042117; 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=hMBhnZ8iYMfKLb2RqG7igBWhC/FhJbZy7faunitrcMc=; b=HNTQ6qOK/cyTDxVm1llp3zsEulb0ceVtblgT2cLhLgAaBT+TopP/112W0iCFJtNgmrHnE6 ymhnLw7N6qAdpxoAnihP/Go054BzUMy4GO2CfDFlMVT1+r+heTYwOK+UVwK32PBi1UTKKM O4TpdM1oDiTsN5Sf1K5TB0mIlw3KOks= X-MC-Unique: bvXAWeDMOgCEZwaTZcJwIw-1 X-Mimecast-MFC-AGG-ID: bvXAWeDMOgCEZwaTZcJwIw_1740042114 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 12/21] qemuDomainGetStatsCpuCgroup: Remove return value Date: Thu, 20 Feb 2025 10:01:25 +0100 Message-ID: <1e39ba71c3547523e556a7bf60feea73219ffd8e.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: RonbTH7TJ-tIfJ_9GIdRp5kOjHnrcRjrbKycR0xyfwY_1740042114 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3MLLXRWNYCMLQY5BIATBHSG2DKSOM6VA X-Message-ID-Hash: 3MLLXRWNYCMLQY5BIATBHSG2DKSOM6VA X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042364967019000 Content-Type: text/plain; charset="utf-8" The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d486169bc8..1b5e7b1d70 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16812,7 +16812,7 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, } -static int +static void qemuDomainGetStatsCpuCgroup(virDomainObj *dom, virTypedParamList *params) { @@ -16822,7 +16822,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, unsigned long long sys_time =3D 0; if (!priv->cgroup) - return 0; + return; if (virCgroupGetCpuacctUsage(priv->cgroup, &cpu_time) =3D=3D 0) virTypedParamListAddULLong(params, cpu_time, "cpu.time"); @@ -16831,8 +16831,6 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, virTypedParamListAddULLong(params, user_time, "cpu.user"); virTypedParamListAddULLong(params, sys_time, "cpu.system"); } - - return 0; } @@ -16955,8 +16953,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D dom->privateData; if (priv->cgroup) { - if (qemuDomainGetStatsCpuCgroup(dom, params) < 0) - return -1; + qemuDomainGetStatsCpuCgroup(dom, params); } else { if (qemuDomainGetStatsCpuProc(dom, params) < 0) return -1; --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174004238505387.41635114393046; Thu, 20 Feb 2025 01:06:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 82A5B13C8; Thu, 20 Feb 2025 04:06:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AAA3D1EDB; Thu, 20 Feb 2025 04:02:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4CEC21E69; Thu, 20 Feb 2025 04:02:14 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BC8C81D4E for ; Thu, 20 Feb 2025 04:01:58 -0500 (EST) 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-358-dxbx8f6sN2eTRZTKebZKhA-1; Thu, 20 Feb 2025 04:01:57 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 5C9E319560AF for ; Thu, 20 Feb 2025 09:01:56 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5907019412A3 for ; Thu, 20 Feb 2025 09:01:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042118; 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=8SET7/z66Z45Q7mxS1enmCgYRQJqpp3Vhi7VENuLoqw=; b=OdW2+bRUzXlFMTjFirKtF062npFOyLXzmR4iWVjUIoaEU1+0hKq3alsO2bgXqULSb3k89b agPaAei748OqQtL+2OvTlKeUgn6MjxeYwhwBiMbfgkbRCat2geBEBHoUkcjRUQQFeuUO/r +8CB0Kv9zfCIgIGAXPdLhHdGYA9u5AM= X-MC-Unique: dxbx8f6sN2eTRZTKebZKhA-1 X-Mimecast-MFC-AGG-ID: dxbx8f6sN2eTRZTKebZKhA_1740042116 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 13/21] qemuDomainGetStatsCpuProc: Remove return value Date: Thu, 20 Feb 2025 10:01:26 +0100 Message-ID: <4c896baec23fe7047cf84f8bbfc60a77802a9b77.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DdM5fnOLXZ_L9cihyFnnBL7NIOXWfguY1iHtsziMBXE_1740042116 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LBFFEMF6S5BAIVVZXD43DVZ2EQCFAHQE X-Message-ID-Hash: LBFFEMF6S5BAIVVZXD43DVZ2EQCFAHQE X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042386988019000 Content-Type: text/plain; charset="utf-8" The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b5e7b1d70..a93899ceb5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16834,7 +16834,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, } -static int +static void qemuDomainGetStatsCpuProc(virDomainObj *vm, virTypedParamList *params) { @@ -16845,14 +16845,12 @@ qemuDomainGetStatsCpuProc(virDomainObj *vm, if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime, NULL, NULL, vm->pid, 0) < 0) { /* ignore error */ - return 0; + return; } virTypedParamListAddULLong(params, cpuTime, "cpu.time"); virTypedParamListAddULLong(params, userTime, "cpu.user"); virTypedParamListAddULLong(params, sysTime, "cpu.system"); - - return 0; } @@ -16955,8 +16953,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (priv->cgroup) { qemuDomainGetStatsCpuCgroup(dom, params); } else { - if (qemuDomainGetStatsCpuProc(dom, params) < 0) - return -1; + qemuDomainGetStatsCpuProc(dom, params); } if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042442637671.4114664261755; Thu, 20 Feb 2025 01:07:22 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7A10B20FF; Thu, 20 Feb 2025 04:07:21 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 34D571ECB; Thu, 20 Feb 2025 04:02:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0E94E1E9B; Thu, 20 Feb 2025 04:02:18 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 38D501EB1 for ; Thu, 20 Feb 2025 04:02:00 -0500 (EST) 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-179-KKHpXzTnNFa-hV7uwoa4IQ-1; Thu, 20 Feb 2025 04:01:58 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 9CA9319560B5 for ; Thu, 20 Feb 2025 09:01:57 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C18CB19412A3 for ; Thu, 20 Feb 2025 09:01:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042119; 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=z3yI26IkXUyaKWLhAOzmTa178WVajo4kV22h6iF0PGk=; b=YIdJsXU7eU3AmNSQkpx7JfUz0lhH3MqC4PRLWGvaob2No9iyQnBnQBy5WEZUXgezs+KV1Z UzqptnPA2jxLVZXZfxINMYS/njHhOcugrsyfsMxeHVpLBZ0qLLfo7HF0VZjMTiG2dWypzH RGk7QLVV/veqzwYRT1KwuKvRQ8gWNhE= X-MC-Unique: KKHpXzTnNFa-hV7uwoa4IQ-1 X-Mimecast-MFC-AGG-ID: KKHpXzTnNFa-hV7uwoa4IQ_1740042117 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 14/21] qemuDomainGetStatsCpuHaltPollTime: Remove return value Date: Thu, 20 Feb 2025 10:01:27 +0100 Message-ID: <12d7b54b51ac0c0a94f5cfccc2e4ae7e5171f51b.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: M2kuofE8OKxxjdqXhYKEzQf1kdUwN_mVgjGlyZE8wpc_1740042117 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GSGKTT6BB3DU6H7BPGKNWNR3TKQ7HAZ3 X-Message-ID-Hash: GSGKTT6BB3DU6H7BPGKNWNR3TKQ7HAZ3 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042445548019100 Content-Type: text/plain; charset="utf-8" The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a93899ceb5..e2db449a7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16920,7 +16920,7 @@ qemuDomainGetStatsCpuHaltPollTimeFromStats(virDomai= nObj *dom, } -static int +static void qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, virTypedParamList *params, unsigned int privflags) @@ -16929,17 +16929,17 @@ qemuDomainGetStatsCpuHaltPollTime(virDomainObj *d= om, unsigned long long haltPollFail =3D 0; if (!virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainGetStatsCpuHaltPollTimeFromStats(dom, privflags, &haltPollSuccess, &halt= PollFail) < 0 && virHostCPUGetHaltPollTime(dom->pid, &haltPollSuccess, &haltPollFai= l) < 0) - return 0; + return; virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.succ= ess.time"); virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fail.ti= me"); - return 0; + return; } static int @@ -16959,8 +16959,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; - if (qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags) < 0) - return -1; + qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags); return 0; } --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042467512778.259974698042; Thu, 20 Feb 2025 01:07:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6EE041EA0; Thu, 20 Feb 2025 04:07:46 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5EFB31F00; Thu, 20 Feb 2025 04:02:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 029DF1DDE; Thu, 20 Feb 2025 04:02:20 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5878A1DB9 for ; Thu, 20 Feb 2025 04:02:02 -0500 (EST) 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-292-BiiiqFsMOI69wmbJzzRdGQ-1; Thu, 20 Feb 2025 04:02:00 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 4ED2C1979057 for ; Thu, 20 Feb 2025 09:01:59 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2307619412A3 for ; Thu, 20 Feb 2025 09:01:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042122; 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=80eNn/NJv1HqogPRJp2ZzhIyXrGQ1ZGp30rFCKB8S9g=; b=PPB6HWSYiCPGMCy4vpCo3AN0QkgC3uI8BpXV4+lndj/cFj7VfvUbhIJGXz7EJ0aL18FiEJ /BjgkYkflzCSQ0cGXIASG9HEIoDViNzk6qZgVoU/e0R41Jddz8Jas+VTqeVD47+Tqq2VCJ upEyvFuNixbWvCXDnkd8m5P0H7Gyp7o= X-MC-Unique: BiiiqFsMOI69wmbJzzRdGQ-1 X-Mimecast-MFC-AGG-ID: BiiiqFsMOI69wmbJzzRdGQ_1740042119 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 15/21] qemuDomainGetStatsCpuCache: Don't error out Date: Thu, 20 Feb 2025 10:01:28 +0100 Message-ID: <9b0f7bca277c37d5e0a769e8a053c628b34c0680.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: W4SIt6CkhQYiPB4IdFNY8WAmLATeI4D6DMMe-p4fyYw_1740042119 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W2MFAMT3PJR4ROO6NIGVKRISVTCB2ZBG X-Message-ID-Hash: W2MFAMT3PJR4ROO6NIGVKRISVTCB2ZBG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042469505019100 Content-Type: text/plain; charset="utf-8" The bulk domain stats API is meant to collect as much data as possible without erroring out. If fetching of the cache stats fails just skip outputing them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2db449a7a..efb6e2c454 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16760,7 +16760,7 @@ qemuDomainGetStatsMemoryBandwidth(virQEMUDriver *dr= iver, } -static int +static void qemuDomainGetStatsCpuCache(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params) @@ -16769,14 +16769,16 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, size_t nresdata =3D 0; size_t i =3D 0; size_t j =3D 0; - int ret =3D -1; if (!virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainGetResctrlMonData(driver, dom, &resdata, &nresdata, - VIR_RESCTRL_MONITOR_TYPE_CACHE) < 0) - goto cleanup; + VIR_RESCTRL_MONITOR_TYPE_CACHE) < 0) { + /* don't return cache stats if we can't fetch them */ + virResetLastError(); + return; + } virTypedParamListAddUInt(params, nresdata, "cpu.cache.monitor.count"); @@ -16803,12 +16805,9 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, } } - ret =3D 0; - cleanup: for (i =3D 0; i < nresdata; i++) qemuDomainFreeResctrlMonData(resdata[i]); VIR_FREE(resdata); - return ret; } @@ -16956,8 +16955,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, qemuDomainGetStatsCpuProc(dom, params); } - if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) - return -1; + qemuDomainGetStatsCpuCache(driver, dom, params); qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags); --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042503609141.01204141942014; Thu, 20 Feb 2025 01:08:23 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 05B811F0D; Thu, 20 Feb 2025 04:08:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D5EAB1D90; Thu, 20 Feb 2025 04:02:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 541F81E12; Thu, 20 Feb 2025 04:02:22 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5D92F1D4A for ; Thu, 20 Feb 2025 04:02:05 -0500 (EST) 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-88-lQtJe1JyOEq3Kim2KFwuqA-1; Thu, 20 Feb 2025 04:02:01 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 AE9C11800264 for ; Thu, 20 Feb 2025 09:02:00 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B19E919412A3 for ; Thu, 20 Feb 2025 09:01:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042125; 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=13oaATKsnhfjzWPuvKc77aTb2YjqkeAE2Yl46hqM/Ns=; b=QtsClG8gn2ChuwqnA1+PrchZ08Jf7mLGy1m1OSeBVsvejZEkAPUH7cNfjUCK37GEL+52MZ KCF1EmWUujTZpBkmT5VAwdIBJ2J/6RJg4Acd7ANhYF6Zigfq3iixuNGv0zNDc6pu+Sbpzm 0wxHeh6t3snoa7SjMG8vEnsBnrOI0fs= X-MC-Unique: lQtJe1JyOEq3Kim2KFwuqA-1 X-Mimecast-MFC-AGG-ID: lQtJe1JyOEq3Kim2KFwuqA_1740042120 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 16/21] virPerfReadEvent: Refactor to return -errno on failure Date: Thu, 20 Feb 2025 10:01:29 +0100 Message-ID: <6563a63521e37e4a7d275fe0f5a8d222eab05dd6.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xq5_65JT4EHSUAToZp51hJImFElGYxtgZLlhxlClCO0_1740042120 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UNVVXHIATVHEDHZTXISXEWCLMS3FMRZV X-Message-ID-Hash: UNVVXHIATVHEDHZTXISXEWCLMS3FMRZV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042505551019000 Content-Type: text/plain; charset="utf-8" The function didn't comply with libvirt's error reporting scheme as it reported libvirt errors only sometimes. As callers may want to ignore errors convert it to returning -errno on failure instead. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 6 +++++- src/util/virperf.c | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb6e2c454..e5d5c8c484 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17581,9 +17581,13 @@ qemuDomainGetStatsPerfOneEvent(virPerf *perf, virTypedParamList *params) { uint64_t value =3D 0; + int rv; - if (virPerfReadEvent(perf, type, &value) < 0) + if ((rv =3D virPerfReadEvent(perf, type, &value)) < 0) { + virReportSystemError(-rv, "%s", + _("Unable to read cache data")); return -1; + } virTypedParamListAddULLong(params, value, "perf.%s", virPerfEventTypeT= oString(type)); diff --git a/src/util/virperf.c b/src/util/virperf.c index 91f2ca632a..7f0253d5b2 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -290,6 +290,12 @@ bool virPerfEventIsEnabled(virPerf *perf, return perf && perf->events[type].enabled; } + +/** + * virPerfReadEvent: + * + * Returns 0 on success -ERRNO on failure. + */ int virPerfReadEvent(virPerf *perf, virPerfEventType type, @@ -297,13 +303,10 @@ virPerfReadEvent(virPerf *perf, { struct virPerfEvent *event =3D &perf->events[type]; if (!event->enabled) - return -1; + return -EINVAL; - if (saferead(event->fd, value, sizeof(uint64_t)) < 0) { - virReportSystemError(errno, "%s", - _("Unable to read cache data")); - return -1; - } + if (saferead(event->fd, value, sizeof(uint64_t)) < 0) + return -errno; if (type =3D=3D VIR_PERF_EVENT_CMT) *value *=3D event->efields.cmt.scale; @@ -350,9 +353,7 @@ virPerfReadEvent(virPerf *perf G_GNUC_UNUSED, virPerfEventType type G_GNUC_UNUSED, uint64_t *value G_GNUC_UNUSED) { - virReportSystemError(ENXIO, "%s", - _("Perf not supported on this platform")); - return -1; + return -ENOSYS; } #endif --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042485574134.49707569427164; Thu, 20 Feb 2025 01:08:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 849A21CF7; Thu, 20 Feb 2025 04:08:04 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 373131D25; Thu, 20 Feb 2025 04:02:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AD20F1E34; Thu, 20 Feb 2025 04:02:21 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1833B1E34 for ; Thu, 20 Feb 2025 04:02:05 -0500 (EST) 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-36-ACBaF34iPiWdNeblAzHN1w-1; Thu, 20 Feb 2025 04:02:02 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 F393C180034E for ; Thu, 20 Feb 2025 09:02:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FAC219412A3 for ; Thu, 20 Feb 2025 09:02:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042124; 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=h0ZIrTEdleenaBA569mtNyIz2jkUN4gLLdsQoN3kJ5U=; b=Hj0Z9mgQmgJE/3i0QHLLG/F+hsXkSN8CR6DRvcdfvSi/PzT0QlJlB5XI2cupFLS84rF0Wt RaPT5b3D4MpU1lSFRrvoFU+6li/iVv8U33BfI/C4ousSxtjFtmcNulx6g18ObWSotHCajP JvwI0ozcONqGeUO63tYt64XliqZljsE= X-MC-Unique: ACBaF34iPiWdNeblAzHN1w-1 X-Mimecast-MFC-AGG-ID: ACBaF34iPiWdNeblAzHN1w_1740042122 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 17/21] qemuDomainGetStatsPerfOneEvent: Ignore erros from 'virPerfReadEvent' Date: Thu, 20 Feb 2025 10:01:30 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: s90liv8ib3l7-af1hcg0ZVqPCk8X0A0bokHwEFDJ4gg_1740042122 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 32XERUYXKN52E4DFT4Y6PW4BSRQHQL6U X-Message-ID-Hash: 32XERUYXKN52E4DFT4Y6PW4BSRQHQL6U X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042487547019100 Content-Type: text/plain; charset="utf-8" The bulk domain stats API is meant to collect as much data as possible without erroring out. Skip the perf stats if we can't fetch them instead of erroring out. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e5d5c8c484..8d413fc4df 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17575,23 +17575,17 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver = G_GNUC_UNUSED, } -static int +static void qemuDomainGetStatsPerfOneEvent(virPerf *perf, virPerfEventType type, virTypedParamList *params) { uint64_t value =3D 0; - int rv; - if ((rv =3D virPerfReadEvent(perf, type, &value)) < 0) { - virReportSystemError(-rv, "%s", - _("Unable to read cache data")); - return -1; - } + if (virPerfReadEvent(perf, type, &value) < 0) + return; virTypedParamListAddULLong(params, value, "perf.%s", virPerfEventTypeT= oString(type)); - - return 0; } static int @@ -17607,8 +17601,7 @@ qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNUC= _UNUSED, if (!virPerfEventIsEnabled(priv->perf, i)) continue; - if (qemuDomainGetStatsPerfOneEvent(priv->perf, i, params) < 0) - return -1; + qemuDomainGetStatsPerfOneEvent(priv->perf, i, params); } return 0; --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042520552382.7723749826149; Thu, 20 Feb 2025 01:08:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 82098215F; Thu, 20 Feb 2025 04:08:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8AE211F1A; Thu, 20 Feb 2025 04:02:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8CD561DF2; Thu, 20 Feb 2025 04:02:24 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7FE1D1DD0 for ; Thu, 20 Feb 2025 04:02:06 -0500 (EST) 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-140-WFApPEQsMIylQqtMHEujjQ-1; Thu, 20 Feb 2025 04:02:04 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 64D961800876 for ; Thu, 20 Feb 2025 09:02:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7FC3519412A3 for ; Thu, 20 Feb 2025 09:02:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042126; 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=dzrWKSLb3L4Wa8X1BUj9Umi1n+QP6BFNX5RFXZqrfBw=; b=R06/8E59457fDmqpTNR9+xfz7MvHh+e8bHGInJAcRsSRWu2lGMY6llUmSJhkwBa44MXfBd ykQKSl63PEPKkO8jGXZ6mUBDL20oSEoN7vVVBxzBkB5Y0qh2fwR6ZwMpA2g+6h0puIJ2PV fLFlFM5ddEaicp89w5lq1wiM9MbA158= X-MC-Unique: WFApPEQsMIylQqtMHEujjQ-1 X-Mimecast-MFC-AGG-ID: WFApPEQsMIylQqtMHEujjQ_1740042123 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 18/21] qemuDomainGetStatsIOThread: Don't error out if fetching iothread info fails Date: Thu, 20 Feb 2025 10:01:31 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: smHwum6sqNX7r-KZHB5FWZD1ZaavMq151JV9oeQf3NM_1740042123 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6UHFVBBECBVJE3U4JNMQEC5CK7YNCAGL X-Message-ID-Hash: 6UHFVBBECBVJE3U4JNMQEC5CK7YNCAGL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042523661019100 Content-Type: text/plain; charset="utf-8" The bulk domain stats API is meant to collect as much data as possible without erroring out. Ignore errors from 'qemuDomainGetIOThreadsMon()' and skip the data if an error happens. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8d413fc4df..e513223de2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17531,22 +17531,21 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver = G_GNUC_UNUSED, unsigned int privflags) { size_t i; - qemuMonitorIOThreadInfo **iothreads =3D NULL; + g_autofree qemuMonitorIOThreadInfo **iothreads =3D NULL; int niothreads =3D 0; - int ret =3D -1; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) return 0; - if (qemuDomainGetIOThreadsMon(dom, &iothreads, &niothreads) < 0) - return -1; + if (qemuDomainGetIOThreadsMon(dom, &iothreads, &niothreads) < 0) { + virResetLastError(); + return 0; + } /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we mus= t free * it even if it returns 0 */ - if (niothreads =3D=3D 0) { - ret =3D 0; - goto cleanup; - } + if (niothreads =3D=3D 0) + return 0; virTypedParamListAddUInt(params, niothreads, "iothread.count"); @@ -17564,14 +17563,10 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver = G_GNUC_UNUSED, } } - ret =3D 0; - - cleanup: for (i =3D 0; i < niothreads; i++) VIR_FREE(iothreads[i]); - VIR_FREE(iothreads); - return ret; + return 0; } --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042536978876.7362325906555; Thu, 20 Feb 2025 01:08:56 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E75E81E4C; Thu, 20 Feb 2025 04:08:55 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 627941F42; Thu, 20 Feb 2025 04:02:38 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 14D1E1F02; Thu, 20 Feb 2025 04:02:30 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3080A1D7F for ; Thu, 20 Feb 2025 04:02:08 -0500 (EST) 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-677-zO7Qwj-sMl6rgebb1pyJTw-1; Thu, 20 Feb 2025 04:02:05 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 C74FD19560B9 for ; Thu, 20 Feb 2025 09:02:04 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA5F619412A4 for ; Thu, 20 Feb 2025 09:02:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042127; 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=Gs2i8s0FV31VOtddp7diFc2KTV4igTk5AewDreTdx/8=; b=iiU4ocFQjLeOSBEiRUzLDTaKv4SxUA1/Uazb9JHrTCtrVYImnVo4WE3jYqkeWFBn+0DhSy WmsaAcuXkA1SNGGfkWAsWtHLjYBBeViiZoJYOkBl94lVPu8qTsvTKQne6lY5elbLefOT0y AQzcl6ap9GBu3nBIPMKyZkQ9DJsFtSI= X-MC-Unique: zO7Qwj-sMl6rgebb1pyJTw-1 X-Mimecast-MFC-AGG-ID: zO7Qwj-sMl6rgebb1pyJTw_1740042124 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 19/21] qemuDomainGetStatsMemoryBandwidth: Don't error out Date: Thu, 20 Feb 2025 10:01:32 +0100 Message-ID: <12f08e483bcdbf421c5955a9ad40aee63f4db686.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QNxMMp1HQfkXVBEENc9qRn_mF9vCmQltj7M2dgmWa9g_1740042124 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CT5WKFFZY2LCZDLAR7ONLO24TQC6SVAK X-Message-ID-Hash: CT5WKFFZY2LCZDLAR7ONLO24TQC6SVAK X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042539762019100 Content-Type: text/plain; charset="utf-8" The bulk domain stats API is meant to collect as much data as possible without erroring out. If fetching of the memory bandwidth stats fails just skip outputing them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e513223de2..45f286994e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16697,28 +16697,30 @@ qemuDomainGetResctrlMonData(virQEMUDriver *driver, } -static int +static void qemuDomainGetStatsMemoryBandwidth(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params) { - virQEMUResctrlMonData **resdata =3D NULL; + g_autofree virQEMUResctrlMonData **resdata =3D NULL; char **features =3D NULL; size_t nresdata =3D 0; size_t i =3D 0; size_t j =3D 0; size_t k =3D 0; - int ret =3D -1; if (!virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainGetResctrlMonData(driver, dom, &resdata, &nresdata, - VIR_RESCTRL_MONITOR_TYPE_MEMBW) < 0) - goto cleanup; + VIR_RESCTRL_MONITOR_TYPE_MEMBW) < 0) { + /* don't return cache stats if we can't fetch them */ + virResetLastError(); + return; + } if (nresdata =3D=3D 0) - return 0; + return; virTypedParamListAddUInt(params, nresdata, "memory.bandwidth.monitor.c= ount"); @@ -16751,12 +16753,8 @@ qemuDomainGetStatsMemoryBandwidth(virQEMUDriver *d= river, } } - ret =3D 0; - cleanup: for (i =3D 0; i < nresdata; i++) qemuDomainFreeResctrlMonData(resdata[i]); - VIR_FREE(resdata); - return ret; } @@ -16970,7 +16968,8 @@ qemuDomainGetStatsMemory(virQEMUDriver *driver, unsigned int privflags G_GNUC_UNUSED) { - return qemuDomainGetStatsMemoryBandwidth(driver, dom, params); + qemuDomainGetStatsMemoryBandwidth(driver, dom, params); + return 0; } --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174004255448569.01819759614489; Thu, 20 Feb 2025 01:09:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 589051F24; Thu, 20 Feb 2025 04:09:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 482ED1F39; Thu, 20 Feb 2025 04:02:41 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1EE7B1E27; Thu, 20 Feb 2025 04:02:35 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F03481ED5 for ; Thu, 20 Feb 2025 04:02:10 -0500 (EST) 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-313-fBksQbGKOrmboQWrKYwSLw-1; Thu, 20 Feb 2025 04:02:08 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 D81C21800875 for ; Thu, 20 Feb 2025 09:02:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58F4819412A3 for ; Thu, 20 Feb 2025 09:02:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042130; 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=Yn4qFewXCK4ENUMGn0qy5J8a3HcGHTdkK2uASmA9GQE=; b=HqLOCznDAYloBsZEX/WWNCV/9OaCSbvm/OV7hPyGXLgqZvoUqyxp97Vq1Rz+3ww15mg9+u 20TNxv9fSkVP7zvwCwt778IwzqtXhzSoRkNz6WUvfJweuzpYJEa9uN2/7D0wUD+V220spM YDP0gS9WFpLTWhsHzVWTDJalHBTe2qE= X-MC-Unique: fBksQbGKOrmboQWrKYwSLw-1 X-Mimecast-MFC-AGG-ID: fBksQbGKOrmboQWrKYwSLw_1740042128 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 20/21] qemuDomainGetStatsDirtyRate: Don't error out Date: Thu, 20 Feb 2025 10:01:33 +0100 Message-ID: <5dd54afb69cf359524b0deabc59490ffcee8a664.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QWwxSwjHZisb0Lhg5ji4KoIqbtk_qMkksKm9Nzuym5Y_1740042128 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SYQKDIHV4L5UJTTVJMOKMRYGMO6BNW6J X-Message-ID-Hash: SYQKDIHV4L5UJTTVJMOKMRYGMO6BNW6J X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042555730019100 Content-Type: text/plain; charset="utf-8" The bulk domain stats API is meant to collect as much data as possible without erroring out. If fetching of the dirty rate stats fails just skip outputing them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45f286994e..9e125d8b24 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17601,19 +17601,6 @@ qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNU= C_UNUSED, return 0; } -static int -qemuDomainGetStatsDirtyRateMon(virDomainObj *vm, - qemuMonitorDirtyRateInfo *info) -{ - qemuDomainObjPrivate *priv =3D vm->privateData; - int ret; - - qemuDomainObjEnterMonitor(vm); - ret =3D qemuMonitorQueryDirtyRate(priv->mon, info); - qemuDomainObjExitMonitor(vm); - - return ret; -} static int qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED, @@ -17621,13 +17608,21 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver= G_GNUC_UNUSED, virTypedParamList *params, unsigned int privflags) { + qemuDomainObjPrivate *priv =3D dom->privateData; qemuMonitorDirtyRateInfo info; + int rv; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) return 0; - if (qemuDomainGetStatsDirtyRateMon(dom, &info) < 0) - return -1; + qemuDomainObjEnterMonitor(dom); + rv =3D qemuMonitorQueryDirtyRate(priv->mon, &info); + qemuDomainObjExitMonitor(dom); + + if (rv < 0) { + virResetLastError(); + return 0; + } virTypedParamListAddInt(params, info.status, "dirtyrate.calc_status"); virTypedParamListAddLLong(params, info.startTime, "dirtyrate.calc_star= t_time"); --=20 2.48.1 From nobody Tue Dec 16 03:21:49 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740042586124459.20682490235595; Thu, 20 Feb 2025 01:09:46 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 800FA1DC2; Thu, 20 Feb 2025 04:09:45 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A83491F59; Thu, 20 Feb 2025 04:02:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4EF9C1D52; Thu, 20 Feb 2025 04:02:36 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0EB311D91 for ; Thu, 20 Feb 2025 04:02:11 -0500 (EST) Received: from mx-prod-mc-04.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-542-F89xMkCqOdO25r6nCnCqCg-1; Thu, 20 Feb 2025 04:02:08 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D7978193578F for ; Thu, 20 Feb 2025 09:02:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B0DAA19412A4 for ; Thu, 20 Feb 2025 09:02:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740042130; 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=xUcEIgl0HpNmYo21MDEHj86/wGJmrtX4isuH7t3Flcw=; b=fbKG25By1jGX4uDg5lJY7W8VoloqYQgS8VgvJjGj8Xwt5LMcdjGmEYjKIk4sS3ZU8Rbl1J Aj9pGxHvv+RhdH0cslm/KbwtQdTJeOvZUKe8NcjhlJ+mUiSlBb9xGbzu58rOFwsW87Rq/O 6ZhSlm7eJtGHuOojMmEviHcTvGyAoK0= X-MC-Unique: F89xMkCqOdO25r6nCnCqCg-1 X-Mimecast-MFC-AGG-ID: F89xMkCqOdO25r6nCnCqCg_1740042128 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 21/21] qemuDomainGetStats: Convert worker functions to void Date: Thu, 20 Feb 2025 10:01:34 +0100 Message-ID: <49c5f782a019cced4d1c2432c81cf00cda3e8124.1740041997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: l8IHsMSg44HUXZlZXhVBHujqJR4XwqAdtDv7naw0_zI_1740042128 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M36KOXBWK5MNB7US6BJ36W4YO7IMWROT X-Message-ID-Hash: M36KOXBWK5MNB7US6BJ36W4YO7IMWROT X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740042587984019000 Content-Type: text/plain; charset="utf-8" The presence of a return value made it seem that it's expected to fail on errors which is not the case. The function is designed to skip anything it can't fill and not fail when fetching individual stats. Convert the workers to void to make it clear that it's expected not to fail. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 73 +++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9e125d8b24..80c918312b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16556,7 +16556,7 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, } -static int +static void qemuDomainGetStatsState(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -16564,8 +16564,6 @@ qemuDomainGetStatsState(virQEMUDriver *driver G_GNU= C_UNUSED, { virTypedParamListAddInt(params, dom->state.state, "state.state"); virTypedParamListAddInt(params, dom->state.reason, "state.reason"); - - return 0; } @@ -16939,7 +16937,7 @@ qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, return; } -static int +static void qemuDomainGetStatsCpu(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params, @@ -16956,12 +16954,10 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, qemuDomainGetStatsCpuCache(driver, dom, params); qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags); - - return 0; } -static int +static void qemuDomainGetStatsMemory(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params, @@ -16969,11 +16965,10 @@ qemuDomainGetStatsMemory(virQEMUDriver *driver, { qemuDomainGetStatsMemoryBandwidth(driver, dom, params); - return 0; } -static int +static void qemuDomainGetStatsBalloon(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -16994,12 +16989,12 @@ qemuDomainGetStatsBalloon(virQEMUDriver *driver G= _GNUC_UNUSED, virTypedParamListAddULLong(params, virDomainDefGetMemoryTotal(dom->def= ), "balloon.maximum"); if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) - return 0; + return; nr_stats =3D qemuDomainMemoryStatsInternal(dom, stats, VIR_DOMAIN_MEMORY_STAT_NR); if (nr_stats < 0) - return 0; + return; #define STORE_MEM_RECORD(TAG, NAME) \ if (stats[i].tag =3D=3D VIR_DOMAIN_MEMORY_STAT_ ##TAG) \ @@ -17021,8 +17016,6 @@ qemuDomainGetStatsBalloon(virQEMUDriver *driver G_G= NUC_UNUSED, } #undef STORE_MEM_RECORD - - return 0; } @@ -17085,7 +17078,7 @@ qemuDomainAddStatsFromHashTable(GHashTable *stats, } -static int +static void qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17118,7 +17111,7 @@ qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC= _UNUSED, virDomainDefGetVcpus(dom->def), NULL, 0) < 0) { virResetLastError(); - return 0; + return; } if (HAVE_JOB(privflags) && qemuDomainRefreshStatsSchema(dom) =3D=3D 0)= { @@ -17163,15 +17156,13 @@ qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GN= UC_UNUSED, qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, prefix, = params); } - - return 0; } #define QEMU_ADD_NET_PARAM(params, num, name, value) \ if (value >=3D 0)\ virTypedParamListAddULLong((params), (value), "net.%zu.%s", (num),= (name)); -static int +static void qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17180,7 +17171,7 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G= _GNUC_UNUSED, size_t i; if (!virDomainObjIsActive(dom)) - return 0; + return; virTypedParamListAddUInt(params, dom->def->nnets, "net.count"); @@ -17219,8 +17210,6 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G= _GNUC_UNUSED, QEMU_ADD_NET_PARAM(params, i, "tx.errs", tmp.tx_errs); QEMU_ADD_NET_PARAM(params, i, "tx.drop", tmp.tx_drop); } - - return 0; } #undef QEMU_ADD_NET_PARAM @@ -17481,7 +17470,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, } -static int +static void qemuDomainGetStatsBlock(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params, @@ -17518,12 +17507,10 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, virTypedParamListAddUInt(params, visited, "block.count"); virTypedParamListConcat(params, &blockparams); - - return 0; } -static int +static void qemuDomainGetStatsIOThread(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17534,17 +17521,17 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver = G_GNUC_UNUSED, int niothreads =3D 0; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainGetIOThreadsMon(dom, &iothreads, &niothreads) < 0) { virResetLastError(); - return 0; + return; } /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we mus= t free * it even if it returns 0 */ if (niothreads =3D=3D 0) - return 0; + return; virTypedParamListAddUInt(params, niothreads, "iothread.count"); @@ -17564,8 +17551,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver G_= GNUC_UNUSED, for (i =3D 0; i < niothreads; i++) VIR_FREE(iothreads[i]); - - return 0; } @@ -17582,7 +17567,7 @@ qemuDomainGetStatsPerfOneEvent(virPerf *perf, virTypedParamListAddULLong(params, value, "perf.%s", virPerfEventTypeT= oString(type)); } -static int +static void qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17597,12 +17582,10 @@ qemuDomainGetStatsPerf(virQEMUDriver *driver G_GN= UC_UNUSED, qemuDomainGetStatsPerfOneEvent(priv->perf, i, params); } - - return 0; } -static int +static void qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17613,7 +17596,7 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G= _GNUC_UNUSED, int rv; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) - return 0; + return; qemuDomainObjEnterMonitor(dom); rv =3D qemuMonitorQueryDirtyRate(priv->mon, &info); @@ -17621,7 +17604,7 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G= _GNUC_UNUSED, if (rv < 0) { virResetLastError(); - return 0; + return; } virTypedParamListAddInt(params, info.status, "dirtyrate.calc_status"); @@ -17642,12 +17625,10 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver= G_GNUC_UNUSED, } } } - - return 0; } -static int +static void qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *dom, virTypedParamList *params, @@ -17659,10 +17640,10 @@ qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC= _UNUSED, virJSONValue *stats_obj =3D NULL; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainRefreshStatsSchema(dom) < 0) - return 0; + return; qemuDomainObjEnterMonitor(dom); queried_stats =3D qemuMonitorQueryStats(priv->mon, @@ -17671,17 +17652,15 @@ qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC= _UNUSED, qemuDomainObjExitMonitor(dom); if (!queried_stats || virJSONValueArraySize(queried_stats) !=3D 1) - return 0; + return; stats_obj =3D virJSONValueArrayGet(queried_stats, 0); stats =3D qemuMonitorExtractQueryStats(stats_obj); qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, "vm", params= ); - - return 0; } -typedef int +typedef void (*qemuDomainGetStatsFunc)(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *list, @@ -17795,9 +17774,7 @@ qemuDomainGetStats(virConnectPtr conn, for (i =3D 0; qemuDomainGetStatsWorkers[i].func; i++) { if (stats & qemuDomainGetStatsWorkers[i].stats) { - if (qemuDomainGetStatsWorkers[i].func(conn->privateData, dom, = params, - flags) < 0) - return -1; + qemuDomainGetStatsWorkers[i].func(conn->privateData, dom, para= ms, flags); } } --=20 2.48.1