lsi_soft_reset(s);
scsi_bus_new(&s->bus, &dev->qdev, 1, LSI_MAX_DEVS, lsi_command_complete);
- scsi_bus_legacy_handle_cmdline(&s->bus);
+ if (!dev->qdev.hotplugged) {
+ scsi_bus_legacy_handle_cmdline(&s->bus);
+ }
register_savevm("lsiscsi", -1, 0, lsi_scsi_save, lsi_scsi_load, s);
return 0;
}
switch (type) {
case IF_SCSI:
+ if (!dinfo) {
+ monitor_printf(mon, "scsi requires a backing file/device.\n");
+ return NULL;
+ }
dev = pci_create(bus, devfn, "lsi53c895a");
+ if (qdev_init(&dev->qdev) < 0)
+ dev = NULL;
+ if (dev) {
+ BusState *scsibus = QLIST_FIRST(&dev->qdev.child_bus);
+ scsi_bus_legacy_add_drive(DO_UPCAST(SCSIBus, qbus, scsibus),
+ dinfo, dinfo->unit);
+ }
break;
case IF_VIRTIO:
if (!dinfo) {
}
dev = pci_create(bus, devfn, "virtio-blk-pci");
qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
+ if (qdev_init(&dev->qdev) < 0)
+ dev = NULL;
break;
default:
dev = NULL;
}
- if (!dev || qdev_init(&dev->qdev) < 0)
- return NULL;
return dev;
}