[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] usb-host: wire up timer for windows
From: |
Gerd Hoffmann |
Subject: |
[PULL 1/7] usb-host: wire up timer for windows |
Date: |
Thu, 29 Jul 2021 14:50:38 +0200 |
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 <kraxel@redhat.com>
Message-Id: <20210623085249.1151901-2-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/host-libusb.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c0f314462aaf..00f6fbb29b39 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -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);
--
2.31.1
- [PULL 0/7] Usb 20210729 patches, Gerd Hoffmann, 2021/07/29
- [PULL 1/7] usb-host: wire up timer for windows,
Gerd Hoffmann <=
- [PULL 4/7] docs: Incorporate information in usb-storage.txt into rST manual, Gerd Hoffmann, 2021/07/29
- [PULL 2/7] ci: add libusb for windows builds, Gerd Hoffmann, 2021/07/29
- [PULL 3/7] usbredir: fix free call, Gerd Hoffmann, 2021/07/29
- [PULL 5/7] docs: Fold usb2.txt USB controller information into usb.rst, Gerd Hoffmann, 2021/07/29
- [PULL 6/7] docs: Fold usb2.txt physical port addressing info into usb.rst, Gerd Hoffmann, 2021/07/29
- [PULL 7/7] docs: Fold usb2.txt passthrough information into usb.rst, Gerd Hoffmann, 2021/07/29
- Re: [PULL 0/7] Usb 20210729 patches, Peter Maydell, 2021/07/30