Commit b1187b51 authored by Andreas Färber's avatar Andreas Färber
Browse files

scsi: Pass size to scsi_bus_new() 



To be passed to qbus_create_inplace().

Use DEVICE() casts instead of direct parent field access.

Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent dd301ca6

hw/scsi/esp-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int esp_pci_scsi_init(PCIDevice *dev) 
    pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->io);

    s->irq = dev->irq[0];



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

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

    if (!d->hotplugged) {

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

        if (err != NULL) {

hw/scsi/esp.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) 


    qdev_init_gpio_in(dev, sysbus_esp_gpio_demux, 2);



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

    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);

hw/scsi/lsi53c895a.c

+1 −1
Original line number Diff line number Diff line
@@ -2117,7 +2117,7 @@ static int lsi_scsi_init(PCIDevice *dev) 
    pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ram_io);

    QTAILQ_INIT(&s->queue);



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

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

    if (!d->hotplugged) {

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

        if (err != NULL) {

hw/scsi/megasas.c

+2 −1
Original line number Diff line number Diff line
@@ -2171,7 +2171,8 @@ static int megasas_scsi_init(PCIDevice *dev) 
        s->frames[i].state = s;

    }



    scsi_bus_new(&s->bus, DEVICE(dev), &megasas_scsi_info, NULL);

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

                 &megasas_scsi_info, NULL);

    if (!d->hotplugged) {

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

        if (err != NULL) {

hw/scsi/scsi-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ static void scsi_device_unit_attention_reported(SCSIDevice *s) 
}



/* Create a scsi bus, and attach devices to it.  */

void scsi_bus_new(SCSIBus *bus, DeviceState *host, const SCSIBusInfo *info,

                  const char *bus_name)

void scsi_bus_new(SCSIBus *bus, size_t bus_size, DeviceState *host,

                  const SCSIBusInfo *info, const char *bus_name)

{

    qbus_create_inplace(&bus->qbus, TYPE_SCSI_BUS, host, bus_name);

    bus->busnr = next_scsi_bus++;