On 01/25/2018 10:23 AM, Erik Skultety wrote:
We can call directly the virNodeDeviceGetSCSIHostCaps helper instead.
Signed-off-by: Erik Skultety <eskultet@redhat.com> --- src/conf/node_device_conf.c | 12 ++++++++++++ src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_linux_sysfs.c | 12 ------------ src/node_device/node_device_linux_sysfs.h | 1 - src/node_device/node_device_udev.c | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index bf84fd2b3..70a753ebf 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2431,6 +2431,8 @@ virNodeDeviceDeleteVport(virConnectPtr conn, }
+#ifdef __linux__ + int virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host) { @@ -2511,3 +2513,13 @@ virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host) VIR_FREE(tmp); return ret; } + +#else + +int +virNodeDeviceGetSCSIHostCaps(virNodeDevCap)
The linux version of this function takes virNodeDevCapSCSIHostPtr. This non-linux should do so too. Also, you should give the argument a name and mark it as ATTRIBUTE_UNUSED.
+{ + return -1; +} + +#endif /* __linux__ */ diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 6216a6977..a2f687942 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -56,7 +56,7 @@ nodeDeviceUpdateCaps(virNodeDeviceDefPtr def) while (cap) { switch (cap->data.type) { case VIR_NODE_DEV_CAP_SCSI_HOST: - nodeDeviceSysfsGetSCSIHostCaps(&cap->data.scsi_host); + virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host); break; case VIR_NODE_DEV_CAP_SCSI_TARGET: nodeDeviceSysfsGetSCSITargetCaps(def->sysfs_path, diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index c19e327c9..4c50f4613 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -151,7 +151,7 @@ gather_pci_cap(LibHalContext *ctx, const char *udi, ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function)); }
- if (nodeDeviceSysfsGetPCIRelatedDevCaps(sysfs_path, &d->pci_dev) < 0) { + if (virNodeDeviceGetPCIDynamicCaps(sysfs_path, &d->pci_dev) < 0) { VIR_FREE(sysfs_path); return -1;
This doesn't look right. You're not changing PCI function in this patch. ACK to the rest. Michal