From nobody Wed Feb 11 08:40:07 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 1491478328460976.8147082318445; Thu, 6 Apr 2017 04:32:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C449361D1C; Thu, 6 Apr 2017 11:32:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 97886A2E7E; Thu, 6 Apr 2017 11:32:06 +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 43CF8B3483; Thu, 6 Apr 2017 11:32:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v36BW4KW027990 for ; Thu, 6 Apr 2017 07:32:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id D96BB9EAC1; Thu, 6 Apr 2017 11:32:04 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 976D99EAC3 for ; Thu, 6 Apr 2017 11:32:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C449361D1C Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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 C449361D1C From: John Ferlan To: libvir-list@redhat.com Date: Thu, 6 Apr 2017 07:31:58 -0400 Message-Id: <20170406113200.15595-2-jferlan@redhat.com> In-Reply-To: <20170406113200.15595-1-jferlan@redhat.com> References: <20170406113200.15595-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] nodedev: Introduce virNodeDeviceObjNumOfDevices 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 06 Apr 2017 11:32:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Unify the NumOfDevices API into virnodedeviceobj.c from node_device_driver and test_driver. The only real difference between the two is that the test driver doesn't call the aclfilter API. Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 22 ++++++++++++++++++++++ src/conf/virnodedeviceobj.h | 6 ++++++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 12 ++---------- src/test/test_driver.c | 6 +----- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 3fe3ae5..f0c20c2 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -474,6 +474,28 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj, } =20 =20 +int +virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs, + virConnectPtr conn, + const char *cap, + virNodeDeviceObjListFilter aclfilter) +{ + size_t i; + int ndevs =3D 0; + + for (i =3D 0; i < devs->count; i++) { + virNodeDeviceObjPtr obj =3D devs->objs[i]; + virNodeDeviceObjLock(obj); + if (aclfilter && aclfilter(conn, obj->def) && + (!cap || virNodeDeviceObjHasCap(obj, cap))) + ++ndevs; + virNodeDeviceObjUnlock(obj); + } + + return ndevs; +} + + #define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG)= ) && \ virNodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FL= AG)) static bool diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index e32bbf8..7d303a0 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -83,6 +83,12 @@ typedef bool virNodeDeviceDefPtr def); =20 int +virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs, + virConnectPtr conn, + const char *cap, + virNodeDeviceObjListFilter aclfilter); + +int virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjList devobjs, virNodeDevicePtr **devices, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 92083e5..104ed88 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -951,6 +951,7 @@ virNodeDeviceObjHasCap; virNodeDeviceObjListExport; virNodeDeviceObjListFree; virNodeDeviceObjLock; +virNodeDeviceObjNumOfDevices; virNodeDeviceObjRemove; virNodeDeviceObjUnlock; =20 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 99f7bc5..f90b168 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -160,7 +160,6 @@ nodeNumOfDevices(virConnectPtr conn, unsigned int flags) { int ndevs =3D 0; - size_t i; =20 if (virNodeNumOfDevicesEnsureACL(conn) < 0) return -1; @@ -168,15 +167,8 @@ nodeNumOfDevices(virConnectPtr conn, virCheckFlags(0, -1); =20 nodeDeviceLock(); - for (i =3D 0; i < driver->devs.count; i++) { - virNodeDeviceObjPtr obj =3D driver->devs.objs[i]; - virNodeDeviceObjLock(obj); - if (virNodeNumOfDevicesCheckACL(conn, obj->def) && - ((cap =3D=3D NULL) || - virNodeDeviceObjHasCap(obj, cap))) - ++ndevs; - virNodeDeviceObjUnlock(obj); - } + ndevs =3D virNodeDeviceObjNumOfDevices(&driver->devs, conn, cap, + virNodeNumOfDevicesCheckACL); nodeDeviceUnlock(); =20 return ndevs; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index cce4d2d..2f1f4fa 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5385,15 +5385,11 @@ testNodeNumOfDevices(virConnectPtr conn, { testDriverPtr driver =3D conn->privateData; int ndevs =3D 0; - size_t i; =20 virCheckFlags(0, -1); =20 testDriverLock(driver); - for (i =3D 0; i < driver->devs.count; i++) - if ((cap =3D=3D NULL) || - virNodeDeviceObjHasCap(driver->devs.objs[i], cap)) - ++ndevs; + ndevs =3D virNodeDeviceObjNumOfDevices(&driver->devs, conn, cap, NULL); testDriverUnlock(driver); =20 return ndevs; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list