External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodedev_udev: changes missed by commit 1aa0ba3cef

Browse Source
This commit is contained in:
Osier Yang 2013-06-18 16:39:24 +08:00
parent 1aa0ba3cef
commit bf5fbf8f94
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node_device/node_device_udev.c
View File

@ -1122,16 +1122,13 @@ out:
}
static bool
udevDeviceHasProperty(struct udev_device *dev,
udevHasDeviceProperty(struct udev_device *dev,
const char *key)
{
const char *value = NULL;
bool ret = false;
if (udev_device_get_property_value(dev, key))
return true;
if ((value = udev_device_get_property_value(dev, key)))
ret = true;
return ret;
return false;
}
static int
@ -1161,14 +1158,14 @@ udevGetDeviceType(struct udev_device *device,
*type = VIR_NODE_DEV_CAP_NET;
} else {
/* PCI devices don't set the DEVTYPE property. */
if (udevDeviceHasProperty(device, "PCI_CLASS"))
if (udevHasDeviceProperty(device, "PCI_CLASS"))
*type = VIR_NODE_DEV_CAP_PCI_DEV;
/* Wired network interfaces don't set the DEVTYPE property,
* USB devices also have an INTERFACE property, but they do
* set DEVTYPE, so if devtype is NULL and the INTERFACE
* property exists, we have a network device. */
if (udevDeviceHasProperty(device, "INTERFACE"))
if (udevHasDeviceProperty(device, "INTERFACE"))
*type = VIR_NODE_DEV_CAP_NET;
}