External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 15:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodedev: Drop the nodeDeviceSysfsGetSCSIHostCaps wrapper

Browse Source 
We can call directly the virNodeDeviceGetSCSIHostCaps helper instead.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2018-01-12 16:23:30 +01:00
parent b20ec49e57
commit d1860140cc
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/node_device_conf.c
View File

@ -2431,6 +2431,8 @@ virNodeDeviceDeleteVport(virConnectPtr conn,
} }
#ifdef __linux__
int int
virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host) virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host)
{ {
@ -2511,3 +2513,13 @@ virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host)
VIR_FREE(tmp); VIR_FREE(tmp);
return ret; return ret;
} }
#else
int
virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED)
{
return -1;
}
#endif /* __linux__ */

2
src/node_device/node_device_driver.c
View File

@ -56,7 +56,7 @@ nodeDeviceUpdateCaps(virNodeDeviceDefPtr def)
while (cap) { while (cap) {
switch (cap->data.type) { switch (cap->data.type) {
case VIR_NODE_DEV_CAP_SCSI_HOST: case VIR_NODE_DEV_CAP_SCSI_HOST:
nodeDeviceSysfsGetSCSIHostCaps(&cap->data.scsi_host); virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host);
break; break;
case VIR_NODE_DEV_CAP_SCSI_TARGET: case VIR_NODE_DEV_CAP_SCSI_TARGET:
nodeDeviceSysfsGetSCSITargetCaps(def->sysfs_path, nodeDeviceSysfsGetSCSITargetCaps(def->sysfs_path,

2
src/node_device/node_device_hal.c
View File

@ -237,7 +237,7 @@ gather_scsi_host_cap(LibHalContext *ctx, const char *udi,
(void)get_int_prop(ctx, udi, "scsi_host.host", (int *)&d->scsi_host.host); (void)get_int_prop(ctx, udi, "scsi_host.host", (int *)&d->scsi_host.host);
retval = nodeDeviceSysfsGetSCSIHostCaps(&d->scsi_host); retval = virNodeDeviceGetSCSIHostCaps(&d->scsi_host);
if (retval == -1) if (retval == -1)
goto out; goto out;

12
src/node_device/node_device_linux_sysfs.c
View File

@ -45,12 +45,6 @@
VIR_LOG_INIT("node_device.node_device_linux_sysfs"); VIR_LOG_INIT("node_device.node_device_linux_sysfs");
int
nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host)
{
return virNodeDeviceGetSCSIHostCaps(scsi_host);
}
int int
nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath, nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath,
@ -196,12 +190,6 @@ nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath,
#else #else
int
nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED)
{
return -1;
}
int nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath ATTRIBUTE_UNUSED, int nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath ATTRIBUTE_UNUSED,
virNodeDevCapSCSITargetPtr scsi_target ATTRIBUTE_UNUSED) virNodeDevCapSCSITargetPtr scsi_target ATTRIBUTE_UNUSED)
{ {

1
src/node_device/node_device_linux_sysfs.h
View File

@ -25,7 +25,6 @@
# include "node_device_conf.h" # include "node_device_conf.h"
int nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host);
int nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath, int nodeDeviceSysfsGetSCSITargetCaps(const char *sysfsPath,
virNodeDevCapSCSITargetPtr scsi_target); virNodeDevCapSCSITargetPtr scsi_target);
int nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath, int nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath,

2
src/node_device/node_device_udev.c
View File

@ -781,7 +781,7 @@ udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
return -1; return -1;
} }
nodeDeviceSysfsGetSCSIHostCaps(&def->caps->data.scsi_host); virNodeDeviceGetSCSIHostCaps(&def->caps->data.scsi_host);
if (udevGenerateDeviceName(device, def, NULL) != 0) if (udevGenerateDeviceName(device, def, NULL) != 0)
return -1; return -1;