* [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag.
@ 2013-05-12 23:19 Michael Marineau
2013-05-13 15:51 ` Gerd Hoffmann
0 siblings, 1 reply; 4+ messages in thread
From: Michael Marineau @ 2013-05-12 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Marineau
USB_DEV_FLAG_IS_HOST is the bit number, not value. Booting with a
"Fitbit Base Station" USB dongle was triggering this assert.
Signed-off-by: Michael Marineau <mike@marineau.org>
---
hw/usb/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 15a150a..05948ca 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -410,7 +410,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
assert(p->ep->type != USB_ENDPOINT_XFER_ISOC);
/* using async for interrupt packets breaks migration */
assert(p->ep->type != USB_ENDPOINT_XFER_INT ||
- (dev->flags & USB_DEV_FLAG_IS_HOST));
+ (dev->flags & (1 << USB_DEV_FLAG_IS_HOST)));
usb_packet_set_state(p, USB_PACKET_ASYNC);
QTAILQ_INSERT_TAIL(&p->ep->queue, p, queue);
} else if (p->status == USB_RET_ADD_TO_QUEUE) {
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag.
2013-05-12 23:19 [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag Michael Marineau
@ 2013-05-13 15:51 ` Gerd Hoffmann
2013-05-22 1:44 ` Michael Marineau
0 siblings, 1 reply; 4+ messages in thread
From: Gerd Hoffmann @ 2013-05-13 15:51 UTC (permalink / raw)
To: Michael Marineau; +Cc: Anthony Liguori, qemu-devel
On 05/13/13 01:19, Michael Marineau wrote:
> USB_DEV_FLAG_IS_HOST is the bit number, not value. Booting with a
> "Fitbit Base Station" USB dongle was triggering this assert.
>
> Signed-off-by: Michael Marineau <mike@marineau.org>
> ---
> hw/usb/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/usb/core.c b/hw/usb/core.c
> index 15a150a..05948ca 100644
> --- a/hw/usb/core.c
> +++ b/hw/usb/core.c
> @@ -410,7 +410,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
> assert(p->ep->type != USB_ENDPOINT_XFER_ISOC);
> /* using async for interrupt packets breaks migration */
> assert(p->ep->type != USB_ENDPOINT_XFER_INT ||
> - (dev->flags & USB_DEV_FLAG_IS_HOST));
> + (dev->flags & (1 << USB_DEV_FLAG_IS_HOST)));
> usb_packet_set_state(p, USB_PACKET_ASYNC);
> QTAILQ_INSERT_TAIL(&p->ep->queue, p, queue);
> } else if (p->status == USB_RET_ADD_TO_QUEUE) {
Looks good.
Anthony? Can you pick it for 1.5 directly? I don't have any other
pending usb bits for 1.5 at the moment.
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
cheers,
Gerd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag.
2013-05-13 15:51 ` Gerd Hoffmann
@ 2013-05-22 1:44 ` Michael Marineau
2013-05-28 10:48 ` Gerd Hoffmann
0 siblings, 1 reply; 4+ messages in thread
From: Michael Marineau @ 2013-05-22 1:44 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: Anthony Liguori, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]
On Mon, May 13, 2013 at 11:51 AM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On 05/13/13 01:19, Michael Marineau wrote:
> > USB_DEV_FLAG_IS_HOST is the bit number, not value. Booting with a
> > "Fitbit Base Station" USB dongle was triggering this assert.
> >
> > Signed-off-by: Michael Marineau <mike@marineau.org>
> > ---
> > hw/usb/core.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/hw/usb/core.c b/hw/usb/core.c
> > index 15a150a..05948ca 100644
> > --- a/hw/usb/core.c
> > +++ b/hw/usb/core.c
> > @@ -410,7 +410,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
> > assert(p->ep->type != USB_ENDPOINT_XFER_ISOC);
> > /* using async for interrupt packets breaks migration */
> > assert(p->ep->type != USB_ENDPOINT_XFER_INT ||
> > - (dev->flags & USB_DEV_FLAG_IS_HOST));
> > + (dev->flags & (1 << USB_DEV_FLAG_IS_HOST)));
> > usb_packet_set_state(p, USB_PACKET_ASYNC);
> > QTAILQ_INSERT_TAIL(&p->ep->queue, p, queue);
> > } else if (p->status == USB_RET_ADD_TO_QUEUE) {
>
> Looks good.
>
> Anthony? Can you pick it for 1.5 directly? I don't have any other
> pending usb bits for 1.5 at the moment.
>
> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
>
> cheers,
> Gerd
>
Ping, looks like this hasn't managed to land in master yet and just wanted
to make sure it doesn't get forgotten. I probably should have noted in the
original email that this bug was introduced
in be41efde3ca0372dbf7543e09ff473b4eec25057 and impacts both 1.4 and 1.5.
--
Michael Marineau
[-- Attachment #2: Type: text/html, Size: 2439 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag.
2013-05-22 1:44 ` Michael Marineau
@ 2013-05-28 10:48 ` Gerd Hoffmann
0 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2013-05-28 10:48 UTC (permalink / raw)
To: Michael Marineau; +Cc: Anthony Liguori, qemu-devel
Hi,
>> Looks good.
>>
>> Anthony? Can you pick it for 1.5 directly? I don't have any other
>> pending usb bits for 1.5 at the moment.
>>
>> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
>>
>> cheers,
>> Gerd
>>
>
> Ping, looks like this hasn't managed to land in master yet and just wanted
> to make sure it doesn't get forgotten. I probably should have noted in the
> original email that this bug was introduced
> in be41efde3ca0372dbf7543e09ff473b4eec25057 and impacts both 1.4 and 1.5.
Damn, missed 1.5. Added to usb patch queue now.
Will also queue up for stable (aka 1.5.1).
cheers,
Gerd
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-28 10:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-12 23:19 [Qemu-devel] [PATCH] Fix usage of USB_DEV_FLAG_IS_HOST flag Michael Marineau
2013-05-13 15:51 ` Gerd Hoffmann
2013-05-22 1:44 ` Michael Marineau
2013-05-28 10:48 ` Gerd Hoffmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.