USB: 2 bug-fixes, for master *and* for stable-1.1

USB: 2 bug-fixes, for master *and* for stable-1.1

[Hans de Goede]

Here are USB 2 bug-fixes, please also cherry-pick these into the
stable-1.1 branch, esp. the second one as that fixes an easily triggerable
assert.

Note these patches are against 1.1.0, not against master, but they are relevant
for, and should apply to, master too.

Regards,

Hans

[Qemu-devel] USB: 2 bug-fixes, for master *and* for stable-1.1

[Hans de Goede]

Here are USB 2 bug-fixes, please also cherry-pick these into the
stable-1.1 branch, esp. the second one as that fixes an easily triggerable
assert.

Note these patches are against 1.1.0, not against master, but they are relevant
for, and should apply to, master too.

Regards,

Hans

[PATCH 1/2] usb-redir: Correctly handle the usb_redir_babble usbredir status

[Hans de Goede]

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/redirect.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 5f55d78..c6358c0 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1058,6 +1058,8 @@ static int usbredir_handle_status(USBRedirDevice *dev,
     case usb_redir_inval:
         WARNING("got invalid param error from usb-host?\n");
         return USB_RET_NAK;
+    case usb_redir_babble:
+        return USB_RET_BABBLE;
     case usb_redir_ioerror:
     case usb_redir_timeout:
     default:
-- 
1.7.10.4

[Qemu-devel] [PATCH 1/2] usb-redir: Correctly handle the usb_redir_babble usbredir status

[Hans de Goede]

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/redirect.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 5f55d78..c6358c0 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1058,6 +1058,8 @@ static int usbredir_handle_status(USBRedirDevice *dev,
     case usb_redir_inval:
         WARNING("got invalid param error from usb-host?\n");
         return USB_RET_NAK;
+    case usb_redir_babble:
+        return USB_RET_BABBLE;
     case usb_redir_ioerror:
     case usb_redir_timeout:
     default:
-- 
1.7.10.4

[PATCH 2/2] usb-ehci: Fix an assert whenever isoc transfers are used

[Hans de Goede]

hcd-ehci.c is missing an usb_packet_init() call for the ipacket UsbPacket
it uses for isoc transfers, triggering an assert (taking the entire vm down)
in usb_packet_setup as soon as any isoc transfers are done by a high speed
USB device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/hcd-ehci.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index e759c99..eaa3ddd 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -2300,6 +2300,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
     s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s);
     QTAILQ_INIT(&s->aqueues);
     QTAILQ_INIT(&s->pqueues);
+    usb_packet_init(&s->ipacket);
 
     qemu_register_reset(ehci_reset, s);
 
-- 
1.7.10.4

[Qemu-devel] [PATCH 2/2] usb-ehci: Fix an assert whenever isoc transfers are used

[Hans de Goede]

hcd-ehci.c is missing an usb_packet_init() call for the ipacket UsbPacket
it uses for isoc transfers, triggering an assert (taking the entire vm down)
in usb_packet_setup as soon as any isoc transfers are done by a high speed
USB device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/hcd-ehci.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index e759c99..eaa3ddd 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -2300,6 +2300,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
     s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s);
     QTAILQ_INIT(&s->aqueues);
     QTAILQ_INIT(&s->pqueues);
+    usb_packet_init(&s->ipacket);
 
     qemu_register_reset(ehci_reset, s);
 
-- 
1.7.10.4

Re: USB: 2 bug-fixes, for master *and* for stable-1.1

[Gerd Hoffmann]

On 07/06/12 12:09, Hans de Goede wrote:
> Here are USB 2 bug-fixes, please also cherry-pick these into the
> stable-1.1 branch, esp. the second one as that fixes an easily triggerable
> assert.
> 
> Note these patches are against 1.1.0, not against master, but they are relevant
> for, and should apply to, master too.

Looks good, queued up for master.

cheers,
  Gerd

Re: [Qemu-devel] USB: 2 bug-fixes, for master *and* for stable-1.1

[Gerd Hoffmann]

On 07/06/12 12:09, Hans de Goede wrote:
> Here are USB 2 bug-fixes, please also cherry-pick these into the
> stable-1.1 branch, esp. the second one as that fixes an easily triggerable
> assert.
> 
> Note these patches are against 1.1.0, not against master, but they are relevant
> for, and should apply to, master too.

Looks good, queued up for master.

cheers,
  Gerd