Commit 21549a46 authored by Shannon Zhao's avatar Shannon Zhao Committed by Michael S. Tsirkin
Browse files

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



As only one place in vhost-scsi.c uses DEFINE_VHOST_SCSI_PROPERTIES,
there is no need to expose it. Inline it into vhost-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 83a84878

hw/scsi/vhost-scsi.c

+8 −1
Original line number Diff line number Diff line
@@ -294,7 +294,14 @@ static char *vhost_scsi_get_fw_dev_path(FWPathProvider *p, BusState *bus, 
}



static Property vhost_scsi_properties[] = {

    DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSI, parent_obj.conf),

    DEFINE_PROP_STRING("vhostfd", VHostSCSI, parent_obj.conf.vhostfd),

    DEFINE_PROP_STRING("wwpn", VHostSCSI, parent_obj.conf.wwpn),

    DEFINE_PROP_UINT32("boot_tpgt", VHostSCSI, parent_obj.conf.boot_tpgt, 0),

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

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

                                                 0xFFFF),

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

                                                 128),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/virtio/vhost-scsi.h

+0 −9
Original line number Diff line number Diff line
@@ -66,13 +66,4 @@ typedef struct VHostSCSI { 
    int lun;

} VHostSCSI;



#define DEFINE_VHOST_SCSI_PROPERTIES(_state, _conf_field) \

    DEFINE_PROP_STRING("vhostfd", _state, _conf_field.vhostfd), \

    DEFINE_PROP_STRING("wwpn", _state, _conf_field.wwpn), \

    DEFINE_PROP_UINT32("boot_tpgt", _state, _conf_field.boot_tpgt, 0), \

    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)





#endif