From nobody Wed Dec 17 08:57:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1744032313; cv=none; d=zohomail.com; s=zohoarc; b=YcuUBzR+fpUJB3W/JXBQaLhMKT3VQvSFBQA1CBKesWmI47455rnwmMgaG7/F4kINMQ7uDNer9jRcYxk5fm59yWSg7783eVdQE4UFp46Lz48534XhuF+/V4/pvmc/zYufbtYGXiKxk4Tmyb1FFLyS/RLDTOLDKH2TIqvbhgsDPPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744032313; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=3QeJysm5dVtMmmLV+D9uJ1AXV8BQVFAvDZ81FTAMO1U=; b=V4anvv41O28dVIrBwfeKZ5EHWi7eVt5UghXEAJRAyIc+KE/uc44HQfQC1HjpOXZxAPtH28QZomSuoX1ggqFv7yKDCn6DQqXZIw2cxP22E0PwzrftM3bYtCV6fD9WtpfVMx9Lte07XspWCtRiRv68Iq3ALvZR/XvjCQcH9CGzbbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1744032313098360.27154205796296; Mon, 7 Apr 2025 06:25:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2619515E4; Mon, 7 Apr 2025 09:25:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DD791168B; Mon, 7 Apr 2025 09:24:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AF2481290; Mon, 7 Apr 2025 09:24:25 -0400 (EDT) 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 B073B11C8 for ; Mon, 7 Apr 2025 09:24:24 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-166-E_ob-9IROfKLtQC6r171Uw-1; Mon, 07 Apr 2025 09:24:23 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 601B919560BB for ; Mon, 7 Apr 2025 13:24:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5817D1955BC0; Mon, 7 Apr 2025 13:24:21 +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, 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=1744032264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CbAKJVhQurNN1TlbDJlJfjBgdf66YMECYYn/2IBg2XA=; b=ZaOMW5j4ChWdcIG9AUxvc7kg2kOZY0WW74/h0I+Xaj9O8DgWgqjNISNIo+guRhd9GsK6Ai IMKdoPTL6/p8Tlxg82b4azUxRBlQE6iS+wiDohdWhrtnUqAFwb+k9ZVdFuLu8dAPDZU/mq NSEVugxB2H7h9+pPgxUd4YD5vgAHfdM= X-MC-Unique: E_ob-9IROfKLtQC6r171Uw-1 X-Mimecast-MFC-AGG-ID: E_ob-9IROfKLtQC6r171Uw_1744032262 To: devel@lists.libvirt.org Subject: [PATCH 1/5] virHostCPUGetInfoPopulateLinux: Use automatic memory freeing Date: Mon, 7 Apr 2025 15:24:13 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tIclnS242UBi02UozTp5v0aHH7FxikIqeQMTvuxeS_0_1744032262 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CAZ4BHSKMDW5HVP4RYOQURBTULUXJIEX X-Message-ID-Hash: CAZ4BHSKMDW5HVP4RYOQURBTULUXJIEX 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 CC: Peter Krempa 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1744032315458019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use 'g_autfree' for the two temporary strings. 'sysfs_cpudir' was used in two places, one of which is in a loop. Add another helper variable for it and declare the other one in the loop. Signed-off-by: Peter Krempa --- src/util/virhostcpu.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 3b4a11effb..c4138076d9 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -644,8 +644,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, int threads_per_subcore =3D 0; unsigned int node; int ret =3D -1; - char *sysfs_nodedir =3D NULL; - char *sysfs_cpudir =3D NULL; + g_autofree char *sysfs_nodedir =3D NULL; + g_autofree char *sysfs_cpudir_fallback =3D NULL; int direrr; *mhz =3D 0; @@ -707,6 +707,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, threads_per_subcore =3D 0; while ((direrr =3D virDirRead(nodedir, &nodedirent, sysfs_nodedir)) > = 0) { + char *sysfs_cpudir =3D NULL; + if (sscanf(nodedirent->d_name, "node%u", &node) !=3D 1) continue; @@ -723,8 +725,6 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, &nodethreads, &offline)) < 0) goto cleanup; - VIR_FREE(sysfs_cpudir); - *cpus +=3D nodecpus; if (nodesockets > *sockets) @@ -744,11 +744,9 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, goto done; fallback: - VIR_FREE(sysfs_cpudir); - - sysfs_cpudir =3D g_strdup_printf("%s/cpu", SYSFS_SYSTEM_PATH); + sysfs_cpudir_fallback =3D g_strdup_printf("%s/cpu", SYSFS_SYSTEM_PATH); - if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir, arch, + if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir_fallback, arch, present_cpus_map, online_cpus_map, threads_per_subcore, @@ -799,8 +797,6 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, ret =3D 0; cleanup: - VIR_FREE(sysfs_nodedir); - VIR_FREE(sysfs_cpudir); return ret; } --=20 2.49.0