78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
commit 74c7a3463d18a530d6d749d0199061b5d3f17faa
|
|
Author: Cole Robinson <crobinso@redhat.com>
|
|
Date: Tue May 11 14:44:34 2010 -0400
|
|
|
|
node_device: udev: Fix PCI product/vendor swappage
|
|
|
|
Product and vendor values were swapped in the XML, which made virt-manager
|
|
PCI device listing kinda useless.
|
|
|
|
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
|
|
index bcfe991..4a9d65f 100644
|
|
--- a/src/node_device/node_device_udev.c
|
|
+++ b/src/node_device/node_device_udev.c
|
|
@@ -382,8 +382,8 @@ static int udevTranslatePCIIds(unsigned int vendor,
|
|
|
|
/* pci_get_strings returns void */
|
|
pci_get_strings(&m,
|
|
- &vendor_name,
|
|
&device_name,
|
|
+ &vendor_name,
|
|
NULL,
|
|
NULL);
|
|
|
|
commit 75d88455f54088f88bc7a503da0a4cd413ef7b95
|
|
Author: Klaus Ethgen <Klaus@Ethgen.de>
|
|
Date: Tue Apr 27 09:20:47 2010 +0200
|
|
|
|
The base used for conversion of USB values should be 16 not 10.
|
|
|
|
Signed-off-by: Guido Günther <agx@sigxcpu.org>
|
|
|
|
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
|
|
index b12a49e..3a5a7e2 100644
|
|
--- a/src/node_device/node_device_udev.c
|
|
+++ b/src/node_device/node_device_udev.c
|
|
@@ -548,8 +548,6 @@ out:
|
|
}
|
|
|
|
|
|
-/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol
|
|
- * conversions? */
|
|
static int udevProcessUSBInterface(struct udev_device *device,
|
|
virNodeDeviceDefPtr def)
|
|
{
|
|
@@ -559,28 +557,28 @@ static int udevProcessUSBInterface(struct udev_device *device,
|
|
if (udevGetUintSysfsAttr(device,
|
|
"bInterfaceNumber",
|
|
&data->usb_if.number,
|
|
- 10) == PROPERTY_ERROR) {
|
|
+ 16) == PROPERTY_ERROR) {
|
|
goto out;
|
|
}
|
|
|
|
if (udevGetUintSysfsAttr(device,
|
|
"bInterfaceClass",
|
|
&data->usb_if._class,
|
|
- 10) == PROPERTY_ERROR) {
|
|
+ 16) == PROPERTY_ERROR) {
|
|
goto out;
|
|
}
|
|
|
|
if (udevGetUintSysfsAttr(device,
|
|
"bInterfaceSubClass",
|
|
&data->usb_if.subclass,
|
|
- 10) == PROPERTY_ERROR) {
|
|
+ 16) == PROPERTY_ERROR) {
|
|
goto out;
|
|
}
|
|
|
|
if (udevGetUintSysfsAttr(device,
|
|
"bInterfaceProtocol",
|
|
&data->usb_if.protocol,
|
|
- 10) == PROPERTY_ERROR) {
|
|
+ 16) == PROPERTY_ERROR) {
|
|
goto out;
|
|
}
|
|
|