From nobody Tue Dec 16 16:31:11 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 --- 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