[v2,3/7] virtio-blk: move x-data-plane qdev property to virtio-blk.h

Move the x-data-plane property.  Originally it was outside since not
every transport may wish to support dataplane.  But that makes little
sense when we have a dedicated CONFIG_VIRTIO_BLK_DATA_PLANE ifdef
already.

This move makes it easier to switch to property aliases in the next
patch.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/s390x/virtio-ccw.c          | 3 ---
 hw/virtio/virtio-pci.c         | 3 ---
 include/hw/virtio/virtio-blk.h | 8 ++++++++
 3 files changed, 8 insertions(+), 6 deletions(-)

On Fri, May 23, 2014 at 1:40 AM, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Move the x-data-plane property.  Originally it was outside since not
> every transport may wish to support dataplane.  But that makes little
> sense when we have a dedicated CONFIG_VIRTIO_BLK_DATA_PLANE ifdef
> already.
>
> This move makes it easier to switch to property aliases in the next
> patch.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Its worth pointing out, I'm not the ideal reviewer for virtio but from
a pure QOM/qdev perspective it looks ok to me.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> ---
>  hw/s390x/virtio-ccw.c          | 3 ---
>  hw/virtio/virtio-pci.c         | 3 ---
>  include/hw/virtio/virtio-blk.h | 8 ++++++++
>  3 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 1cb4e2c..082bb42 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1129,9 +1129,6 @@ static Property virtio_ccw_blk_properties[] = {
>      DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk),
>      DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
>                      VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
> -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
> -    DEFINE_PROP_BIT("x-data-plane", VirtIOBlkCcw, blk.data_plane, 0, false),
> -#endif
>      DEFINE_PROP_END_OF_LIST(),
>  };
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index ce97514..0751a1e 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1067,9 +1067,6 @@ static Property virtio_blk_pci_properties[] = {
>      DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
>                      VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
>      DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
> -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
> -    DEFINE_PROP_BIT("x-data-plane", VirtIOBlkPCI, blk.data_plane, 0, false),
> -#endif
>      DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),
>      DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkPCI, blk),
>      DEFINE_PROP_END_OF_LIST(),
> diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
> index fa416db..78e7f81 100644
> --- a/include/hw/virtio/virtio-blk.h
> +++ b/include/hw/virtio/virtio-blk.h
> @@ -143,8 +143,16 @@ typedef struct VirtIOBlock {
>  #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),                  \
> --
> 1.9.0
>
>