[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] usb-redir: Never return USB_RET_NAK for async handl
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH] usb-redir: Never return USB_RET_NAK for async handled packets |
Date: |
Fri, 17 Aug 2012 17:27:08 +0200 |
USB_RET_NAK is not a valid response for async handled packets (and will
trigger an assert as such).
Also drop the warning when receiving a status of cancelled for packets not
cancelled by qemu itself, this can happen when a device gets unredirected
by the usbredir-host while transfers are pending.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/redirect.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 1460515..9ba964e 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1055,11 +1055,14 @@ static int usbredir_handle_status(USBRedirDevice *dev,
case usb_redir_stall:
return USB_RET_STALL;
case usb_redir_cancelled:
- WARNING("returning cancelled packet to HC?\n");
- return USB_RET_NAK;
+ /*
+ * When the usbredir-host unredirects a device, it will report a status
+ * of cancelled for all pending packets, followed by a disconnect msg.
+ */
+ return USB_RET_IOERROR;
case usb_redir_inval:
WARNING("got invalid param error from usb-host?\n");
- return USB_RET_NAK;
+ return USB_RET_IOERROR;
case usb_redir_babble:
return USB_RET_BABBLE;
case usb_redir_ioerror:
--
1.7.11.4
- [Qemu-devel] [PATCH] usb-redir: Never return USB_RET_NAK for async handled packets,
Hans de Goede <=