nodedev: Pass driver arg by ref

Alter virNodeDeviceObjListExport in order to pass the drivers->devs
by reference

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 5b15363d8de7f978ffc49ede09baeb7dd9be7529..53df1b834e91397b5d69cd4bdd738058189341ca 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -560,7 +560,7 @@ virNodeDeviceMatch(virNodeDeviceObjPtr devobj,
 
 int
 virNodeDeviceObjListExport(virConnectPtr conn,
-                           virNodeDeviceObjList devobjs,
+                           virNodeDeviceObjListPtr devobjs,
                            virNodeDevicePtr **devices,
                            virNodeDeviceObjListFilter filter,
                            unsigned int flags)
@@ -571,11 +571,11 @@ virNodeDeviceObjListExport(virConnectPtr conn,
     int ret = -1;
     size_t i;
 
-    if (devices && VIR_ALLOC_N(tmp_devices, devobjs.count + 1) < 0)
+    if (devices && VIR_ALLOC_N(tmp_devices, devobjs->count + 1) < 0)
         goto cleanup;
 
-    for (i = 0; i < devobjs.count; i++) {
-        virNodeDeviceObjPtr devobj = devobjs.objs[i];
+    for (i = 0; i < devobjs->count; i++) {
+        virNodeDeviceObjPtr devobj = devobjs->objs[i];
         virNodeDeviceObjLock(devobj);
         if ((!filter || filter(conn, devobj->def)) &&
             virNodeDeviceMatch(devobj, flags)) {

diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 0acd8cedad56023c1044a848c13ae2193a8d51e6..b8b534b9cdcbda49ed9cacd2b52c87bba0fb4e1e 100644 (file)
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -94,7 +94,7 @@ virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
 
 int
 virNodeDeviceObjListExport(virConnectPtr conn,
-                           virNodeDeviceObjList devobjs,
+                           virNodeDeviceObjListPtr devobjs,
                            virNodeDevicePtr **devices,
                            virNodeDeviceObjListFilter filter,
                            unsigned int flags);

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 7e705e2b182c3f6fc434f12274931e6376cb8775..c3997c922b6ed5955fcee7226c97d17726f7a956 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -211,7 +211,7 @@ nodeConnectListAllNodeDevices(virConnectPtr conn,
         return -1;
 
     nodeDeviceLock();
-    ret = virNodeDeviceObjListExport(conn, driver->devs, devices,
+    ret = virNodeDeviceObjListExport(conn, &driver->devs, devices,
                                      virConnectListAllNodeDevicesCheckACL,
                                      flags);
     nodeDeviceUnlock();