From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 11 Jan 2018 12:43:29 +0000 (+0100)
Subject: conf: nodedev: Rename virNodeDeviceCapMatch to virNodeDevObjHasCap
X-Git-Tag: v4.1.0-rc1~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54cab1051815177034388f6ef395b80c6597f362;p=thirdparty%2Flibvirt.git

conf: nodedev: Rename virNodeDeviceCapMatch to virNodeDevObjHasCap

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 <eskultet@redhat.com>
---

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index a4d38b3a1c..cf7f45e4bf 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -53,8 +53,7 @@ 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);
+static bool virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, int type);
 
 static int
 virNodeDeviceObjOnceInit(void)
@@ -683,8 +682,8 @@ virNodeDeviceObjListGetParentHost(virNodeDeviceObjListPtr devs,
 
 
 static bool
-virNodeDeviceCapMatch(virNodeDeviceObjPtr obj,
-                      int type)
+virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
+                       int type)
 {
     virNodeDevCapsDefPtr cap = NULL;
 
@@ -850,7 +849,7 @@ virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr devs,
 
 
 #define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG)) && \
-                     virNodeDeviceCapMatch(obj, VIR_NODE_DEV_CAP_ ## FLAG))
+                     virNodeDeviceObjHasCap(obj, VIR_NODE_DEV_CAP_ ## FLAG))
 static bool
 virNodeDeviceMatch(virNodeDeviceObjPtr obj,
                    unsigned int flags)