usb-host: windows support
cover usb-host: windows support
Gerd Hoffmann (2):
usb-host: wire up timer for windows
ci: add libusb for windows builds
hw/usb/host-libusb.c | 33 ++++++++++++++++++- .../dockerfiles/fedora-win32-cross.docker | 1 + .../dockerfiles/fedora-win64-cross.docker | 1 + 3 files changed, 34 insertions(+), 1 deletion(-)
Signature · 1 line
2.31.1
PATCH 1/2 usb-host: wire up timer for windows
On windows we can't wait on file descriptors.
Poll libusb using a timer instead.
Fixes long-standing FIXME.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/431
Signed-off-by Gerd Hoffmann <[email protected]>
--- hw/usb/host-libusb.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
hw/usb/host-libusb.c +32 -1
@@ -254,6 +254,29 @@ static void usb_host_del_fd(int fd, void *user_data) qemu_set_fd_handler(fd, NULL, NULL, NULL); } +#else + +static QEMUTimer *poll_timer; +static uint32_t request_count; + +static void usb_host_timer_kick (void ) +{ +int64_t delay_ns; + + delay_ns = request_count + ? (NANOSECONDS_PER_SECOND /100 )/* 10 ms interval with active req */ + : (NANOSECONDS_PER_SECOND );/* 1 sec interval otherwise */ +timer_mod (poll_timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + delay_ns); +} + +static void usb_host_timer (void *opaque) +{ +struct timeval tv = {0 ,0 }; + +libusb_handle_events_timeout (ctx, &tv); +usb_host_timer_kick (); +} +#endif /* !CONFIG_WIN32 */ static int usb_host_init (void )
@@ -276,7 +299,8 @@ static int usb_host_init(void)libusb_set_debug (ctx, loglevel);#endif #ifdef CONFIG_WIN32 -/* FIXME: add support for Windows. */ + poll_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , usb_host_timer,NULL ); +usb_host_timer_kick ();#else libusb_set_pollfd_notifiers(ctx, usb_host_add_fd, usb_host_del_fd,
@@ -364,11 +388,18 @@ static USBHostRequest *usb_host_req_alloc(USBHostDevice *s, USBPacket *p, r->buffer =g_malloc (bufsize); }QTAILQ_INSERT_TAIL (&s->requests, r, next); +#ifdef CONFIG_WIN32 + request_count++; +usb_host_timer_kick (); +#endif return r; }static void usb_host_req_free (USBHostRequest *r) { +#ifdef CONFIG_WIN32 + request_count--; +#endif QTAILQ_REMOVE (&r->host->requests, r, next);libusb_free_transfer (r->xfer);g_free (r->buffer);
Signature · 1 line
2.31.1
PATCH 2/2 ci: add libusb for windows builds
In reply to Gerd HoffmannAdd CI coverage for usb passthrough on windows.
Signed-off-by Gerd Hoffmann <[email protected]>
--- tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + 2 files changed, 2 insertions(+)
tests/docker/dockerfiles/fedora-win32-cross.docker +1 -0
@@ -23,6 +23,7 @@ ENV PACKAGES \ mingw32-libjpeg-turbo \ mingw32-libpng \ mingw32-libtasn1 \ + mingw32-libusbx \ mingw32-nettle \ mingw32-nsis \ mingw32-pixman \
tests/docker/dockerfiles/fedora-win64-cross.docker +1 -0
@@ -22,6 +22,7 @@ ENV PACKAGES \ mingw64-libjpeg-turbo \ mingw64-libpng \ mingw64-libtasn1 \ + mingw64-libusbx \ mingw64-pixman \ mingw64-pkg-config \ perl \
Signature · 1 line
2.31.1
Re: [PATCH 2/2] ci: add libusb for windows builds
Quoted 9 lines · Gerd Hoffmann
Add CI coverage for usb passthrough on windows.
Signed-off-by Gerd Hoffmann <[email protected]>--- tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + 2 files changed, 2 insertions(+)
Reviewed-by Willian Rampazzo <[email protected]>