[Qemu-devel] [PATCH] hotplug: fix "pci_add storage if=scsi"

[Gerd Hoffmann <kraxel@redhat.com>]

Explicitly add the drive to the bus of the newly created scsi adapter
instead of hoping that scsi_bus_legacy_handle_cmdline() picks it up
correctly.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/lsi53c895a.c  |    4 +++-
 hw/pci-hotplug.c |   15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index a4d3a57..012aaf6 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -2178,7 +2178,9 @@ static int lsi_scsi_init(PCIDevice *dev)
     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;
 }
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 08b5826..2a192d3 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -159,7 +159,18 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
 
     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) {
@@ -168,12 +179,12 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
         }
         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;
 }
 
-- 
1.6.2.5