Commit 32a877e4 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

virtio-blk: move qdev properties into virtio-blk.c 



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

hw/block/virtio-blk.c

+11 −1
Original line number Diff line number Diff line
@@ -785,7 +785,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(),

};

include/hw/virtio/virtio-blk.h

+0 −23
Original line number Diff line number Diff line
@@ -155,29 +155,6 @@ typedef struct VirtIOBlockReq { 
#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)



int virtio_blk_handle_scsi_req(VirtIOBlock *blk,

                               VirtQueueElement *elem);