diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-09 09:51:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-09 09:51:33 -0500 |
| commit | fe0cb8ef84f8bc00ab00f71748aa0e84be7f2bbe (patch) | |
| tree | dfbf34000cae4a4296e49c1aa76566a6b94f8cbc /hw/usb/redirect.c | |
| parent | ffd6e7a0725bf7f5dab894a1a8cbe6d99baab604 (diff) | |
| parent | c32da15188e12af1299f057fc0fb31e8018674b0 (diff) | |
| download | focaccia-qemu-fe0cb8ef84f8bc00ab00f71748aa0e84be7f2bbe.tar.gz focaccia-qemu-fe0cb8ef84f8bc00ab00f71748aa0e84be7f2bbe.zip | |
Merge remote-tracking branch 'kraxel/usb.55' into staging
* kraxel/usb.55: usb-host: add trace events for iso xfers usb: fix interface initialization usb: split endpoint init and reset usb-redir: Correctly handle the usb_redir_babble usbredir status ehci: Kick async schedule on wakeup in the non companion case usb-ehci: Fix an assert whenever isoc transfers are used ehci: don't flush cache on doorbell rings. ehci: fix td writeback ehci: fix ehci_qh_do_overlay
Diffstat (limited to 'hw/usb/redirect.c')
| -rw-r--r-- | hw/usb/redirect.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index d949f040d5..10b4fbb3a7 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1033,6 +1033,8 @@ static int usbredir_handle_status(USBRedirDevice *dev, case usb_redir_inval: WARNING("got invalid param error from usb-host?\n"); return USB_RET_NAK; + case usb_redir_babble: + return USB_RET_BABBLE; case usb_redir_ioerror: case usb_redir_timeout: default: |