Re: [Qemu-devel] [PATCH v2 7/7] virtio-blk: move qdev properties into virtio-blk.c

[Peter Crosthwaite]

On Fri, May 23, 2014 at 1:40 AM, Stefan Hajnoczi <address@hidden> wrote:
> There is no need to make DEFINE_VIRTIO_BLK_PROPERTIES() public.  Inline
> it into virtio-blk.c so it cannot be used by mistake from other source
> files.
>
> Signed-off-by: Stefan Hajnoczi <address@hidden>

Reviewed-by: Peter Crosthwaite <address@hidden>

> ---
>  hw/block/virtio-blk.c          | 12 +++++++++++-
>  include/hw/virtio/virtio-blk.h | 23 -----------------------
>  2 files changed, 11 insertions(+), 24 deletions(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 4781351..3a261c8 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -749,7 +749,17 @@ static void virtio_blk_device_unrealize(DeviceState 
> *dev, Error **errp)
>  }
>
>  static Property virtio_blk_properties[] = {
> -    DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlock, blk),
> +    DEFINE_BLOCK_PROPERTIES(VirtIOBlock, blk.conf),
> +    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, blk.conf),
> +    DEFINE_PROP_STRING("serial", VirtIOBlock, blk.serial),
> +    DEFINE_PROP_BIT("config-wce", VirtIOBlock, blk.config_wce, 0, true),
> +    DEFINE_PROP_IOTHREAD("x-iothread", VirtIOBlock, blk.iothread),
> +#ifdef __linux__
> +    DEFINE_PROP_BIT("scsi", VirtIOBlock, blk.scsi, 0, true),
> +#endif
> +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
> +    DEFINE_PROP_BIT("x-data-plane", VirtIOBlock, blk.data_plane, 0, false),
> +#endif
>      DEFINE_PROP_END_OF_LIST(),
>  };
>
> diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
> index f8d4ac1..beecb7e 100644
> --- a/include/hw/virtio/virtio-blk.h
> +++ b/include/hw/virtio/virtio-blk.h
> @@ -136,27 +136,4 @@ typedef struct VirtIOBlock {
>  #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \
>          DEFINE_VIRTIO_COMMON_FEATURES(_state, _field)
>
> -#ifdef __linux__
> -#define DEFINE_VIRTIO_BLK_PROPERTIES_LINUX(_state, _field) \
> -        DEFINE_PROP_BIT("scsi", _state, _field.scsi, 0, true),
> -#else
> -#define DEFINE_VIRTIO_BLK_PROPERTIES_LINUX(_state, _field)
> -#endif
> -
> -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
> -#define DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field) \
> -    DEFINE_PROP_BIT("x-data-plane", _state, _field.data_plane, 0, false),
> -#else
> -#define DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field)
> -#endif
> -
> -#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _field)                         
>  \
> -        DEFINE_VIRTIO_BLK_PROPERTIES_LINUX(_state, _field)                   
>  \
> -        DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field)              
>  \
> -        DEFINE_BLOCK_PROPERTIES(_state, _field.conf),                        
>  \
> -        DEFINE_BLOCK_CHS_PROPERTIES(_state, _field.conf),                    
>  \
> -        DEFINE_PROP_STRING("serial", _state, _field.serial),                 
>  \
> -        DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true),   
>  \
> -        DEFINE_PROP_IOTHREAD("x-iothread", _state, _field.iothread)
> -
>  #endif
> --
> 1.9.0
>
>