f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From bd1c78528cbd45629fe31127f5bde708263d6e17 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Fri, 31 Aug 2012 12:41:43 +0200
|
|
Subject: [PATCH] ehci: add doorbell trace events
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 1defcbd1e81d67476b6e4e486bcd4d869162900d)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/usb/hcd-ehci.c | 3 ++-
|
|
trace-events | 2 ++
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
|
index 4564615..398f5e0 100644
|
|
--- a/hw/usb/hcd-ehci.c
|
|
+++ b/hw/usb/hcd-ehci.c
|
|
@@ -1241,6 +1241,7 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val)
|
|
*/
|
|
s->async_stepdown = 0;
|
|
qemu_bh_schedule(s->async_bh);
|
|
+ trace_usb_ehci_doorbell_ring();
|
|
}
|
|
|
|
if (((USBCMD_RUNSTOP | USBCMD_PSE | USBCMD_ASE) & val) !=
|
|
@@ -2335,7 +2336,7 @@ static void ehci_advance_async_state(EHCIState *ehci)
|
|
if (ehci->usbcmd & USBCMD_IAAD) {
|
|
/* Remove all unseen qhs from the async qhs queue */
|
|
ehci_queues_rip_unused(ehci, async, 1);
|
|
- DPRINTF("ASYNC: doorbell request acknowledged\n");
|
|
+ trace_usb_ehci_doorbell_ack();
|
|
ehci->usbcmd &= ~USBCMD_IAAD;
|
|
ehci_raise_irq(ehci, USBSTS_IAA);
|
|
}
|
|
diff --git a/trace-events b/trace-events
|
|
index 5112a47..10bc04e 100644
|
|
--- a/trace-events
|
|
+++ b/trace-events
|
|
@@ -264,6 +264,8 @@ usb_ehci_queue_action(void *q, const char *action) "q %p: %s"
|
|
usb_ehci_packet_action(void *q, void *p, const char *action) "q %p p %p: %s"
|
|
usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask) "level %d, frindex 0x%04x, sts 0x%x, mask 0x%x"
|
|
usb_ehci_guest_bug(const char *reason) "%s"
|
|
+usb_ehci_doorbell_ring(void) ""
|
|
+usb_ehci_doorbell_ack(void) ""
|
|
|
|
# hw/usb/hcd-uhci.c
|
|
usb_uhci_reset(void) "=== RESET ==="
|
|
--
|
|
1.8.0.2
|
|
|