Commit 02206e52 authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

scsi: Convert virtio-scsi HBA to hotplug handler API 



Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 91c8daad

hw/scsi/virtio-scsi.c

+20 −10
Original line number Diff line number Diff line
@@ -737,26 +737,29 @@ static void virtio_scsi_change(SCSIBus *bus, SCSIDevice *dev, SCSISense sense) 
    }

}



static void virtio_scsi_hotplug(SCSIBus *bus, SCSIDevice *dev)

static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,

                                Error **errp)

{

    VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus);

    VirtIODevice *vdev = VIRTIO_DEVICE(s);

    VirtIODevice *vdev = VIRTIO_DEVICE(hotplug_dev);



    if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) {

        virtio_scsi_push_event(s, dev, VIRTIO_SCSI_T_TRANSPORT_RESET,

        virtio_scsi_push_event(VIRTIO_SCSI(hotplug_dev), SCSI_DEVICE(dev),

                               VIRTIO_SCSI_T_TRANSPORT_RESET,

                               VIRTIO_SCSI_EVT_RESET_RESCAN);

    }

}



static void virtio_scsi_hot_unplug(SCSIBus *bus, SCSIDevice *dev)

static void virtio_scsi_hotunplug(HotplugHandler *hotplug_dev, DeviceState *dev,

                                  Error **errp)

{

    VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus);

    VirtIODevice *vdev = VIRTIO_DEVICE(s);

    VirtIODevice *vdev = VIRTIO_DEVICE(hotplug_dev);



    if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) {

        virtio_scsi_push_event(s, dev, VIRTIO_SCSI_T_TRANSPORT_RESET,

        virtio_scsi_push_event(VIRTIO_SCSI(hotplug_dev), SCSI_DEVICE(dev),

                               VIRTIO_SCSI_T_TRANSPORT_RESET,

                               VIRTIO_SCSI_EVT_RESET_REMOVED);

    }

    qdev_simple_device_unplug_cb(hotplug_dev, dev, errp);

}



static struct SCSIBusInfo virtio_scsi_scsi_info = {
@@ -768,8 +771,6 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { 
    .complete = virtio_scsi_command_complete,

    .cancel = virtio_scsi_request_cancelled,

    .change = virtio_scsi_change,

    .hotplug = virtio_scsi_hotplug,

    .hot_unplug = virtio_scsi_hot_unplug,

    .parse_cdb = virtio_scsi_parse_cdb,

    .get_sg_list = virtio_scsi_get_sg_list,

    .save_request = virtio_scsi_save_request,
@@ -853,6 +854,8 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) 


    scsi_bus_new(&s->bus, sizeof(s->bus), dev,

                 &virtio_scsi_scsi_info, vdev->bus_name);

    /* override default SCSI bus hotplug-handler, with virtio-scsi's one */

    qbus_set_hotplug_handler(BUS(&s->bus), dev, &error_abort);



    if (!dev->hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus, &err);
@@ -915,6 +918,7 @@ static void virtio_scsi_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);



    dc->props = virtio_scsi_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -923,6 +927,8 @@ static void virtio_scsi_class_init(ObjectClass *klass, void *data) 
    vdc->set_config = virtio_scsi_set_config;

    vdc->get_features = virtio_scsi_get_features;

    vdc->reset = virtio_scsi_reset;

    hc->plug = virtio_scsi_hotplug;

    hc->unplug = virtio_scsi_hotunplug;

}



static const TypeInfo virtio_scsi_common_info = {
@@ -939,6 +945,10 @@ static const TypeInfo virtio_scsi_info = { 
    .instance_size = sizeof(VirtIOSCSI),

    .instance_init = virtio_scsi_instance_init,

    .class_init = virtio_scsi_class_init,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_HOTPLUG_HANDLER },

        { }

    }

};



static void virtio_register_types(void)