[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] usb: improve packet state sanity checks
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 05/14] usb: improve packet state sanity checks |
Date: |
Tue, 13 Mar 2012 13:20:02 +0100 |
Add a new function to check whenever the packet state is as expected,
log more informations in case it isn't.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb.h | 1 +
hw/usb/core.c | 37 +++++++++++++++++++++++++++++++------
trace-events | 1 +
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/hw/usb.h b/hw/usb.h
index d60d03d..e95085f 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -336,6 +336,7 @@ struct USBPacket {
void usb_packet_init(USBPacket *p);
void usb_packet_set_state(USBPacket *p, USBPacketState state);
+void usb_packet_check_state(USBPacket *p, USBPacketState expected);
void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep);
void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len);
int usb_packet_map(USBPacket *p, QEMUSGList *sgl);
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 494989a..a4048fe 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -378,7 +378,7 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
}
assert(dev == p->ep->dev);
assert(dev->state == USB_STATE_DEFAULT);
- assert(p->state == USB_PACKET_SETUP);
+ usb_packet_check_state(p, USB_PACKET_SETUP);
assert(p->ep != NULL);
if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) {
@@ -406,7 +406,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
USBEndpoint *ep = p->ep;
int ret;
- assert(p->state == USB_PACKET_ASYNC);
+ usb_packet_check_state(p, USB_PACKET_ASYNC);
assert(QTAILQ_FIRST(&ep->queue) == p);
usb_packet_set_state(p, USB_PACKET_COMPLETE);
QTAILQ_REMOVE(&ep->queue, p, queue);
@@ -417,7 +417,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
if (p->state == USB_PACKET_ASYNC) {
break;
}
- assert(p->state == USB_PACKET_QUEUED);
+ usb_packet_check_state(p, USB_PACKET_QUEUED);
ret = usb_process_one(p);
if (ret == USB_RET_ASYNC) {
usb_packet_set_state(p, USB_PACKET_ASYNC);
@@ -450,7 +450,7 @@ void usb_packet_init(USBPacket *p)
qemu_iovec_init(&p->iov, 1);
}
-void usb_packet_set_state(USBPacket *p, USBPacketState state)
+static const char *usb_packet_state_name(USBPacketState state)
{
static const char *name[] = {
[USB_PACKET_UNDEFINED] = "undef",
@@ -460,11 +460,36 @@ void usb_packet_set_state(USBPacket *p, USBPacketState
state)
[USB_PACKET_COMPLETE] = "complete",
[USB_PACKET_CANCELED] = "canceled",
};
+ if (state < ARRAY_SIZE(name)) {
+ return name[state];
+ }
+ return "INVALID";
+}
+
+void usb_packet_check_state(USBPacket *p, USBPacketState expected)
+{
+ USBDevice *dev;
+ USBBus *bus;
+
+ if (p->state == expected) {
+ return;
+ }
+ dev = p->ep->dev;
+ bus = usb_bus_from_device(dev);
+ trace_usb_packet_state_fault(bus->busnr, dev->port->path, p->ep->nr, p,
+ usb_packet_state_name(p->state),
+ usb_packet_state_name(expected));
+ assert(!"usb packet state check failed");
+}
+
+void usb_packet_set_state(USBPacket *p, USBPacketState state)
+{
USBDevice *dev = p->ep->dev;
USBBus *bus = usb_bus_from_device(dev);
- trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr,
- p, name[p->state], name[state]);
+ trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p,
+ usb_packet_state_name(p->state),
+ usb_packet_state_name(state));
p->state = state;
}
diff --git a/trace-events b/trace-events
index bcfe13a..301374e 100644
--- a/trace-events
+++ b/trace-events
@@ -229,6 +229,7 @@ sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64
# hw/usb/core.c
usb_packet_state_change(int bus, const char *port, int ep, void *p, const char
*o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s -> %s"
+usb_packet_state_fault(int bus, const char *port, int ep, void *p, const char
*o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s, expected %s"
# hw/usb/bus.c
usb_port_claim(int bus, const char *port) "bus %d, port %s"
--
1.7.1
- [Qemu-devel] [PATCH 14/14] Endian fix an assertion in usb-msd, (continued)
- [Qemu-devel] [PATCH 14/14] Endian fix an assertion in usb-msd, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 02/14] usb: zap hw/ush-{ohic, uhci}.h + init wrappers, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 01/14] usb: the big rename, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 04/14] usb-ohci: DMA writeback bug fixes, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 07/14] uhci: fix uhci_async_cancel_all, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 13/14] uhci: alloc can't fail, drop check., Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 09/14] uhci: tracing support, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 06/14] uhci: pass addr to uhci_async_alloc, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 08/14] uhci: cancel on schedule stop., Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 05/14] usb: improve packet state sanity checks,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 12/14] uhci: new uhci_handle_td return code for tds still in flight, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 10/14] uhci: use enum for uhci_handle_td return codes, Gerd Hoffmann, 2012/03/13
- Re: [Qemu-devel] [PULL 00/14] usb patch queue, Anthony Liguori, 2012/03/13