From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 3 Sep 2012 10:48:49 +0000 (+0200)
Subject: usb-core: Allow the first packet of a pipelined ep to complete immediately
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c1f67654ab611553bbfca54a1e0922728c25760;p=qemu.git

usb-core: Allow the first packet of a pipelined ep to complete immediately

This can happen with usb-redir live-migration when the packet gets re-queued
after the migration and the original queuing from the migration source side
has already finished.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/core.c b/hw/usb/core.c
index fe431d02d9..b9f1f7a8be 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -398,7 +398,7 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
              * When pipelining is enabled usb-devices must always return async,
              * otherwise packets can complete out of order!
              */
-            assert(!p->ep->pipeline);
+            assert(!p->ep->pipeline || QTAILQ_EMPTY(&p->ep->queue));
             if (ret != USB_RET_NAK) {
                 p->result = ret;
                 usb_packet_set_state(p, USB_PACKET_COMPLETE);