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