提交 54cdfe51 编写于 作者: G Gerd Hoffmann

usb-host: workaround libusb bug

libusb seems to no allways call the completion callback for requests
canceled (which it is supposed to do according to the docs).  So add
a limit to avoid qemu waiting forever.
Tested-by: NBALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200529072225.3195-1-kraxel@redhat.com>
上级 9f815e83
......@@ -972,6 +972,7 @@ fail:
static void usb_host_abort_xfers(USBHostDevice *s)
{
USBHostRequest *r, *rtmp;
int limit = 100;
QTAILQ_FOREACH_SAFE(r, &s->requests, next, rtmp) {
usb_host_req_abort(r);
......@@ -982,6 +983,19 @@ static void usb_host_abort_xfers(USBHostDevice *s)
memset(&tv, 0, sizeof(tv));
tv.tv_usec = 2500;
libusb_handle_events_timeout(ctx, &tv);
if (--limit == 0) {
/*
* Don't wait forever for libusb calling the complete
* callback (which will unlink and free the request).
*
* Leaking memory here, to make sure libusb will not
* access memory which we have released already.
*/
QTAILQ_FOREACH_SAFE(r, &s->requests, next, rtmp) {
QTAILQ_REMOVE(&s->requests, r, next);
}
return;
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册