Commit ee512c6f authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
parent a9968c77

hw/s390x/virtio-ccw.c

+0 −3
Original line number Diff line number Diff line
@@ -1403,9 +1403,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(),

};

hw/virtio/virtio-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -1066,9 +1066,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(),

include/hw/virtio/virtio-blk.h

+8 −0
Original line number Diff line number Diff line
@@ -162,8 +162,16 @@ typedef struct VirtIOBlockReq { 
#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),                  \