Commit eb5757fc authored by Greg Edwards's avatar Greg Edwards Committed by Paolo Bonzini
Browse files

vhost-user-scsi: move host_features into VHostSCSICommon 



In preparation for having vhost-scsi also make use of host_features,
move it from struct VHostUserSCSI into struct VHostSCSICommon.

Signed-off-by: default avatarGreg Edwards <gedwards@ddn.com>
Message-Id: <20180808195235.5843-2-gedwards@ddn.com>
Reviewed-by: default avatarFelipe Franciosi <felipe@nutanix.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f2a4ad6d

hw/scsi/vhost-user-scsi.c

+8 −7
Original line number Diff line number Diff line
@@ -141,9 +141,10 @@ static uint64_t vhost_user_scsi_get_features(VirtIODevice *vdev, 
                                             uint64_t features, Error **errp)

{

    VHostUserSCSI *s = VHOST_USER_SCSI(vdev);

    VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);



    /* Turn on predefined features supported by this device */

    features |= s->host_features;

    features |= vsc->host_features;



    return vhost_scsi_common_get_features(vdev, features, errp);

}
@@ -157,10 +158,10 @@ static Property vhost_user_scsi_properties[] = { 
    DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,

                       0xFFFF),

    DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun, 128),

    DEFINE_PROP_BIT64("hotplug", VHostUserSCSI, host_features,

    DEFINE_PROP_BIT64("hotplug", VHostSCSICommon, host_features,

                                                  VIRTIO_SCSI_F_HOTPLUG,

                                                  true),

    DEFINE_PROP_BIT64("param_change", VHostUserSCSI, host_features,

    DEFINE_PROP_BIT64("param_change", VHostSCSICommon, host_features,

                                                       VIRTIO_SCSI_F_CHANGE,

                                                       true),

    DEFINE_PROP_END_OF_LIST(),

include/hw/virtio/vhost-scsi-common.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ typedef struct VHostSCSICommon { 
    int channel;

    int target;

    int lun;

    uint64_t host_features;

} VHostSCSICommon;



int vhost_scsi_common_start(VHostSCSICommon *vsc);

include/hw/virtio/vhost-user-scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


typedef struct VHostUserSCSI {

    VHostSCSICommon parent_obj;

    uint64_t host_features;

    VhostUserState *vhost_user;

} VHostUserSCSI;