From nobody Wed May 14 03:45:31 2025 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.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528379686743420.25327758430547; Thu, 7 Jun 2018 06:54:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 259A53082A2C; Thu, 7 Jun 2018 13:54:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F07F6090B; Thu, 7 Jun 2018 13:54:44 +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 E58F7180BA81; Thu, 7 Jun 2018 13:54:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57DsZCJ000429 for ; Thu, 7 Jun 2018 09:54:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A8162026993; Thu, 7 Jun 2018 13:54:35 +0000 (UTC) Received: from caroline (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 084C62026DFD for ; Thu, 7 Jun 2018 13:54:35 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.usersys.redhat.com [127.0.0.1]) by caroline (Postfix) with ESMTP id 1CE3A120070 for ; Thu, 7 Jun 2018 15:54:33 +0200 (CEST) From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 15:54:28 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/10] util: Initialize virResctrlInfo struct right away 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 07 Jun 2018 13:54:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There is no need to have virResctrlGetInfo() when it must be called after virResctrlInfoNew() anyway, otherwise it's just an unusable object. When we wrap the logic inside the New() function we'll save some calls later as wel= l. Signed-off-by: Martin Kletzander Reviewed-by: J=EF=BF=BDn Tomko --- src/conf/capabilities.c | 2 +- src/libvirt_private.syms | 1 - src/util/virresctrl.c | 15 +++++++++++++-- src/util/virresctrl.h | 3 --- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d5f6f007300a..978edf871943 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1604,7 +1604,7 @@ virCapabilitiesInitResctrl(virCapsPtr caps) if (!caps->host.resctrl) return -1; =20 - return virResctrlGetInfo(caps->host.resctrl); + return 0; } =20 =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6a8b40bbbdb1..20ec8760ec27 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2633,7 +2633,6 @@ virResctrlAllocNew; virResctrlAllocRemove; virResctrlAllocSetID; virResctrlAllocSetSize; -virResctrlGetInfo; virResctrlInfoGetCache; virResctrlInfoNew; =20 diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 0266fee4e959..4e35b19649ca 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -314,7 +314,7 @@ virResctrlUnlock(int fd) =20 =20 /* virResctrlInfo-related definitions */ -int +static int virResctrlGetInfo(virResctrlInfoPtr resctrl) { DIR *dirp =3D NULL; @@ -448,10 +448,21 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl) virResctrlInfoPtr virResctrlInfoNew(void) { + virResctrlInfoPtr ret =3D NULL; + if (virResctrlInitialize() < 0) return NULL; =20 - return virObjectNew(virResctrlInfoClass); + ret =3D virObjectNew(virResctrlInfoClass); + if (!ret) + return NULL; + + if (virResctrlGetInfo(ret) < 0) { + virObjectUnref(ret); + return NULL; + } + + return ret; } =20 =20 diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index cc648b521e8f..a348fa7ab195 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -55,9 +55,6 @@ typedef virResctrlInfo *virResctrlInfoPtr; virResctrlInfoPtr virResctrlInfoNew(void); =20 -int -virResctrlGetInfo(virResctrlInfoPtr resctrl); - int virResctrlInfoGetCache(virResctrlInfoPtr resctrl, unsigned int level, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list