Commit cb23117b authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

scsi: hotplug windup 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent ef816d83

hw/scsi-bus.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev, 
    bus->tcq = tcq;

    bus->ndev = ndev;

    bus->complete = complete;

    bus->qbus.allow_hotplug = 1;

}



static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base)
@@ -75,6 +76,7 @@ void scsi_qdev_register(SCSIDeviceInfo *info) 
{

    info->qdev.bus_info = &scsi_bus_info;

    info->qdev.init     = scsi_qdev_init;

    info->qdev.unplug   = qdev_simple_unplug_cb;

    info->qdev.exit     = scsi_qdev_exit;

    qdev_register(&info->qdev);

}

hw/usb-msd.c

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ static int usb_msd_initfn(USBDevice *dev) 
    s->dev.speed = USB_SPEED_FULL;

    scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete);

    s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, s->dinfo, 0);

    s->bus.qbus.allow_hotplug = 0;

    usb_msd_handle_reset(dev);

    return 0;

}