From nobody Sun Feb 8 22:18:26 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 1490882649965616.0267936295929; Thu, 30 Mar 2017 07:04:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D75E8F28E; Thu, 30 Mar 2017 14:04:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBC9987668; Thu, 30 Mar 2017 14:04:07 +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 840875ED6B; Thu, 30 Mar 2017 14:04:07 +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 v2UE410f027514 for ; Thu, 30 Mar 2017 10:04:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id DFD1E5C8AA; Thu, 30 Mar 2017 14:04:01 +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 6871B87659 for ; Thu, 30 Mar 2017 14:04:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3D75E8F28E Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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 3D75E8F28E From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:37 +0200 Message-Id: <472d46f70a4460d37e4325067b0261387b9099a3.1490882550.git.mkletzan@redhat.com> 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 05/16] util: Add virFileReadValueScaledInt 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 30 Mar 2017 14:04:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 1 + src/util/virfile.c | 28 ++++++++++++++++++++++++++++ src/util/virfile.h | 1 + 3 files changed, 30 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b551cb86a68e..9e61accda3fc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1631,6 +1631,7 @@ virFileReadLimFD; virFileReadLink; virFileReadValueBitmap; virFileReadValueInt; +virFileReadValueScaledInt; virFileReadValueUint; virFileRelLinkPointsTo; virFileRemove; diff --git a/src/util/virfile.c b/src/util/virfile.c index c0f448d3437d..93fc81f2cfab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3880,6 +3880,34 @@ virFileReadValueUint(const char *path, unsigned int = *value) * fine. */ int +virFileReadValueScaledInt(const char *path, unsigned long long *value) +{ + char *str =3D NULL; + char *endp =3D NULL; + int ret =3D -1; + + if (!virFileExists(path)) + return -2; + + if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0) + return -1; + + virStringTrimOptionalNewline(str); + + if (virStrToLong_ullp(str, &endp, 10, value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid unsigned scaled integer value '%s' in fi= le '%s'"), + str, path); + goto cleanup; + } + + ret =3D virScaleInteger(value, endp, 1024, ULLONG_MAX); + cleanup: + VIR_FREE(str); + return ret; +} + +int virFileReadValueBitmap(const char *path, int maxlen, virBitmapPtr *value) diff --git a/src/util/virfile.h b/src/util/virfile.h index ba1c57c06a8e..406569bdb7e9 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -338,6 +338,7 @@ int virFileComparePaths(const char *p1, const char *p2); int virFileReadValueInt(const char *path, int *value); int virFileReadValueUint(const char *path, unsigned int *value); +int virFileReadValueScaledInt(const char *path, unsigned long long *value); int virFileReadValueBitmap(const char *path, int maxlen, virBitmapPtr *val= ue); #endif /* __VIR_FILE_H */ --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list