Commit 29776739 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/s*: pass owner to memory_region_init* functions 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 40c5dce9

hw/scsi/esp-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ static int esp_pci_scsi_init(PCIDevice *dev) 
    s->dma_memory_write = esp_pci_dma_memory_write;

    s->dma_opaque = pci;

    s->chip_id = TCHI_AM53C974;

    memory_region_init_io(&pci->io, NULL, &esp_pci_io_ops, pci, "esp-io", 0x80);

    memory_region_init_io(&pci->io, OBJECT(pci), &esp_pci_io_ops, pci,

                          "esp-io", 0x80);



    pci_register_bar(&pci->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->io);

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

hw/scsi/esp.c

+2 −2
Original line number Diff line number Diff line
@@ -675,8 +675,8 @@ static int sysbus_esp_init(SysBusDevice *dev) 
    assert(sysbus->it_shift != -1);



    s->chip_id = TCHI_FAS100A;

    memory_region_init_io(&sysbus->iomem, NULL, &sysbus_esp_mem_ops, sysbus,

                          "esp", ESP_REGS << sysbus->it_shift);

    memory_region_init_io(&sysbus->iomem, OBJECT(sysbus), &sysbus_esp_mem_ops,

                          sysbus, "esp", ESP_REGS << sysbus->it_shift);

    sysbus_init_mmio(dev, &sysbus->iomem);



    qdev_init_gpio_in(&dev->qdev, sysbus_esp_gpio_demux, 2);

hw/scsi/lsi53c895a.c

+6 −3
Original line number Diff line number Diff line
@@ -2090,9 +2090,12 @@ static int lsi_scsi_init(PCIDevice *dev) 
    /* Interrupt pin A */

    pci_conf[PCI_INTERRUPT_PIN] = 0x01;



    memory_region_init_io(&s->mmio_io, NULL, &lsi_mmio_ops, s, "lsi-mmio", 0x400);

    memory_region_init_io(&s->ram_io, NULL, &lsi_ram_ops, s, "lsi-ram", 0x2000);

    memory_region_init_io(&s->io_io, NULL, &lsi_io_ops, s, "lsi-io", 256);

    memory_region_init_io(&s->mmio_io, OBJECT(s), &lsi_mmio_ops, s,

                          "lsi-mmio", 0x400);

    memory_region_init_io(&s->ram_io, OBJECT(s), &lsi_ram_ops, s,

                          "lsi-ram", 0x2000);

    memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s,

                          "lsi-io", 256);



    pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io);

    pci_register_bar(&s->dev, 1, 0, &s->mmio_io);

hw/scsi/megasas.c

+3 −3
Original line number Diff line number Diff line
@@ -2098,11 +2098,11 @@ static int megasas_scsi_init(PCIDevice *dev) 
    /* Interrupt pin 1 */

    pci_conf[PCI_INTERRUPT_PIN] = 0x01;



    memory_region_init_io(&s->mmio_io, NULL, &megasas_mmio_ops, s,

    memory_region_init_io(&s->mmio_io, OBJECT(s), &megasas_mmio_ops, s,

                          "megasas-mmio", 0x4000);

    memory_region_init_io(&s->port_io, NULL, &megasas_port_ops, s,

    memory_region_init_io(&s->port_io, OBJECT(s), &megasas_port_ops, s,

                          "megasas-io", 256);

    memory_region_init_io(&s->queue_io, NULL, &megasas_queue_ops, s,

    memory_region_init_io(&s->queue_io, OBJECT(s), &megasas_queue_ops, s,

                          "megasas-queue", 0x40000);



#ifdef USE_MSIX

hw/scsi/vmw_pvscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ pvscsi_init(PCIDevice *pci_dev) 
    /* Interrupt pin A */

    pci_config_set_interrupt_pin(pci_dev->config, 1);



    memory_region_init_io(&s->io_space, NULL, &pvscsi_ops, s,

    memory_region_init_io(&s->io_space, OBJECT(s), &pvscsi_ops, s,

                          "pvscsi-io", PVSCSI_MEM_SPACE_SIZE);

    pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->io_space);