summaryrefslogtreecommitdiffstats
path: root/hw/usb/hcd-xhci.c
diff options
context:
space:
mode:
authorAnthony Liguori2013-05-07 13:48:31 +0200
committerAnthony Liguori2013-05-07 13:48:31 +0200
commitb174de51ae397549f58b1b76efa9026b213a1efd (patch)
tree626b663a4cdcdd361267d46148f44e2648daa752 /hw/usb/hcd-xhci.c
parentqga: set umask 0077 when daemonizing (CVE-2013-2007) (diff)
parentxhci: handle USB_RET_BABBLE (diff)
downloadqemu-b174de51ae397549f58b1b76efa9026b213a1efd.tar.gz
qemu-b174de51ae397549f58b1b76efa9026b213a1efd.tar.xz
qemu-b174de51ae397549f58b1b76efa9026b213a1efd.zip
Merge remote-tracking branch 'kraxel/usb.82' into staging
# By Gerd Hoffmann (3) and Hans de Goede (1) # Via Gerd Hoffmann * kraxel/usb.82: xhci: handle USB_RET_BABBLE uhci: Use an intermediate buffer for usb packet data usb-host: add usb_host_full_speed_compat usb-host: live migration support for the libusb version Message-id: 1367920207-1404-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/hcd-xhci.c')
-rw-r--r--hw/usb/hcd-xhci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 2c90e56c99..8813bdf904 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1716,6 +1716,11 @@ static int xhci_complete_packet(XHCITransfer *xfer)
xhci_xfer_report(xfer);
xhci_stall_ep(xfer);
break;
+ case USB_RET_BABBLE:
+ xfer->status = CC_BABBLE_DETECTED;
+ xhci_xfer_report(xfer);
+ xhci_stall_ep(xfer);
+ break;
default:
fprintf(stderr, "%s: FIXME: status = %d\n", __func__,
xfer->packet.status);