david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb-redir: Never return USB_RET_NAK for async handled packets

Browse Source 
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>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-08-17 17:27:08 +02:00 committed by Gerd Hoffmann
parent cf1f81691d
commit 181133404f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/redirect.c
View File

@ -1028,11 +1028,14 @@ static int usbredir_handle_status(USBRedirDevice *dev,
case usb_redir_stall: case usb_redir_stall:
return USB_RET_STALL; return USB_RET_STALL;
case usb_redir_cancelled: 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: case usb_redir_inval:
WARNING("got invalid param error from usb-host?\n"); WARNING("got invalid param error from usb-host?\n");
return USB_RET_NAK; return USB_RET_IOERROR;
case usb_redir_babble: case usb_redir_babble:
return USB_RET_BABBLE; return USB_RET_BABBLE;
case usb_redir_ioerror: case usb_redir_ioerror: