[Qemu-devel] [5933] Fix some new warnings introduced after r5022

[Qemu-devel] [5933] Fix some new warnings introduced after r5022

[Blue Swirl]

Revision: 5933
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5933
Author:   blueswir1
Date:     2008-12-07 19:30:18 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Fix some new warnings introduced after r5022

Modified Paths:
--------------
    trunk/gdbstub.c
    trunk/hw/virtio.c
    trunk/net.c
    trunk/vl.c

Modified: trunk/gdbstub.c
===================================================================
--- trunk/gdbstub.c	2008-12-07 19:20:43 UTC (rev 5932)
+++ trunk/gdbstub.c	2008-12-07 19:30:18 UTC (rev 5933)
@@ -1602,8 +1602,6 @@
     return RS_IDLE;
 }
 
-extern void tb_flush(CPUState *env);
-
 void gdb_set_stop_cpu(CPUState *env)
 {
     gdbserver_state->c_cpu = env;

Modified: trunk/hw/virtio.c
===================================================================
--- trunk/hw/virtio.c	2008-12-07 19:20:43 UTC (rev 5932)
+++ trunk/hw/virtio.c	2008-12-07 19:30:18 UTC (rev 5933)
@@ -485,7 +485,7 @@
     qemu_set_irq(vdev->pci_dev.irq[0], vdev->isr & 1);
 }
 
-void virtio_reset(void *opaque)
+static void virtio_reset(void *opaque)
 {
     VirtIODevice *vdev = opaque;
     int i;

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2008-12-07 19:20:43 UTC (rev 5932)
+++ trunk/net.c	2008-12-07 19:30:18 UTC (rev 5933)
@@ -284,8 +284,8 @@
     return 0;
 }
 
-#ifndef _WIN32
-int parse_unix_path(struct sockaddr_un *uaddr, const char *str)
+#if !defined(_WIN32) && 0
+static int parse_unix_path(struct sockaddr_un *uaddr, const char *str)
 {
     const char *p;
     int len;

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-12-07 19:20:43 UTC (rev 5932)
+++ trunk/vl.c	2008-12-07 19:30:18 UTC (rev 5933)
@@ -3526,7 +3526,7 @@
 }
 
 #ifdef _WIN32
-void host_main_loop_wait(int *timeout)
+static void host_main_loop_wait(int *timeout)
 {
     int ret, ret2, i;
     PollingEntry *pe;
@@ -3570,7 +3570,7 @@
     *timeout = 0;
 }
 #else
-void host_main_loop_wait(int *timeout)
+static void host_main_loop_wait(int *timeout)
 {
 }
 #endif

Re: [Qemu-devel] [5933] Fix some new warnings introduced after r5022

[Andreas Färber]

Am 07.12.2008 um 20:30 schrieb Blue Swirl:

> Revision: 5933
>          http://svn.sv.gnu.org/viewvc/? 
> view=rev&root=qemu&revision=5933
> Author:   blueswir1
> Date:     2008-12-07 19:30:18 +0000 (Sun, 07 Dec 2008)
>
> Log Message:
> -----------
> Fix some new warnings introduced after r5022

Starting this evening I get a lot of these on OSX:

../qemu-common.h:107: warning: redundant redeclaration of ‘fls’
/usr/include/string.h:123: warning: previous declaration of ‘fls’ was  
here

Andreas

Re: [Qemu-devel] [5933] Fix some new warnings introduced after r5022

[Blue Swirl]

On 12/7/08, Andreas Färber <andreas.faerber@web.de> wrote:
>
>  Am 07.12.2008 um 20:30 schrieb Blue Swirl:
>
>
> > Revision: 5933
> >
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5933
> > Author:   blueswir1
> > Date:     2008-12-07 19:30:18 +0000 (Sun, 07 Dec 2008)
> >
> > Log Message:
> > -----------
> > Fix some new warnings introduced after r5022
> >
>
>  Starting this evening I get a lot of these on OSX:
>
>  ../qemu-common.h:107: warning: redundant redeclaration of 'fls'
>  /usr/include/string.h:123: warning: previous declaration of 'fls' was here

The function should probably be renamed to qemu_fls.