| Message ID | 20200624134510.9381-1-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb: fix usb-host build on windows. | expand |
On Wed, Jun 24, 2020 at 3:45 PM Gerd Hoffmann <kraxel@redhat.com> wrote: > Seems the new API is not available on windows. > Update #ifdefs accordingly. > > Fixes: 9f815e83e983 ("usb: add hostdevice property to usb-host") > Reported-by: Howard Spoelstra <hsp.cat7@gmail.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/usb/host-libusb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index ad7ed8fb0c67..c474551d8456 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -907,7 +907,7 @@ static int usb_host_open(USBHostDevice *s, > libusb_device *dev, int hostfd) > goto fail; > } > } else { > -#if LIBUSB_API_VERSION >= 0x01000107 > +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) > trace_usb_host_open_hostfd(hostfd); > > rc = libusb_wrap_sys_device(ctx, hostfd, &s->dh); > @@ -1107,7 +1107,7 @@ static void usb_host_realize(USBDevice *udev, Error > **errp) > QTAILQ_INIT(&s->isorings); > s->hostfd = -1; > > -#if LIBUSB_API_VERSION >= 0x01000107 > +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) > if (s->hostdevice) { > int fd; > s->needs_autoscan = false; > -- > 2.18.4 > > Thanks for the quick fix, so: Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
On 6/24/20 3:45 PM, Gerd Hoffmann wrote: > Seems the new API is not available on windows. > Update #ifdefs accordingly. > > Fixes: 9f815e83e983 ("usb: add hostdevice property to usb-host") > Reported-by: Howard Spoelstra <hsp.cat7@gmail.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/usb/host-libusb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index ad7ed8fb0c67..c474551d8456 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -907,7 +907,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) > goto fail; > } > } else { > -#if LIBUSB_API_VERSION >= 0x01000107 > +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) > trace_usb_host_open_hostfd(hostfd); > > rc = libusb_wrap_sys_device(ctx, hostfd, &s->dh); > @@ -1107,7 +1107,7 @@ static void usb_host_realize(USBDevice *udev, Error **errp) > QTAILQ_INIT(&s->isorings); > s->hostfd = -1; > > -#if LIBUSB_API_VERSION >= 0x01000107 > +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) > if (s->hostdevice) { > int fd; > s->needs_autoscan = false; > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index ad7ed8fb0c67..c474551d8456 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -907,7 +907,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) goto fail; } } else { -#if LIBUSB_API_VERSION >= 0x01000107 +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) trace_usb_host_open_hostfd(hostfd); rc = libusb_wrap_sys_device(ctx, hostfd, &s->dh); @@ -1107,7 +1107,7 @@ static void usb_host_realize(USBDevice *udev, Error **errp) QTAILQ_INIT(&s->isorings); s->hostfd = -1; -#if LIBUSB_API_VERSION >= 0x01000107 +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) if (s->hostdevice) { int fd; s->needs_autoscan = false;
Seems the new API is not available on windows. Update #ifdefs accordingly. Fixes: 9f815e83e983 ("usb: add hostdevice property to usb-host") Reported-by: Howard Spoelstra <hsp.cat7@gmail.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/usb/host-libusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)