From: Gerd Hoffmann Date: Thu, 13 Oct 2011 10:52:47 +0000 (+0200) Subject: usb-hub: don't trigger assert on packet completion. X-Git-Tag: qemu-xen-4.3.0-rc1~2189^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=80cf7cf74f29a219e02b50f27c12b1c792ebf99b;p=qemu-upstream-4.5-testing.git usb-hub: don't trigger assert on packet completion. Calling usb_packet_complete() recursively when passing up the completion event up the chain for devices connected via usb hub will trigger an assert. So don't do that, make the usb hub emulation call the upstream completion callback directly instead. Based on a patch from Stefan Hajnoczi Signed-off-by: Gerd Hoffmann --- diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 39382c738..09c65160c 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -207,10 +207,14 @@ static void usb_hub_complete(USBPort *port, USBPacket *packet) /* * Just pass it along upstream for now. * - * If we ever inplement usb 2.0 split transactions this will + * If we ever implement usb 2.0 split transactions this will * become a little more complicated ... + * + * Can't use usb_packet_complete() here because packet->owner is + * cleared already, go call the ->complete() callback directly + * instead. */ - usb_packet_complete(&s->dev, packet); + s->dev.port->ops->complete(s->dev.port, packet); } static void usb_hub_handle_reset(USBDevice *dev)