From nobody Thu May 15 03:57:47 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1516872262104610.4436606221515; Thu, 25 Jan 2018 01:24:22 -0800 (PST) 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 45F5648E82; Thu, 25 Jan 2018 09:24:21 +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 1E0FF5C8B7; Thu, 25 Jan 2018 09:24:21 +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 D6BA718033D9; Thu, 25 Jan 2018 09:24:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0P9OI22032658 for ; Thu, 25 Jan 2018 04:24:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 38EC82C313; Thu, 25 Jan 2018 09:24:18 +0000 (UTC) Received: from beluga.usersys.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 682A665608; Thu, 25 Jan 2018 09:24:17 +0000 (UTC) From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 25 Jan 2018 10:23:48 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH 01/15] conf: nodedev: Rename virNodeDevObjHasCap to virNodeDevObjHasCapStr 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.25]); Thu, 25 Jan 2018 09:24:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We currently have 2 methods that do the capability matching. This should be condensed to a single function and all the derivates should just call into that using a proper type conversion. Signed-off-by: Erik Skultety --- src/conf/virnodedeviceobj.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c4e3a40d3..a4d38b3a1 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -53,6 +53,8 @@ static virClassPtr virNodeDeviceObjClass; static virClassPtr virNodeDeviceObjListClass; static void virNodeDeviceObjDispose(void *opaque); static void virNodeDeviceObjListDispose(void *opaque); +static bool virNodeDeviceObjHasCapStr(const virNodeDeviceObj *obj, + const char *cap); =20 static int virNodeDeviceObjOnceInit(void) @@ -121,8 +123,8 @@ virNodeDeviceObjGetDef(virNodeDeviceObjPtr obj) =20 =20 static bool -virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, - const char *cap) +virNodeDeviceObjHasCapStr(const virNodeDeviceObj *obj, + const char *cap) { virNodeDevCapsDefPtr caps =3D obj->def->caps; const char *fc_host_cap =3D @@ -375,7 +377,7 @@ virNodeDeviceObjListFindByCapCallback(const void *paylo= ad, int want =3D 0; =20 virObjectLock(obj); - if (virNodeDeviceObjHasCap(obj, matchstr)) + if (virNodeDeviceObjHasCapStr(obj, matchstr)) want =3D 1; virObjectUnlock(obj); return want; @@ -750,7 +752,7 @@ virNodeDeviceObjListNumOfDevicesCallback(void *payload, virObjectLock(obj); def =3D obj->def; if ((!filter || filter(data->conn, def)) && - (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) + (!data->matchstr || virNodeDeviceObjHasCapStr(obj, data->matchstr)= )) data->count++; =20 virObjectUnlock(obj); @@ -805,7 +807,7 @@ virNodeDeviceObjListGetNamesCallback(void *payload, def =3D obj->def; =20 if ((!filter || filter(data->conn, def)) && - (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) { + (!data->matchstr || virNodeDeviceObjHasCapStr(obj, data->matchstr)= )) { if (VIR_STRDUP(data->names[data->nnames], def->name) < 0) { data->error =3D true; goto cleanup; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list