Commit 0c63237a authored by Shannon Zhao's avatar Shannon Zhao Committed by Michael S. Tsirkin
Browse files

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



As only one place in virtio-scsi.c uses DEFINE_VIRTIO_SCSI_PROPERTIES
and DEFINE_VIRTIO_SCSI_FEATURES, there is no need to expose them. Inline
them into virtio-scsi.c to avoid wrongly use.

Signed-off-by: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent db58c063

hw/scsi/virtio-scsi.c

+11 −2
Original line number Diff line number Diff line
@@ -948,8 +948,17 @@ static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp) 
}



static Property virtio_scsi_properties[] = {

    DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSI, parent_obj.conf),

    DEFINE_VIRTIO_SCSI_FEATURES(VirtIOSCSI, host_features),

    DEFINE_PROP_UINT32("num_queues", VirtIOSCSI, parent_obj.conf.num_queues, 1),

    DEFINE_PROP_UINT32("max_sectors", VirtIOSCSI, parent_obj.conf.max_sectors,

                                                  0xFFFF),

    DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSI, parent_obj.conf.cmd_per_lun,

                                                  128),

    DEFINE_PROP_BIT("any_layout", VirtIOSCSI, host_features,

                                              VIRTIO_F_ANY_LAYOUT, true),

    DEFINE_PROP_BIT("hotplug", VirtIOSCSI, host_features,

                                           VIRTIO_SCSI_F_HOTPLUG, true),

    DEFINE_PROP_BIT("param_change", VirtIOSCSI, host_features,

                                                VIRTIO_SCSI_F_CHANGE, true),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/virtio/virtio-scsi.h

+0 −13
Original line number Diff line number Diff line
@@ -141,19 +141,6 @@ typedef struct VirtIOSCSIReq { 
    } req;

} VirtIOSCSIReq;



#define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field)                     \

    DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1),       \

    DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF),\

    DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128)



#define DEFINE_VIRTIO_SCSI_FEATURES(_state, _feature_field)                    \

    DEFINE_PROP_BIT("any_layout", _state, _feature_field,                      \

                    VIRTIO_F_ANY_LAYOUT, true),                                \

    DEFINE_PROP_BIT("hotplug", _state, _feature_field, VIRTIO_SCSI_F_HOTPLUG,  \

                                                       true),                  \

    DEFINE_PROP_BIT("param_change", _state, _feature_field,                    \

                                            VIRTIO_SCSI_F_CHANGE, true)



typedef void (*HandleOutput)(VirtIODevice *, VirtQueue *);



void virtio_scsi_common_realize(DeviceState *dev, Error **errp,