Commit fb8b660e authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw/scsi: Concentrate -drive if=scsi auto-create in one place 



The logic to create frontends for -drive if=scsi is in SCSI HBAs.  For
all other interface types, it's in machine initialization code.

A few machine types create the SCSI HBAs necessary for that.  That's
also not done for other interface types.

I'm going to deprecate these SCSI eccentricities.  In preparation for
that, create the frontends in main() instead of the SCSI HBAs, by
calling new function scsi_legacy_handle_cmdline() there.

Note that not all SCSI HBAs create frontends.  Take care not to change
that.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1487161136-9018-2-git-send-email-armbru@redhat.com>
Acked-By: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8f2d75e8

hw/scsi/esp-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -367,9 +367,6 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp) 
    s->irq = pci_allocate_irq(dev);



    scsi_bus_new(&s->bus, sizeof(s->bus), d, &esp_pci_scsi_info, NULL);

    if (!d->hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus, errp);

    }

}



static void esp_pci_scsi_uninit(PCIDevice *d)

hw/scsi/esp.c

+0 −6
Original line number Diff line number Diff line
@@ -690,7 +690,6 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

    SysBusESPState *sysbus = ESP(dev);

    ESPState *s = &sysbus->esp;

    Error *err = NULL;



    sysbus_init_irq(sbd, &s->irq);

    assert(sysbus->it_shift != -1);
@@ -703,11 +702,6 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) 
    qdev_init_gpio_in(dev, sysbus_esp_gpio_demux, 2);



    scsi_bus_new(&s->bus, sizeof(s->bus), dev, &esp_scsi_info, NULL);

    scsi_bus_legacy_handle_cmdline(&s->bus, &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;

    }

}



static void sysbus_esp_hard_reset(DeviceState *dev)

hw/scsi/lsi53c895a.c

+0 −3
Original line number Diff line number Diff line
@@ -2216,9 +2216,6 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) 
    QTAILQ_INIT(&s->queue);



    scsi_bus_new(&s->bus, sizeof(s->bus), d, &lsi_scsi_info, NULL);

    if (!d->hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus, errp);

    }

}



static void lsi_scsi_unrealize(DeviceState *dev, Error **errp)

hw/scsi/megasas.c

+0 −4
Original line number Diff line number Diff line
@@ -2325,7 +2325,6 @@ static const struct SCSIBusInfo megasas_scsi_info = { 


static void megasas_scsi_realize(PCIDevice *dev, Error **errp)

{

    DeviceState *d = DEVICE(dev);

    MegasasState *s = MEGASAS(dev);

    MegasasBaseClass *b = MEGASAS_DEVICE_GET_CLASS(s);

    uint8_t *pci_conf;
@@ -2426,9 +2425,6 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) 


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

                 &megasas_scsi_info, NULL);

    if (!d->hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus, errp);

    }

}



static Property megasas_properties_gen1[] = {

hw/scsi/mptsas.c

+0 −4
Original line number Diff line number Diff line
@@ -1271,7 +1271,6 @@ static const struct SCSIBusInfo mptsas_scsi_info = { 


static void mptsas_scsi_realize(PCIDevice *dev, Error **errp)

{

    DeviceState *d = DEVICE(dev);

    MPTSASState *s = MPT_SAS(dev);

    Error *err = NULL;

    int ret;
@@ -1326,9 +1325,6 @@ static void mptsas_scsi_realize(PCIDevice *dev, Error **errp) 
    QTAILQ_INIT(&s->pending);



    scsi_bus_new(&s->bus, sizeof(s->bus), &dev->qdev, &mptsas_scsi_info, NULL);

    if (!d->hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus, errp);

    }

}



static void mptsas_scsi_uninit(PCIDevice *dev)