From nobody Tue Dec 16 16:28:29 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 --- 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