usb-host: workaround libusb bug
PATCH 1/1 usb-host: workaround libusb bug
libusb_get_device_speed() does not work forlibusb_wrap_sys_device() devices in v1.0.23.
--- hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
hw/usb/host-libusb.c +36 -1
@@ -39,6 +39,11 @@#endif #include <libusb.h> +#ifdef CONFIG_LINUX +#include <sys/ioctl.h> +#include <linux/usbdevice_fs.h> +#endif +#include "qapi/error.h" #include "migration/vmstate.h" #include "monitor/monitor.h"
@@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)static int usb_host_open (USBHostDevice *s,libusb_device *dev,int hostfd) {USBDevice *udev =USB_DEVICE (s); +int libusb_speed;int bus_num =0 ;int addr =0 ;int rc;
@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)usb_ep_init (udev);usb_host_ep_update (s); - udev->speed = speed_map[libusb_get_device_speed (dev)]; + libusb_speed =libusb_get_device_speed (dev); +#ifdef CONFIG_LINUX +if (hostfd && libusb_speed ==0 ) { +/* +* Workaround libusb bug: libusb_get_device_speed() does not +* work for libusb_wrap_sys_device() devices in v1.0.23. +* +* Speeds are defined in linux/usb/ch9.h, file not included +* due to name conflicts. +*/ +int rc =ioctl (hostfd,USBDEVFS_GET_SPEED ,NULL ); +switch (rc) { +case 1 :/* low */ + libusb_speed =LIBUSB_SPEED_LOW ; +break ; +case 2 :/* full */ + libusb_speed =LIBUSB_SPEED_FULL ; +break ; +case 3 :/* high */ +case 4 :/* wireless */ + libusb_speed =LIBUSB_SPEED_HIGH ; +break ; +case 5 :/* super */ +case 6 :/* super plus */ + libusb_speed =LIBUSB_SPEED_SUPER ; +break ; + } + } +#endif + udev->speed = speed_map[libusb_speed];usb_host_speed_compat (s);if (s->ddesc.iProduct) {
Signature · 1 line
2.27.0
Quoted 39 lines · Gerd Hoffmann
libusb_get_device_speed()does not work forlibusb_wrap_sys_device()devices in v1.0.23.Signed-off-by Gerd Hoffmann <[email protected]>--- hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)hw/usb/host-libusb.c +7
-1@@ -39,6 +39,11 @@#endif #include <libusb.h> +#ifdef CONFIG_LINUX +#include <sys/ioctl.h> +#include <linux/usbdevice_fs.h> +#endif +#include "qapi/error.h" #include "migration/vmstate.h" #include "monitor/monitor.h" @@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)static int usb_host_open (USBHostDevice *s,libusb_device *dev,int hostfd) {USBDevice *udev =USB_DEVICE (s); +int libusb_speed;int bus_num =0 ;int addr =0 ;int rc;@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)usb_ep_init (udev);usb_host_ep_update (s); - udev->speed = speed_map[libusb_get_device_speed (dev)]; + libusb_speed =libusb_get_device_speed (dev);
hw/usb/host-libusb.c static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) · line 954
Quoted 10 lines
hw/usb/host-libusb.c +10
-0+#ifdef CONFIG_LINUX +if (hostfd && libusb_speed ==0 ) { +/* +* Workaround libusb bug: libusb_get_device_speed() does not +* work for libusb_wrap_sys_device() devices in v1.0.23. +* +* Speeds are defined in linux/usb/ch9.h, file not included +* due to name conflicts. +*/ +int rc =ioctl (hostfd,USBDEVFS_GET_SPEED ,NULL );
This (further) breaks a bunch of the Travis jobs - I assume because libusb doesn't always have this symbol:
Compiling C object libcommon.fa.p/hw_input_vhost-user-input.c.o
../hw/usb/host-libusb.c: In function ‘usb_host_open’:
../hw/usb/host-libusb.c:954:32: error: ‘USBDEVFS_GET_SPEED’ undeclared (first use in this function)
int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
^
../hw/usb/host-libusb.c:954:32: note: each undeclared identifier is reported only once for each function it appears in
Makefile.ninja:961: recipe for target 'libcommon.fa.p/hw_usb_host-libusb.c.o' failed
make: *** [libcommon.fa.p/hw_usb_host-libusb.c.o] Error 1
make: *** Waiting for unfinished jobs....
Signature · 1 line
Alex Bennée
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+#include <linux/usbdevice_fs.h> + int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);This (further) breaks a bunch of the Travis jobs - I assume because libusb doesn't always have this symbol:
../hw/usb/host-libusb.c:954:32: error: ‘USBDEVFS_GET_SPEED’ undeclared (first use in this function)
It isn't libusb, it is the kernel (linux/usbdevice_fs.h).
/me checks git ...
Added in 4.13, so available for quite a while.
I guess that is the prehistoric ubuntu version travis has?
Given that we only need that workaround with rather new libusb versions (which have libusb_wrap_sys_device() support) which most likely isn't present in that old ubuntu version we can probably just do this:
hw/usb/host-libusb.c +1 -1
@@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)usb_host_ep_update (s); libusb_speed =libusb_get_device_speed (dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >=0x01000107 && defined(CONFIG_LINUX )if (hostfd && libusb_speed ==0 ) {/* * Workaround libusb bug: libusb_get_device_speed() does not
Quoted 24 lines · Gerd Hoffmann
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+#include <linux/usbdevice_fs.h> + int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);This (further) breaks a bunch of the Travis jobs - I assume because libusb doesn't always have this symbol:
../hw/usb/host-libusb.c:954:32: error: ‘USBDEVFS_GET_SPEED’ undeclared (first use in this function)It isn't libusb, it is the kernel (
linux/usbdevice_fs.h)./me checks git ...
Added in 4.13, so available for quite a while.
I guess that is the prehistoric ubuntu version travis has?Given that we only need that workaround with rather new libusb versions (which have
libusb_wrap_sys_device()support) which most likely isn't present in that old ubuntu version we can probably just do this:hw/usb/host-libusb.c +0
-0
hw/usb/host-libusb.c static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) · line 948
Quoted 8 lines
hw/usb/host-libusb.c +1
-1@@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)usb_host_ep_update (s); libusb_speed =libusb_get_device_speed (dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >=0x01000107 && defined(CONFIG_LINUX )if (hostfd && libusb_speed ==0 ) {/* * Workaround libusb bug: libusb_get_device_speed() does not
That works. Do you want to include that in your next PR or send a patch for me to include in my testing/next PR?
In the meantime:
Signature · 1 line
Alex Bennée
Quoted 29 lines · Alex Bennée
Quoted 26 lines · Gerd Hoffmann
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+#include <linux/usbdevice_fs.h> + int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);This (further) breaks a bunch of the Travis jobs - I assume because libusb doesn't always have this symbol:
../hw/usb/host-libusb.c:954:32: error: ‘USBDEVFS_GET_SPEED’ undeclared (first use in this function)It isn't libusb, it is the kernel (
linux/usbdevice_fs.h)./me checks git ...
Added in 4.13, so available for quite a while.
I guess that is the prehistoric ubuntu version travis has?Given that we only need that workaround with rather new libusb versions (which have
libusb_wrap_sys_device()support) which most likely isn't present in that old ubuntu version we can probably just do this:hw/usb/host-libusb.c +0
-0@@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)usb_host_ep_update (s);
Quoted 9 lines
hw/usb/host-libusb.c static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) · line 948
Quoted 6 lines
hw/usb/host-libusb.c +1
-1libusb_speed =libusb_get_device_speed (dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >=0x01000107 && defined(CONFIG_LINUX )if (hostfd && libusb_speed ==0 ) {/* * Workaround libusb bug: libusb_get_device_speed() does not That works. Do you want to include that in your next PR or send a patch for me to include in my testing/next PR?
Patch is on the list already:
https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/
Feel free to include it in testing pull.
take care,
Gerd