From 6f143cc5bb8ae7ca79c3c95d7b7afef5b55c97ed Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Mon, 20 Mar 2017 07:28:30 -0400 Subject: [PATCH] nodedev: Pass driver arg by ref Alter virNodeDeviceObjListExport in order to pass the drivers->devs by reference Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 8 ++++---- src/conf/virnodedeviceobj.h | 2 +- src/node_device/node_device_driver.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 5b15363d8d..53df1b834e 100644 --- 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 0acd8cedad..b8b534b9cd 100644 --- 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 7e705e2b18..c3997c922b 100644 --- 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(); -- 2.47.2