mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 19:41:16 +00:00
node_device_udev: Try harder to get human readable vendor:product
The manufacurer and product from USB device itself are usually not particularly useful -- they tend to be missing, or ugly (all-uppercase, padded with spaces, etc.). Prefer what's in the usb id database and fall back to descriptors only if the device is too new to be in database. https://bugzilla.redhat.com/show_bug.cgi?id=1138887
This commit is contained in:
parent
7e649c5450
commit
3ef77a544d
@ -580,6 +580,7 @@ static int udevProcessUSBDevice(struct udev_device *device,
|
||||
{
|
||||
union _virNodeDevCapData *data = &def->caps->data;
|
||||
int ret = -1;
|
||||
int err;
|
||||
|
||||
if (udevGetUintProperty(device,
|
||||
"BUSNUM",
|
||||
@ -602,10 +603,17 @@ static int udevProcessUSBDevice(struct udev_device *device,
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (udevGetStringSysfsAttr(device,
|
||||
"manufacturer",
|
||||
&data->usb_dev.vendor_name) == PROPERTY_ERROR) {
|
||||
err = udevGetStringProperty(device,
|
||||
"ID_VENDOR_FROM_DATABASE",
|
||||
&data->usb_dev.vendor_name);
|
||||
if (err == PROPERTY_ERROR)
|
||||
goto out;
|
||||
if (err == PROPERTY_MISSING) {
|
||||
if (udevGetStringSysfsAttr(device,
|
||||
"manufacturer",
|
||||
&data->usb_dev.vendor_name) == PROPERTY_ERROR) {
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
if (udevGetUintProperty(device,
|
||||
@ -615,10 +623,17 @@ static int udevProcessUSBDevice(struct udev_device *device,
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (udevGetStringSysfsAttr(device,
|
||||
"product",
|
||||
&data->usb_dev.product_name) == PROPERTY_ERROR) {
|
||||
err = udevGetStringProperty(device,
|
||||
"ID_MODEL_FROM_DATABASE",
|
||||
&data->usb_dev.product_name);
|
||||
if (err == PROPERTY_ERROR)
|
||||
goto out;
|
||||
if (err == PROPERTY_MISSING) {
|
||||
if (udevGetStringSysfsAttr(device,
|
||||
"product",
|
||||
&data->usb_dev.product_name) == PROPERTY_ERROR) {
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
if (udevGenerateDeviceName(device, def, NULL) != 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user