Patchwork usb-redir: Never return USB_RET_NAK for async handled packets

login
register
mail settings
Submitter Hans de Goede
Date Aug. 17, 2012, 3:27 p.m.
Message ID <1345217228-9734-1-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/178246/
State New
Headers show

Comments

Hans de Goede - Aug. 17, 2012, 3:27 p.m.
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 <hdegoede@redhat.com>
---
 hw/usb/redirect.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Gerd Hoffmann - Aug. 21, 2012, 8:36 a.m.
On 08/17/12 17:27, Hans de Goede wrote:
> 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.

Patch added to usb patch queue (2+3 from v1 too).

thanks,
  Gerd

Patch

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: