External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only return two values in udevGetIntSysfsAttr

Browse Source 
Callers only check for an error or a specific integer value.
This commit is contained in:
Ján Tomko 2016-06-03 17:39:39 +02:00
parent e545806db9
commit 3554492a08
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/node_device/node_device_udev.c
View File

@ -171,10 +171,10 @@ static int udevGetIntSysfsAttr(struct udev_device *udev_device,
if (str && virStrToLong_i(str, NULL, base, value) < 0) { if (str && virStrToLong_i(str, NULL, base, value) < 0) {
VIR_ERROR(_("Failed to convert '%s' to int"), str); VIR_ERROR(_("Failed to convert '%s' to int"), str);
return PROPERTY_ERROR; return -1;
} }
return str == NULL ? PROPERTY_MISSING : PROPERTY_FOUND; return 0;
} }
@ -322,7 +322,6 @@ static int udevProcessPCI(struct udev_device *device,
udevPrivate *priv = driver->privateData; udevPrivate *priv = driver->privateData;
int ret = -1; int ret = -1;
char *p; char *p;
int rc;
syspath = udev_device_get_syspath(device); syspath = udev_device_get_syspath(device);
@ -364,17 +363,12 @@ static int udevProcessPCI(struct udev_device *device,
if (udevGenerateDeviceName(device, def, NULL) != 0) if (udevGenerateDeviceName(device, def, NULL) != 0)
goto out; goto out;
rc = udevGetIntSysfsAttr(device, /* The default value is -1, because it can't be 0
"numa_node", * as zero is valid node number. */
&data->pci_dev.numa_node, data->pci_dev.numa_node = -1;
10); if (udevGetIntSysfsAttr(device, "numa_node",
if (rc == PROPERTY_ERROR) { &data->pci_dev.numa_node, 10) < 0)
goto out; goto out;
} else if (rc == PROPERTY_MISSING) {
/* The default value is -1, because it can't be 0
* as zero is valid node number. */
data->pci_dev.numa_node = -1;
}
if (nodeDeviceSysfsGetPCIRelatedDevCaps(syspath, data) < 0) if (nodeDeviceSysfsGetPCIRelatedDevCaps(syspath, data) < 0)
goto out; goto out;
@ -748,12 +742,12 @@ static int udevProcessRemoveableMedia(struct udev_device *device,
int has_media) int has_media)
{ {
virNodeDevCapDataPtr data = &def->caps->data; virNodeDevCapDataPtr data = &def->caps->data;
int tmp_int = 0, ret = 0; int is_removable = 0, ret = 0;
if ((udevGetIntSysfsAttr(device, "removable", &tmp_int, 0) == PROPERTY_FOUND) && if (udevGetIntSysfsAttr(device, "removable", &is_removable, 0) < 0)
(tmp_int == 1)) { return -1;
if (is_removable == 1)
def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE;
}
if (has_media) { if (has_media) {