[Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Christoph Hellwig]

Looks like the two bdrv_raw instances were missed last time.


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: qemu/block-raw-posix.c
===================================================================
--- qemu.orig/block-raw-posix.c	2009-03-29 21:52:28.208005692 +0200
+++ qemu/block-raw-posix.c	2009-03-29 23:05:39.587130731 +0200
@@ -876,27 +876,24 @@ static void raw_flush(BlockDriverState *
 }
 
 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_open		= raw_open,
+    .bdrv_close		= raw_close,
+    .bdrv_create	= raw_create,
+    .bdrv_flush		= raw_flush,
 
 #ifdef CONFIG_AIO
-    .bdrv_aio_read = raw_aio_read,
-    .bdrv_aio_write = raw_aio_write,
-    .bdrv_aio_cancel = raw_aio_cancel,
-    .aiocb_size = sizeof(RawAIOCB),
+    .bdrv_aio_read	= raw_aio_read,
+    .bdrv_aio_write	= raw_aio_write,
+    .bdrv_aio_cancel	= raw_aio_cancel,
+    .aiocb_size		= sizeof(RawAIOCB),
 #endif
 
-    .bdrv_read = raw_read,
-    .bdrv_write = raw_write,
-    .bdrv_truncate = raw_truncate,
-    .bdrv_getlength = raw_getlength,
+    .bdrv_read		= raw_read,
+    .bdrv_write		= raw_write,
+    .bdrv_truncate	= raw_truncate,
+    .bdrv_getlength	= raw_getlength,
 };
 
 /***********************************************/
Index: qemu/block-raw-win32.c
===================================================================
--- qemu.orig/block-raw-win32.c	2009-03-29 23:04:19.118004848 +0200
+++ qemu/block-raw-win32.c	2009-03-29 23:06:36.012042514 +0200
@@ -229,20 +229,16 @@ static int raw_create(const char *filena
 }
 
 BlockDriver bdrv_raw = {
-    "raw",
-    sizeof(BDRVRawState),
-    NULL, /* no probe for protocols */
-    raw_open,
-    NULL,
-    NULL,
-    raw_close,
-    raw_create,
-    raw_flush,
-
-    .bdrv_read = raw_read,
-    .bdrv_write = raw_write,
-    .bdrv_truncate = raw_truncate,
-    .bdrv_getlength = raw_getlength,
+    .format_name	= "raw",
+    .instance_size	= sizeof(BDRVRawState),
+    .bdrv_open		= raw_open,
+    .bdrv_close		= raw_close,
+    .bdrv_create	= raw_create,
+    .bdrv_flush		= raw_flush,
+    .bdrv_read		= raw_read,
+    .bdrv_write		= raw_write,
+    .bdrv_truncate	= raw_truncate,
+    .bdrv_getlength	= raw_getlength,
 };
 
 /***********************************************/

Re: [Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Avi Kivity]

Christoph Hellwig wrote:
> Looks like the two bdrv_raw instances were missed last time.
>   

tabs->spaces...

-- 
error compiling committee.c: too many arguments to function

Re: [Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Christoph Hellwig]

On Mon, Apr 06, 2009 at 03:19:08PM +0300, Avi Kivity wrote:
> Christoph Hellwig wrote:
> >Looks like the two bdrv_raw instances were missed last time.
> >  
> 
> tabs->spaces...

This matches the other initializers around them.

Re: [Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Christoph Hellwig]

In the meantime the block-posix-raw one got fixes as part of the fix
sparse warnings patch. 

[Qemu-devel] [PATCH] missing block-raw-win32.c C99 initializer conversion

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: qemu/block-raw-win32.c
===================================================================
--- qemu.orig/block-raw-win32.c	2009-04-07 20:03:18.757570009 +0200
+++ qemu/block-raw-win32.c	2009-04-07 20:05:14.313445383 +0200
@@ -229,20 +229,16 @@ static int raw_create(const char *filena
 }
 
 BlockDriver bdrv_raw = {
-    "raw",
-    sizeof(BDRVRawState),
-    NULL, /* no probe for protocols */
-    raw_open,
-    NULL,
-    NULL,
-    raw_close,
-    raw_create,
-    raw_flush,
-
-    .bdrv_read = raw_read,
-    .bdrv_write = raw_write,
-    .bdrv_truncate = raw_truncate,
-    .bdrv_getlength = raw_getlength,
+    .format_name = "raw",
+    .instance_size = sizeof(BDRVRawState),
+    .bdrv_open = raw_open,
+    .bdrv_close = raw_close,
+    .bdrv_create = raw_create,
+    .bdrv_flush = raw_flush,
+    .bdrv_read = raw_read,
+    .bdrv_write = raw_write,
+    .bdrv_truncate = raw_truncate,
+    .bdrv_getlength = raw_getlength,
 };
 
 /***********************************************/

Re: [Qemu-devel] [PATCH] more BlockDriver C99 initializers

[Anthony Liguori]

Christoph Hellwig wrote:
> Looks like the two bdrv_raw instances were missed last time.
>
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>   

Applied.  Thanks.

Regards,

Anthony Liguori