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 <aliguori@us.ibm.com>

diff --combined trace-events
index 09b5d55,ed136a5..7ee21e5
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -77,18 -77,10 +77,18 @@@ stream_start(void *bs, void *base, voi
  commit_one_iteration(void *s, int64_t sector_num, int nb_sectors, int is_allocated) "s %p sector_num %"PRId64" nb_sectors %d is_allocated %d"
  commit_start(void *bs, void *base, void *top, void *s, void *co, void *opaque) "bs %p base %p top %p s %p co %p opaque %p"
  
 +# block/mirror.c
 +mirror_start(void *bs, void *s, void *co, void *opaque) "bs %p s %p co %p opaque %p"
 +mirror_before_flush(void *s) "s %p"
 +mirror_before_drain(void *s, int64_t cnt) "s %p dirty count %"PRId64
 +mirror_before_sleep(void *s, int64_t cnt, int synced) "s %p dirty count %"PRId64" synced %d"
 +mirror_one_iteration(void *s, int64_t sector_num, int nb_sectors) "s %p sector_num %"PRId64" nb_sectors %d"
 +
  # blockdev.c
  qmp_block_job_cancel(void *job) "job %p"
  qmp_block_job_pause(void *job) "job %p"
  qmp_block_job_resume(void *job) "job %p"
 +qmp_block_job_complete(void *job) "job %p"
  block_job_cb(void *bs, void *job, int ret) "bs %p job %p ret %d"
  qmp_block_stream(void *bs, void *job) "bs %p job %p"
  
@@@ -295,7 -287,7 +295,7 @@@ usb_uhci_mmio_writew(uint32_t addr, uin
  usb_uhci_mmio_readl(uint32_t addr, uint32_t val) "addr 0x%04x, ret 0x%08x"
  usb_uhci_mmio_writel(uint32_t addr, uint32_t val) "addr 0x%04x, val 0x%08x"
  usb_uhci_queue_add(uint32_t token) "token 0x%x"
- usb_uhci_queue_del(uint32_t token) "token 0x%x"
+ usb_uhci_queue_del(uint32_t token, const char *reason) "token 0x%x: %s"
  usb_uhci_packet_add(uint32_t token, uint32_t addr) "token 0x%x, td 0x%x"
  usb_uhci_packet_link_async(uint32_t token, uint32_t addr) "token 0x%x, td 0x%x"
  usb_uhci_packet_unlink_async(uint32_t token, uint32_t addr) "token 0x%x, td 0x%x"