Commit 19d339f1 authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

virtio-scsi: Add 'iothread' property to virtio-scsi 



Similar to this property in virtio-blk for dataplane, add it as a QOM
link in virtio-scsi and an alias in virtio-scsi-pci and virtio-scsi-ccw,
in order to assign an iothread to the device.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c8075caf

hw/s390x/virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ static void virtio_ccw_scsi_instance_init(Object *obj) 


    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SCSI);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothread",

                              &error_abort);

}



#ifdef CONFIG_VHOST_SCSI

hw/scsi/virtio-scsi.c

+11 −0
Original line number Diff line number Diff line
@@ -728,6 +728,16 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) 
                    virtio_scsi_save, virtio_scsi_load, s);

}



static void virtio_scsi_instance_init(Object *obj)

{

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(obj);



    object_property_add_link(obj, "iothread", TYPE_IOTHREAD,

                             (Object **)&vs->conf.iothread,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);

}



void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -786,6 +796,7 @@ static const TypeInfo virtio_scsi_info = { 
    .name = TYPE_VIRTIO_SCSI,

    .parent = TYPE_VIRTIO_SCSI_COMMON,

    .instance_size = sizeof(VirtIOSCSI),

    .instance_init = virtio_scsi_instance_init,

    .class_init = virtio_scsi_class_init,

};

hw/virtio/virtio-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,8 @@ static void virtio_scsi_pci_instance_init(Object *obj) 


    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SCSI);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothread",

                              &error_abort);

}



static const TypeInfo virtio_scsi_pci_info = {

include/hw/virtio/virtio-scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct VirtIOSCSIConf { 
    uint32_t cmd_per_lun;

    char *vhostfd;

    char *wwpn;

    IOThread *iothread;

};



typedef struct VirtIOSCSICommon {