[Qemu-devel] [7016] Fix a few Sparse warnings

[Blue Swirl]

Revision: 7016
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7016
Author:   blueswir1
Date:     2009-04-07 17:57:09 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Fix a few Sparse warnings

Modified Paths:
--------------
    trunk/block-raw-posix.c
    trunk/cmd.c
    trunk/cmd.h
    trunk/dma-helpers.c

Modified: trunk/block-raw-posix.c
===================================================================
--- trunk/block-raw-posix.c     2009-04-07 02:19:41 UTC (rev 7015)
+++ trunk/block-raw-posix.c     2009-04-07 17:57:09 UTC (rev 7016)
@@ -876,15 +876,15 @@
 }
 
 BlockDriver bdrv_raw = {
-    "raw",
-    sizeof(BDRVRawState),
-    NULL, /* no probe for protocols */
-    raw_open,
-    NULL,
-    NULL,
-    raw_close,
-    raw_create,
-    raw_flush,
+    .format_name = "raw",
+    .instance_size = sizeof(BDRVRawState),
+    .bdrv_probe = NULL, /* no probe for protocols */
+    .bdrv_open = raw_open,
+    .bdrv_read = raw_read,
+    .bdrv_write = raw_write,
+    .bdrv_close = raw_close,
+    .bdrv_create = raw_create,
+    .bdrv_flush = raw_flush,
 
 #ifdef CONFIG_AIO
     .bdrv_aio_read = raw_aio_read,
@@ -893,8 +893,6 @@
     .aiocb_size = sizeof(RawAIOCB),
 #endif
 
-    .bdrv_read = raw_read,
-    .bdrv_write = raw_write,
     .bdrv_truncate = raw_truncate,
     .bdrv_getlength = raw_getlength,
 };

Modified: trunk/cmd.c
===================================================================
--- trunk/cmd.c 2009-04-07 02:19:41 UTC (rev 7015)
+++ trunk/cmd.c 2009-04-07 17:57:09 UTC (rev 7016)
@@ -212,8 +212,6 @@
 # include <histedit.h>
 #endif
 
-extern char *progname;
-
 static char *
 get_prompt(void)
 {

Modified: trunk/cmd.h
===================================================================
--- trunk/cmd.h 2009-04-07 02:19:41 UTC (rev 7015)
+++ trunk/cmd.h 2009-04-07 17:57:09 UTC (rev 7016)
@@ -75,4 +75,6 @@
 
 extern void    timestr(struct timeval *tv, char *str, size_t sz, int flags);
 
+extern char *progname;
+
 #endif /* __COMMAND_H__ */

Modified: trunk/dma-helpers.c
===================================================================
--- trunk/dma-helpers.c 2009-04-07 02:19:41 UTC (rev 7015)
+++ trunk/dma-helpers.c 2009-04-07 17:57:09 UTC (rev 7016)
@@ -81,7 +81,7 @@
     }
 }
 
-void dma_bdrv_cb(void *opaque, int ret)
+static void dma_bdrv_cb(void *opaque, int ret)
 {
     DMAAIOCB *dbs = (DMAAIOCB *)opaque;
     target_phys_addr_t cur_addr, cur_len;