[Qemu-devel] [PULL] usb: build fixes.

[Qemu-devel] [PULL] usb: build fixes.

[Gerd Hoffmann]

  Hi,

Two build issues slipped through with the last usb patch queue pull.
Looks like I should do test builds with a more recent gcc ...

Here are the fixes.

pleae pull,
  Gerd

The following changes since commit 85097db6956bc86e2377b63a8309cb8b24d54139:

  irq: Privatize CPU_INTERRUPT_NMI. (2011-05-08 16:55:24 +0000)

are available in the git repository at:
  git://git.kraxel.org/qemu usb.8.pull

Gerd Hoffmann (1):
      usb-musb: uninline functions

Stefan Weil (1):
      usb-linux: Add missing break statement

 hw/usb-musb.c |    8 ++++----
 usb-linux.c   |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

[Qemu-devel] [PATCH 1/2] usb-musb: uninline functions

[Gerd Hoffmann]

Prototype without "inline" keyword breaks the build with some gcc
versions.  Noticed by Alexander Graf.

Fix this by removing the inline keywork everywhere.  Some functions
can't be inlined anyway as the are referenced using function pointers.
Beside that gcc does a pretty good job on auto-inlining these days.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb-musb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/usb-musb.c b/hw/usb-musb.c
index b30caeb..38986d3 100644
--- a/hw/usb-musb.c
+++ b/hw/usb-musb.c
@@ -497,14 +497,14 @@ static void musb_detach(USBPort *port)
     musb_session_update(s, 1, s->session);
 }
 
-static inline void musb_cb_tick0(void *opaque)
+static void musb_cb_tick0(void *opaque)
 {
     MUSBEndPoint *ep = (MUSBEndPoint *) opaque;
 
     ep->delayed_cb[0](&ep->packey[0].p, opaque);
 }
 
-static inline void musb_cb_tick1(void *opaque)
+static void musb_cb_tick1(void *opaque)
 {
     MUSBEndPoint *ep = (MUSBEndPoint *) opaque;
 
@@ -513,7 +513,7 @@ static inline void musb_cb_tick1(void *opaque)
 
 #define musb_cb_tick	(dir ? musb_cb_tick1 : musb_cb_tick0)
 
-static inline void musb_schedule_cb(USBDevice *dev, USBPacket *packey)
+static void musb_schedule_cb(USBDevice *dev, USBPacket *packey)
 {
     MUSBPacket *p = container_of(packey, MUSBPacket, p);
     MUSBEndPoint *ep = p->ep;
@@ -572,7 +572,7 @@ static int musb_timeout(int ttype, int speed, int val)
     hw_error("bad interval\n");
 }
 
-static inline void musb_packet(MUSBState *s, MUSBEndPoint *ep,
+static void musb_packet(MUSBState *s, MUSBEndPoint *ep,
                 int epnum, int pid, int len, USBCallback cb, int dir)
 {
     int ret;
-- 
1.7.1

[Qemu-devel] [PATCH 2/2] usb-linux: Add missing break statement

[Gerd Hoffmann]

From: Stefan Weil <weil@mail.berlios.de>

cppcheck report:
usb-linux.c:661: warning: Redundant assignment of "len" in switch

Please check whether adding a break statement
is the correct solution for this warning.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 usb-linux.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/usb-linux.c b/usb-linux.c
index 36a01ea..0ef1d26 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -659,6 +659,7 @@ static int usb_host_handle_iso_data(USBHostDevice *s, USBPacket *p, int in)
                         switch(errno) {
                         case ETIMEDOUT:
                             len = USB_RET_NAK;
+                            break;
                         case EPIPE:
                         default:
                             len = USB_RET_STALL;
-- 
1.7.1

Re: [Qemu-devel] [PULL] usb: build fixes.

[Peter Maydell]

On 9 May 2011 14:11, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Here are the fixes.
>
> pleae pull,

> Stefan Weil (1):
>      usb-linux: Add missing break statement

The commit comment for this change looks like it still
includes the remark:

# Please check whether adding a break statement is the correct
# solution for this warning.

...I think that should be removed since we have actually
done the check during review, right?

thanks
-- PMM

Re: [Qemu-devel] [PULL] usb: build fixes.

[Gerd Hoffmann]

On 05/09/11 14:50, Peter Maydell wrote:
> On 9 May 2011 14:11, Gerd Hoffmann<kraxel@redhat.com>  wrote:
>> Here are the fixes.
>>
>> pleae pull,
>
>> Stefan Weil (1):
>>       usb-linux: Add missing break statement
>
> The commit comment for this change looks like it still
> includes the remark:
>
> # Please check whether adding a break statement is the correct
> # solution for this warning.

Zapped, pushed usb.9.pull branch with the rewritten comment.

cheers,
   Gerd

Re: [Qemu-devel] [PULL] usb: build fixes.

[Anthony Liguori]

On 05/09/2011 09:25 AM, Gerd Hoffmann wrote:
> On 05/09/11 14:50, Peter Maydell wrote:
>> On 9 May 2011 14:11, Gerd Hoffmann<kraxel@redhat.com> wrote:
>>> Here are the fixes.
>>>
>>> pleae pull,
>>
>>> Stefan Weil (1):
>>> usb-linux: Add missing break statement
>>
>> The commit comment for this change looks like it still
>> includes the remark:
>>
>> # Please check whether adding a break statement is the correct
>> # solution for this warning.
>
> Zapped, pushed usb.9.pull branch with the rewritten comment.\

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> cheers,
> Gerd
>
>