Commit 40c5dce9 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/p*: pass owner to memory_region_init* functions 



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

hw/pci-bridge/dec.c

+2 −2
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ static int pci_dec_21154_device_init(SysBusDevice *dev) 


    phb = PCI_HOST_BRIDGE(dev);



    memory_region_init_io(&phb->conf_mem, NULL, &pci_host_conf_le_ops,

    memory_region_init_io(&phb->conf_mem, OBJECT(dev), &pci_host_conf_le_ops,

                          dev, "pci-conf-idx", 0x1000);

    memory_region_init_io(&phb->data_mem, NULL, &pci_host_data_le_ops,

    memory_region_init_io(&phb->data_mem, OBJECT(dev), &pci_host_data_le_ops,

                          dev, "pci-data-idx", 0x1000);

    sysbus_init_mmio(dev, &phb->conf_mem);

    sysbus_init_mmio(dev, &phb->data_mem);

hw/pci-bridge/pci_bridge_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int pci_bridge_dev_initfn(PCIDevice *dev) 
    if (err) {

        goto bridge_error;

    }

    memory_region_init(&bridge_dev->bar, NULL, "shpc-bar", shpc_bar_size(dev));

    memory_region_init(&bridge_dev->bar, OBJECT(dev), "shpc-bar", shpc_bar_size(dev));

    err = shpc_init(dev, &br->sec_bus, &bridge_dev->bar, 0);

    if (err) {

        goto shpc_error;

hw/pci-host/apb.c

+6 −6
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ PCIBus *pci_apb_init(hwaddr special_base, 
    sysbus_mmio_map(s, 2, special_base + 0x2000000ULL);

    d = FROM_SYSBUS(APBState, s);



    memory_region_init(&d->pci_mmio, NULL, "pci-mmio", 0x100000000ULL);

    memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);

    memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);



    d->bus = pci_register_bus(&d->busdev.qdev, "pci",
@@ -525,18 +525,18 @@ static int pci_pbm_init_device(SysBusDevice *dev) 
    s->pci_irq_in = 0ULL;



    /* apb_config */

    memory_region_init_io(&s->apb_config, NULL, &apb_config_ops, s, "apb-config",

                          0x10000);

    memory_region_init_io(&s->apb_config, OBJECT(s), &apb_config_ops, s,

                          "apb-config", 0x10000);

    /* at region 0 */

    sysbus_init_mmio(dev, &s->apb_config);



    memory_region_init_io(&s->pci_config, NULL, &pci_config_ops, s, "apb-pci-config",

                          0x1000000);

    memory_region_init_io(&s->pci_config, OBJECT(s), &pci_config_ops, s,

                          "apb-pci-config", 0x1000000);

    /* at region 1 */

    sysbus_init_mmio(dev, &s->pci_config);



    /* pci_ioport */

    memory_region_init_io(&s->pci_ioport, NULL, &pci_ioport_ops, s,

    memory_region_init_io(&s->pci_ioport, OBJECT(s), &pci_ioport_ops, s,

                          "apb-pci-ioport", 0x10000);

    /* at region 2 */

    sysbus_init_mmio(dev, &s->pci_ioport);

hw/pci-host/bonito.c

+5 −5
Original line number Diff line number Diff line
@@ -722,29 +722,29 @@ static int bonito_initfn(PCIDevice *dev) 
    pci_config_set_prog_interface(dev->config, 0x00);



    /* set the north bridge register mapping */

    memory_region_init_io(&s->iomem, NULL, &bonito_ops, s,

    memory_region_init_io(&s->iomem, OBJECT(s), &bonito_ops, s,

                          "north-bridge-register", BONITO_INTERNAL_REG_SIZE);

    sysbus_init_mmio(sysbus, &s->iomem);

    sysbus_mmio_map(sysbus, 0, BONITO_INTERNAL_REG_BASE);



    /* set the north bridge pci configure  mapping */

    memory_region_init_io(&phb->conf_mem, NULL, &bonito_pciconf_ops, s,

    memory_region_init_io(&phb->conf_mem, OBJECT(s), &bonito_pciconf_ops, s,

                          "north-bridge-pci-config", BONITO_PCICONFIG_SIZE);

    sysbus_init_mmio(sysbus, &phb->conf_mem);

    sysbus_mmio_map(sysbus, 1, BONITO_PCICONFIG_BASE);



    /* set the south bridge pci configure  mapping */

    memory_region_init_io(&phb->data_mem, NULL, &bonito_spciconf_ops, s,

    memory_region_init_io(&phb->data_mem, OBJECT(s), &bonito_spciconf_ops, s,

                          "south-bridge-pci-config", BONITO_SPCICONFIG_SIZE);

    sysbus_init_mmio(sysbus, &phb->data_mem);

    sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE);



    memory_region_init_io(&s->iomem_ldma, NULL, &bonito_ldma_ops, s,

    memory_region_init_io(&s->iomem_ldma, OBJECT(s), &bonito_ldma_ops, s,

                          "ldma", 0x100);

    sysbus_init_mmio(sysbus, &s->iomem_ldma);

    sysbus_mmio_map(sysbus, 3, 0xbfe00200);



    memory_region_init_io(&s->iomem_cop, NULL, &bonito_cop_ops, s,

    memory_region_init_io(&s->iomem_cop, OBJECT(s), &bonito_cop_ops, s,

                          "cop", 0x100);

    sysbus_init_mmio(sysbus, &s->iomem_cop);

    sysbus_mmio_map(sysbus, 4, 0xbfe00300);

hw/pci-host/grackle.c

+4 −4
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, 
    phb = PCI_HOST_BRIDGE(dev);

    d = GRACKLE_PCI_HOST_BRIDGE(dev);



    memory_region_init(&d->pci_mmio, NULL, "pci-mmio", 0x100000000ULL);

    memory_region_init_alias(&d->pci_hole, NULL, "pci-hole", &d->pci_mmio,

    memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);

    memory_region_init_alias(&d->pci_hole, OBJECT(s), "pci-hole", &d->pci_mmio,

                             0x80000000ULL, 0x7e000000ULL);

    memory_region_add_subregion(address_space_mem, 0x80000000ULL,

                                &d->pci_hole);
@@ -104,9 +104,9 @@ static int pci_grackle_init_device(SysBusDevice *dev) 


    phb = PCI_HOST_BRIDGE(dev);



    memory_region_init_io(&phb->conf_mem, NULL, &pci_host_conf_le_ops,

    memory_region_init_io(&phb->conf_mem, OBJECT(dev), &pci_host_conf_le_ops,

                          dev, "pci-conf-idx", 0x1000);

    memory_region_init_io(&phb->data_mem, NULL, &pci_host_data_le_ops,

    memory_region_init_io(&phb->data_mem, OBJECT(dev), &pci_host_data_le_ops,

                          dev, "pci-data-idx", 0x1000);

    sysbus_init_mmio(dev, &phb->conf_mem);

    sysbus_init_mmio(dev, &phb->data_mem);