diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:30 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:30 -0500 |
| commit | 9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73 (patch) | |
| tree | 1d985efb12e0e411e8a4cf5c842967897600b8f6 /trace-events | |
| parent | 9889e04ac193cad7fa0526573ce0cc752dcabb99 (diff) | |
| parent | 31efd2e883018b4c079ad082105bc161fbb3fef8 (diff) | |
| download | qemu-9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73.tar.gz | |
Merge remote-tracking branch 'kraxel/usb.88' into staging
# By Gerd Hoffmann (10) and Marcel Apfelbaum (1)
# Via Gerd Hoffmann
* kraxel/usb.88:
usb/dev-hid: Modified usb-tablet category from Misc to Input
Revert "usb-hub: report status changes only once"
usb-hub: add tracepoint for status reports
usb: parallelize usb3 streams
uas: add property for request logging
xhci: reset port when disabling slot
xhci: emulate intr endpoint intervals correctly
xhci: fix endpoint interval calculation
xhci: add port to slot_address tracepoint
xhci: add tracepoint for endpoint state changes
xhci: remove leftover debug printf
Message-id: 1378117055-29620-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/trace-events b/trace-events index 3e988669a3..8285c5a192 100644 --- a/trace-events +++ b/trace-events @@ -371,7 +371,7 @@ usb_xhci_port_link(uint32_t port, uint32_t pls) "port %d, pls %d" usb_xhci_port_notify(uint32_t port, uint32_t pls) "port %d, bits %x" usb_xhci_slot_enable(uint32_t slotid) "slotid %d" usb_xhci_slot_disable(uint32_t slotid) "slotid %d" -usb_xhci_slot_address(uint32_t slotid) "slotid %d" +usb_xhci_slot_address(uint32_t slotid, const char *port) "slotid %d, port %s" usb_xhci_slot_configure(uint32_t slotid) "slotid %d" usb_xhci_slot_evaluate(uint32_t slotid) "slotid %d" usb_xhci_slot_reset(uint32_t slotid) "slotid %d" @@ -381,6 +381,7 @@ usb_xhci_ep_set_dequeue(uint32_t slotid, uint32_t epid, uint32_t streamid, uint6 usb_xhci_ep_kick(uint32_t slotid, uint32_t epid, uint32_t streamid) "slotid %d, epid %d, streamid %d" usb_xhci_ep_stop(uint32_t slotid, uint32_t epid) "slotid %d, epid %d" usb_xhci_ep_reset(uint32_t slotid, uint32_t epid) "slotid %d, epid %d" +usb_xhci_ep_state(uint32_t slotid, uint32_t epid, const char *os, const char *ns) "slotid %d, epid %d, %s -> %s" usb_xhci_xfer_start(void *xfer, uint32_t slotid, uint32_t epid, uint32_t streamid) "%p: slotid %d, epid %d, streamid %d" usb_xhci_xfer_async(void *xfer) "%p" usb_xhci_xfer_nak(void *xfer) "%p" @@ -410,6 +411,7 @@ usb_hub_set_port_feature(int addr, int nr, const char *f) "dev %d, port %d, feat usb_hub_clear_port_feature(int addr, int nr, const char *f) "dev %d, port %d, feature %s" usb_hub_attach(int addr, int nr) "dev %d, port %d" usb_hub_detach(int addr, int nr) "dev %d, port %d" +usb_hub_status_report(int addr, int status) "dev %d, status 0x%x" # hw/usb/dev-uas.c usb_uas_reset(int addr) "dev %d" |