Re: [Qemu-devel] [PATCH] use C99 initializers for BlockDriver methods

[Aurelien Jarno]

On Tue, Mar 03, 2009 at 04:03:12PM +0100, Christoph Hellwig wrote:
> Consistently use the C99 named initializer format for the BlockDriver
> methods to make the method table more readable and more easily
> extensible.
> 
> 
> Signed-off-by: Christoph Hellwig <address@hidden>

Thanks, applied.

> Index: qemu/block-bochs.c
> ===================================================================
> --- qemu.orig/block-bochs.c   2009-03-03 13:41:23.464007528 +0100
> +++ qemu/block-bochs.c        2009-03-03 13:41:34.381978994 +0100
> @@ -242,11 +242,10 @@ static void bochs_close(BlockDriverState
>  }
>  
>  BlockDriver bdrv_bochs = {
> -    "bochs",
> -    sizeof(BDRVBochsState),
> -    bochs_probe,
> -    bochs_open,
> -    bochs_read,
> -    NULL,
> -    bochs_close,
> +    .format_name     = "bochs",
> +    .instance_size   = sizeof(BDRVBochsState),
> +    .bdrv_probe              = bochs_probe,
> +    .bdrv_open               = bochs_open,
> +    .bdrv_read               = bochs_read,
> +    .bdrv_close              = bochs_close,
>  };
> Index: qemu/block-cloop.c
> ===================================================================
> --- qemu.orig/block-cloop.c   2009-03-03 13:41:23.469008305 +0100
> +++ qemu/block-cloop.c        2009-03-03 13:41:34.381978994 +0100
> @@ -154,11 +154,10 @@ static void cloop_close(BlockDriverState
>  }
>  
>  BlockDriver bdrv_cloop = {
> -    "cloop",
> -    sizeof(BDRVCloopState),
> -    cloop_probe,
> -    cloop_open,
> -    cloop_read,
> -    NULL,
> -    cloop_close,
> +    .format_name     = "cloop",
> +    .instance_size   = sizeof(BDRVCloopState),
> +    .bdrv_probe              = cloop_probe,
> +    .bdrv_open               = cloop_open,
> +    .bdrv_read               = cloop_read,
> +    .bdrv_close              = cloop_close,
>  };
> Index: qemu/block-cow.c
> ===================================================================
> --- qemu.orig/block-cow.c     2009-03-03 13:41:23.472978783 +0100
> +++ qemu/block-cow.c  2009-03-03 13:41:34.382978842 +0100
> @@ -253,15 +253,15 @@ static void cow_flush(BlockDriverState *
>  }
>  
>  BlockDriver bdrv_cow = {
> -    "cow",
> -    sizeof(BDRVCowState),
> -    cow_probe,
> -    cow_open,
> -    cow_read,
> -    cow_write,
> -    cow_close,
> -    cow_create,
> -    cow_flush,
> -    cow_is_allocated,
> +    .format_name     = "cow",
> +    .instance_size   = sizeof(BDRVCowState),
> +    .bdrv_probe              = cow_probe,
> +    .bdrv_open               = cow_open,
> +    .bdrv_read               = cow_read,
> +    .bdrv_write              = cow_write,
> +    .bdrv_close              = cow_close,
> +    .bdrv_create     = cow_create,
> +    .bdrv_flush              = cow_flush,
> +    .bdrv_is_allocated       = cow_is_allocated,
>  };
>  #endif
> Index: qemu/block-dmg.c
> ===================================================================
> --- qemu.orig/block-dmg.c     2009-03-03 13:41:23.476978873 +0100
> +++ qemu/block-dmg.c  2009-03-03 13:41:34.382978842 +0100
> @@ -284,11 +284,10 @@ static void dmg_close(BlockDriverState *
>  }
>  
>  BlockDriver bdrv_dmg = {
> -    "dmg",
> -    sizeof(BDRVDMGState),
> -    dmg_probe,
> -    dmg_open,
> -    dmg_read,
> -    NULL,
> -    dmg_close,
> +    .format_name     = "dmg",
> +    .instance_size   = sizeof(BDRVDMGState),
> +    .bdrv_probe              = dmg_probe,
> +    .bdrv_open               = dmg_open,
> +    .bdrv_read               = dmg_read,
> +    .bdrv_close              = dmg_close,
>  };
> Index: qemu/block-nbd.c
> ===================================================================
> --- qemu.orig/block-nbd.c     2009-03-03 13:41:23.481978672 +0100
> +++ qemu/block-nbd.c  2009-03-03 13:41:34.383978271 +0100
> @@ -177,13 +177,12 @@ static int64_t nbd_getlength(BlockDriver
>  }
>  
>  BlockDriver bdrv_nbd = {
> -    "nbd",
> -    sizeof(BDRVNBDState),
> -    NULL, /* no probe for protocols */
> -    nbd_open,
> -    nbd_read,
> -    nbd_write,
> -    nbd_close,
> -    .bdrv_getlength = nbd_getlength,
> -    .protocol_name = "nbd",
> +    .format_name     = "nbd",
> +    .instance_size   = sizeof(BDRVNBDState),
> +    .bdrv_open               = nbd_open,
> +    .bdrv_read               = nbd_read,
> +    .bdrv_write              = nbd_write,
> +    .bdrv_close              = nbd_close,
> +    .bdrv_getlength  = nbd_getlength,
> +    .protocol_name   = "nbd",
>  };
> Index: qemu/block-parallels.c
> ===================================================================
> --- qemu.orig/block-parallels.c       2009-03-03 13:41:23.493882771 +0100
> +++ qemu/block-parallels.c    2009-03-03 13:41:34.383978271 +0100
> @@ -164,11 +164,10 @@ static void parallels_close(BlockDriverS
>  }
>  
>  BlockDriver bdrv_parallels = {
> -    "parallels",
> -    sizeof(BDRVParallelsState),
> -    parallels_probe,
> -    parallels_open,
> -    parallels_read,
> -    NULL,
> -    parallels_close,
> +    .format_name     = "parallels",
> +    .instance_size   = sizeof(BDRVParallelsState),
> +    .bdrv_probe              = parallels_probe,
> +    .bdrv_open               = parallels_open,
> +    .bdrv_read               = parallels_read,
> +    .bdrv_close              = parallels_close,
>  };
> Index: qemu/block-qcow.c
> ===================================================================
> --- qemu.orig/block-qcow.c    2009-03-03 13:41:23.497882931 +0100
> +++ qemu/block-qcow.c 2009-03-03 13:41:34.384978119 +0100
> @@ -887,23 +887,20 @@ static int qcow_get_info(BlockDriverStat
>  }
>  
>  BlockDriver bdrv_qcow = {
> -    "qcow",
> -    sizeof(BDRVQcowState),
> -    qcow_probe,
> -    qcow_open,
> -    NULL,
> -    NULL,
> -    qcow_close,
> -    qcow_create,
> -    qcow_flush,
> -    qcow_is_allocated,
> -    qcow_set_key,
> -    qcow_make_empty,
> -
> -    .bdrv_aio_read = qcow_aio_read,
> -    .bdrv_aio_write = qcow_aio_write,
> -    .bdrv_aio_cancel = qcow_aio_cancel,
> -    .aiocb_size = sizeof(QCowAIOCB),
> +    .format_name     = "qcow",
> +    .instance_size   = sizeof(BDRVQcowState),
> +    .bdrv_probe              = qcow_probe,
> +    .bdrv_open               = qcow_open,
> +    .bdrv_close              = qcow_close,
> +    .bdrv_create     = qcow_create,
> +    .bdrv_flush              = qcow_flush,
> +    .bdrv_is_allocated       = qcow_is_allocated,
> +    .bdrv_set_key    = qcow_set_key,
> +    .bdrv_make_empty = qcow_make_empty,
> +    .bdrv_aio_read   = qcow_aio_read,
> +    .bdrv_aio_write  = qcow_aio_write,
> +    .bdrv_aio_cancel = qcow_aio_cancel,
> +    .aiocb_size              = sizeof(QCowAIOCB),
>      .bdrv_write_compressed = qcow_write_compressed,
> -    .bdrv_get_info = qcow_get_info,
> +    .bdrv_get_info   = qcow_get_info,
>  };
> Index: qemu/block-qcow2.c
> ===================================================================
> --- qemu.orig/block-qcow2.c   2009-03-03 13:41:23.501882603 +0100
> +++ qemu/block-qcow2.c        2009-03-03 13:41:34.386005624 +0100
> @@ -2646,28 +2646,26 @@ static void dump_refcounts(BlockDriverSt
>  #endif
>  
>  BlockDriver bdrv_qcow2 = {
> -    "qcow2",
> -    sizeof(BDRVQcowState),
> -    qcow_probe,
> -    qcow_open,
> -    NULL,
> -    NULL,
> -    qcow_close,
> -    qcow_create,
> -    qcow_flush,
> -    qcow_is_allocated,
> -    qcow_set_key,
> -    qcow_make_empty,
> +    .format_name     = "qcow2",
> +    .instance_size   = sizeof(BDRVQcowState),
> +    .bdrv_probe              = qcow_probe,
> +    .bdrv_open               = qcow_open,
> +    .bdrv_close              = qcow_close,
> +    .bdrv_create     = qcow_create,
> +    .bdrv_flush              = qcow_flush,
> +    .bdrv_is_allocated       = qcow_is_allocated,
> +    .bdrv_set_key    = qcow_set_key,
> +    .bdrv_make_empty = qcow_make_empty,
>  
> -    .bdrv_aio_read = qcow_aio_read,
> -    .bdrv_aio_write = qcow_aio_write,
> -    .bdrv_aio_cancel = qcow_aio_cancel,
> -    .aiocb_size = sizeof(QCowAIOCB),
> +    .bdrv_aio_read   = qcow_aio_read,
> +    .bdrv_aio_write  = qcow_aio_write,
> +    .bdrv_aio_cancel = qcow_aio_cancel,
> +    .aiocb_size              = sizeof(QCowAIOCB),
>      .bdrv_write_compressed = qcow_write_compressed,
>  
>      .bdrv_snapshot_create = qcow_snapshot_create,
> -    .bdrv_snapshot_goto = qcow_snapshot_goto,
> +    .bdrv_snapshot_goto      = qcow_snapshot_goto,
>      .bdrv_snapshot_delete = qcow_snapshot_delete,
> -    .bdrv_snapshot_list = qcow_snapshot_list,
> -    .bdrv_get_info = qcow_get_info,
> +    .bdrv_snapshot_list      = qcow_snapshot_list,
> +    .bdrv_get_info   = qcow_get_info,
>  };
> Index: qemu/block-raw-posix.c
> ===================================================================
> --- qemu.orig/block-raw-posix.c       2009-03-03 13:41:23.506853976 +0100
> +++ qemu/block-raw-posix.c    2009-03-03 13:41:34.387002539 +0100
> @@ -1166,32 +1166,28 @@ static int raw_ioctl(BlockDriverState *b
>  #endif /* !linux */
>  
>  BlockDriver bdrv_host_device = {
> -    "host_device",
> -    sizeof(BDRVRawState),
> -    NULL, /* no probe for protocols */
> -    hdev_open,
> -    NULL,
> -    NULL,
> -    raw_close,
> -    NULL,
> -    raw_flush,
> +    .format_name     = "host_device",
> +    .instance_size   = sizeof(BDRVRawState),
> +    .bdrv_open               = hdev_open,
> +    .bdrv_close              = raw_close,
> +    .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_pread = raw_pread,
> -    .bdrv_pwrite = raw_pwrite,
> -    .bdrv_getlength = raw_getlength,
> +    .bdrv_pread              = raw_pread,
> +    .bdrv_pwrite     = raw_pwrite,
> +    .bdrv_getlength  = raw_getlength,
>  
>      /* removable device support */
> -    .bdrv_is_inserted = raw_is_inserted,
> -    .bdrv_media_changed = raw_media_changed,
> -    .bdrv_eject = raw_eject,
> -    .bdrv_set_locked = raw_set_locked,
> +    .bdrv_is_inserted        = raw_is_inserted,
> +    .bdrv_media_changed      = raw_media_changed,
> +    .bdrv_eject              = raw_eject,
> +    .bdrv_set_locked = raw_set_locked,
>      /* generic scsi device */
> -    .bdrv_ioctl = raw_ioctl,
> +    .bdrv_ioctl              = raw_ioctl,
>  };
> Index: qemu/block-raw-win32.c
> ===================================================================
> --- qemu.orig/block-raw-win32.c       2009-03-03 13:41:23.510882003 +0100
> +++ qemu/block-raw-win32.c    2009-03-03 13:41:34.387002539 +0100
> @@ -495,23 +495,19 @@ static int raw_set_locked(BlockDriverSta
>  #endif
>  
>  BlockDriver bdrv_host_device = {
> -    "host_device",
> -    sizeof(BDRVRawState),
> -    NULL, /* no probe for protocols */
> -    hdev_open,
> -    NULL,
> -    NULL,
> -    raw_close,
> -    NULL,
> -    raw_flush,
> +    .format_name     = "host_device",
> +    .instance_size   = sizeof(BDRVRawState),
> +    .bdrv_open               = hdev_open,
> +    .bdrv_close              = raw_close,
> +    .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_pread = raw_pread,
> -    .bdrv_pwrite = raw_pwrite,
> -    .bdrv_getlength = raw_getlength,
> +    .bdrv_pread              = raw_pread,
> +    .bdrv_pwrite     = raw_pwrite,
> +    .bdrv_getlength  = raw_getlength,
>  };
> Index: qemu/block-vmdk.c
> ===================================================================
> --- qemu.orig/block-vmdk.c    2009-03-03 13:41:23.519853955 +0100
> +++ qemu/block-vmdk.c 2009-03-03 13:41:34.388006577 +0100
> @@ -812,14 +812,14 @@ static void vmdk_flush(BlockDriverState 
>  }
>  
>  BlockDriver bdrv_vmdk = {
> -    "vmdk",
> -    sizeof(BDRVVmdkState),
> -    vmdk_probe,
> -    vmdk_open,
> -    vmdk_read,
> -    vmdk_write,
> -    vmdk_close,
> -    vmdk_create,
> -    vmdk_flush,
> -    vmdk_is_allocated,
> +    .format_name     = "vmdk",
> +    .instance_size   = sizeof(BDRVVmdkState),
> +    .bdrv_probe              = vmdk_probe,
> +    .bdrv_open               = vmdk_open,
> +    .bdrv_read               = vmdk_read,
> +    .bdrv_write              = vmdk_write,
> +    .bdrv_close              = vmdk_close,
> +    .bdrv_create     = vmdk_create,
> +    .bdrv_flush              = vmdk_flush,
> +    .bdrv_is_allocated       = vmdk_is_allocated,
>  };
> Index: qemu/block-vpc.c
> ===================================================================
> --- qemu.orig/block-vpc.c     2009-03-03 13:41:23.523859982 +0100
> +++ qemu/block-vpc.c  2009-03-03 13:41:34.389005098 +0100
> @@ -582,12 +582,12 @@ static void vpc_close(BlockDriverState *
>  }
>  
>  BlockDriver bdrv_vpc = {
> -    "vpc",
> -    sizeof(BDRVVPCState),
> -    vpc_probe,
> -    vpc_open,
> -    vpc_read,
> -    vpc_write,
> -    vpc_close,
> -    vpc_create,
> +    .format_name     = "vpc",
> +    .instance_size   = sizeof(BDRVVPCState),
> +    .bdrv_probe              = vpc_probe,
> +    .bdrv_open               = vpc_open,
> +    .bdrv_read               = vpc_read,
> +    .bdrv_write              = vpc_write,
> +    .bdrv_close              = vpc_close,
> +    .bdrv_create     = vpc_create,
>  };
> Index: qemu/block-vvfat.c
> ===================================================================
> --- qemu.orig/block-vvfat.c   2009-03-03 13:41:23.527853437 +0100
> +++ qemu/block-vvfat.c        2009-03-03 13:41:34.390008019 +0100
> @@ -2805,17 +2805,14 @@ static void vvfat_close(BlockDriverState
>  }
>  
>  BlockDriver bdrv_vvfat = {
> -    "vvfat",
> -    sizeof(BDRVVVFATState),
> -    NULL, /* no probe for protocols */
> -    vvfat_open,
> -    vvfat_read,
> -    vvfat_write,
> -    vvfat_close,
> -    NULL, /* ??? Not sure if we can do any meaningful flushing.  */
> -    NULL,
> -    vvfat_is_allocated,
> -    .protocol_name = "fat",
> +    .format_name     = "vvfat",
> +    .instance_size   = sizeof(BDRVVVFATState),
> +    .bdrv_open               = vvfat_open,
> +    .bdrv_read               = vvfat_read,
> +    .bdrv_write              = vvfat_write,
> +    .bdrv_close              = vvfat_close,
> +    .bdrv_is_allocated       = vvfat_is_allocated,
> +    .protocol_name   = "fat",
>  };
>  
>  #ifdef DEBUG
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
address@hidden                 http://www.aurel32.net