From 69cd7d87b208e842a7b283c90cc3113fac244e29 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 11 Jul 2014 14:20:40 +0200 Subject: [PATCH 07/43] xhci: add port to slot_address tracepoint Message-id: <1405088470-24115-8-git-send-email-kraxel@redhat.com> Patchwork-id: 59830 O-Subject: [RHEL-7.1 qemu-kvm PATCH 07/37] xhci: add port to slot_address tracepoint Bugzilla: 980833 RH-Acked-by: Dr. David Alan Gilbert (git) RH-Acked-by: Miroslav Rezanina RH-Acked-by: Laszlo Ersek Signed-off-by: Gerd Hoffmann (cherry picked from commit 65d81ed402d3b78b6ffbade36a09ea53e41614d2) --- hw/usb/hcd-xhci.c | 2 +- trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Miroslav Rezanina --- hw/usb/hcd-xhci.c | 2 +- trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index e8fa26c..61f5329 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2168,7 +2168,6 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid, int i; TRBCCode res; - trace_usb_xhci_slot_address(slotid); assert(slotid >= 1 && slotid <= xhci->numslots); dcbaap = xhci_addr64(xhci->dcbaap_low, xhci->dcbaap_high); @@ -2201,6 +2200,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid, fprintf(stderr, "xhci: port not found\n"); return CC_TRB_ERROR; } + trace_usb_xhci_slot_address(slotid, uport->path); dev = uport->dev; if (!dev) { diff --git a/trace-events b/trace-events index 4058dd5..117c2ce 100644 --- a/trace-events +++ b/trace-events @@ -368,7 +368,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" -- 1.8.3.1