From nobody Wed Feb 11 10:03:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1490882659986875.4841002787264; Thu, 30 Mar 2017 07:04:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C1517FD68; Thu, 30 Mar 2017 14:04:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10CA4B23F8; Thu, 30 Mar 2017 14:04:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B50DE5ED64; Thu, 30 Mar 2017 14:04:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4Gjl027588 for ; Thu, 30 Mar 2017 10:04:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F83971CB3; Thu, 30 Mar 2017 14:04:16 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB81587667 for ; Thu, 30 Mar 2017 14:04:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3C1517FD68 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3C1517FD68 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:41 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/16] util: Unify behaviour of the functions in sysfs.c X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 14:04:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Make virSysfsGet*ValueString() functions use virSysfsGetValueString() then we have one more allocation, but the code is cleaner and it's easier to make sure the behaviour (e.g. return -2 on missing file) isn't changed by mistake. Signed-off-by: Martin Kletzander --- src/util/virsysfs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 8d3665377e8c..a8550bbfbc26 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -178,19 +178,11 @@ virSysfsGetCpuValueString(unsigned int cpu, char *path =3D NULL; int ret =3D -1; - if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file= ) < 0) + if (virAsprintf(&path, "cpu/cpu%u/%s", cpu, file) < 0) return -1; - if (!virFileExists(path)) { - ret =3D -2; - goto cleanup; - } + ret =3D virSysfsGetValueString(path, value); - if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0) - goto cleanup; - - ret =3D 0; - cleanup: VIR_FREE(path); return ret; } --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list