Gerd Hoffmann <kra...@redhat.com> writes:
> libusb_get_device_speed() does not work for > libusb_wrap_sys_device() devices in v1.0.23. > > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1871090 > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> > --- > hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index c474551d8456..77f1eaa5fe9e 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -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); 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.... -- Alex Bennée
