From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNKud-0007sJ-Hp for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNKuY-0003aT-KJ for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNKuY-0003Zt-Co for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:10 -0400 From: Gerd Hoffmann Date: Fri, 29 Aug 2014 14:03:49 +0200 Message-Id: <1409313832-2514-15-git-send-email-kraxel@redhat.com> In-Reply-To: <1409313832-2514-1-git-send-email-kraxel@redhat.com> References: <1409313832-2514-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 14/17] usb: add usb host adapters exit trace List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei Signed-off-by: Gonglei Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 2 ++ hw/usb/hcd-uhci.c | 2 ++ hw/usb/hcd-xhci.c | 2 ++ trace-events | 3 +++ 4 files changed, 9 insertions(+) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 2aa06bb..bacb7ce 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2473,6 +2473,8 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp) { + trace_usb_ehci_unrealize(); + if (s->frame_timer) { timer_del(s->frame_timer); timer_free(s->frame_timer); diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 220115b..3b3ebcd 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1260,6 +1260,8 @@ static void usb_uhci_exit(PCIDevice *dev) { UHCIState *s = DO_UPCAST(UHCIState, dev, dev); + trace_usb_uhci_exit(); + if (s->frame_timer) { timer_del(s->frame_timer); timer_free(s->frame_timer); diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index a9245d8..bbe4c5f 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3649,6 +3649,8 @@ static void usb_xhci_exit(PCIDevice *dev) int i; XHCIState *xhci = XHCI(dev); + trace_usb_xhci_exit(); + for (i = 0; i < xhci->numslots; i++) { xhci_disable_slot(xhci, i + 1); } diff --git a/trace-events b/trace-events index 81bc915..03ac5d2 100644 --- a/trace-events +++ b/trace-events @@ -297,6 +297,7 @@ usb_port_release(int bus, const char *port) "bus %d, port %s" # hw/usb/hcd-ehci.c usb_ehci_reset(void) "=== RESET ===" +usb_ehci_unrealize(void) "=== UNREALIZE ===" usb_ehci_opreg_read(uint32_t addr, const char *str, uint32_t val) "rd mmio %04x [%s] = %x" usb_ehci_opreg_write(uint32_t addr, const char *str, uint32_t val) "wr mmio %04x [%s] = %x" usb_ehci_opreg_change(uint32_t addr, const char *str, uint32_t new, uint32_t old) "ch mmio %04x [%s] = %x (old: %x)" @@ -329,6 +330,7 @@ usb_ehci_dma_error(void) "" # hw/usb/hcd-uhci.c usb_uhci_reset(void) "=== RESET ===" +usb_uhci_exit(void) "=== EXIT ===" usb_uhci_schedule_start(void) "" usb_uhci_schedule_stop(void) "" usb_uhci_frame_start(uint32_t num) "nr %d" @@ -358,6 +360,7 @@ usb_uhci_td_complete(uint32_t qh, uint32_t td) "qh 0x%x, td 0x%x" # hw/usb/hcd-xhci.c usb_xhci_reset(void) "=== RESET ===" +usb_xhci_exit(void) "=== EXIT ===" usb_xhci_run(void) "" usb_xhci_stop(void) "" usb_xhci_cap_read(uint32_t off, uint32_t val) "off 0x%04x, ret 0x%08x" -- 1.8.3.1