nodedev: Break out virNodeDeviceHasCap to node_conf

Will be used by test driver node device implementation.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 5b25bb7787149e91d7fea3de85d05ac31df3de4a..a81094005669482ebfde6b1c713cdda77c9e9b56 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -80,6 +80,16 @@ virNodeDevCapsDefParseString(virConnectPtr conn,
     return 0;
 }
 
+int virNodeDeviceHasCap(const virNodeDeviceObjPtr dev, const char *cap)
+{
+    virNodeDevCapsDefPtr caps = dev->def->caps;
+    while (caps) {
+        if (STREQ(cap, virNodeDevCapTypeToString(caps->type)))
+            return 1;
+        caps = caps->next;
+    }
+    return 0;
+}
 
 virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs,
                                             const char *name)

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index c33cc738c2f418b95f6684007860603642e0acb8..9fa9127e604f93796b1eeeec7c93241736f80f9b 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -193,6 +193,8 @@ struct _virDeviceMonitorState {
         virReportErrorHelper(conn, VIR_FROM_NODEDEV, code, __FILE__,   \
                                __FUNCTION__, __LINE__, fmt)
 
+int virNodeDeviceHasCap(const virNodeDeviceObjPtr dev, const char *cap);
+
 virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs,
                                             const char *name);
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 49bbf9660ac40f792c16dae538720b118d9c5c50..952ed2968c5fea72357aa3b64513e3956fdfb3cb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -302,6 +302,7 @@ nodeGetFreeMemory;
 
 
 # node_device_conf.h
+virNodeDeviceHasCap;
 virNodeDeviceObjRemove;
 virNodeDevCapTypeToString;
 virNodeDeviceFindByName;

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index c902e7d943f4af808b7ae69297c524408d623530..14b309898b6838df4774af678ab4912b32299bde 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -39,17 +39,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
-static int dev_has_cap(const virNodeDeviceObjPtr dev, const char *cap)
-{
-    virNodeDevCapsDefPtr caps = dev->def->caps;
-    while (caps) {
-        if (STREQ(cap, virNodeDevCapTypeToString(caps->type)))
-            return 1;
-        caps = caps->next;
-    }
-    return 0;
-}
-
 
 static int update_caps(virNodeDeviceObjPtr dev)
 {
@@ -157,7 +146,7 @@ static int nodeNumOfDevices(virConnectPtr conn,
     for (i = 0; i < driver->devs.count; i++) {
         virNodeDeviceObjLock(driver->devs.objs[i]);
         if ((cap == NULL) ||
-            dev_has_cap(driver->devs.objs[i], cap))
+            virNodeDeviceHasCap(driver->devs.objs[i], cap))
             ++ndevs;
         virNodeDeviceObjUnlock(driver->devs.objs[i]);
     }
@@ -180,7 +169,7 @@ nodeListDevices(virConnectPtr conn,
     for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) {
         virNodeDeviceObjLock(driver->devs.objs[i]);
         if (cap == NULL ||
-            dev_has_cap(driver->devs.objs[i], cap)) {
+            virNodeDeviceHasCap(driver->devs.objs[i], cap)) {
             if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) {
                 virNodeDeviceObjUnlock(driver->devs.objs[i]);
                 goto failure;