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

[Christoph Hellwig]

ping?

This is a simple preparatory patch not directly related to the rest of
the series (which is beeing respun right now)

On Sat, Mar 14, 2009 at 08:27:54PM +0100, Christoph Hellwig wrote:
> 
> 
> Looks like the two bdrv_raw instances were missed last time.
> 
> 
> Signed-off-by: Christoph Hellwig <address@hidden>
> 
> Index: qemu/block-raw-posix.c
> ===================================================================
> --- qemu.orig/block-raw-posix.c       2009-03-14 14:46:32.000000000 +0100
> +++ qemu/block-raw-posix.c    2009-03-14 14:49:28.000000000 +0100
> @@ -847,27 +847,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-14 14:47:37.000000000 +0100
> +++ qemu/block-raw-win32.c    2009-03-14 14:48:39.000000000 +0100
> @@ -351,26 +351,23 @@ 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,
> +    .format_name     = "raw",
> +    .instance_size   = sizeof(BDRVRawState),
> +    .bdrv_open               = raw_open,
> +    .bdrv_close              = raw_close,
> +    .bdrv_create     = raw_create,
> +    .bdrv_flush              = raw_flush,
>  
>  #ifdef WIN32_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,
>  };
>  
>  /***********************************************/
> 
---end quoted text---