From: Anthony Liguori Date: Mon, 29 Oct 2012 15:34:29 +0000 (-0500) Subject: Merge remote-tracking branch 'kraxel/usb.68' into staging X-Git-Tag: v1.3.0-rc0~142 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=6b0e6468e33883c1739a7474fe6baca170eec9aa Merge remote-tracking branch 'kraxel/usb.68' into staging * kraxel/usb.68: (36 commits) xhci: fix usb name in caps xhci: make number of interrupters and slots configurable xhci: allow disabling interrupters xhci: flush endpoint context unconditinally xhci: fix function name in error message uhci: Use only one queue for ctrl endpoints uhci: Retry to fill the queue while waiting for td completion uhci: Always mark a queue valid when we encounter it uhci: When the guest marks a pending td non-active, cancel the queue uhci: Detect guest td re-use uhci: Verify queue has not been changed by guest uhci: Immediately free queues on device disconnect uhci: Store ep in UHCIQueue uhci: Make uhci_fill_queue() actually operate on an UHCIQueue uhci: Add uhci_read_td() helper function uhci: Rename UHCIAsync->td to UHCIAsync->td_addr uhci: Move emptying of the queue's asyncs' queue to uhci_queue_free uhci: Drop unnecessary forward declaration of some static functions uhci: Don't retry on error uhci: cleanup: Add an unlink call to uhci_async_cancel() ... Signed-off-by: Anthony Liguori --- 6b0e6468e33883c1739a7474fe6baca170eec9aa