Commit 3c161542 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/m*: pass owner to memory_region_init* functions 



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

hw/mips/gt64xxx_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ PCIBus *gt64120_register(qemu_irq *pic) 
                                get_system_memory(),

                                get_system_io(),

                                PCI_DEVFN(18, 0), 4, TYPE_PCI_BUS);

    memory_region_init_io(&d->ISD_mem, NULL, &isd_mem_ops, d, "isd-mem", 0x1000);

    memory_region_init_io(&d->ISD_mem, OBJECT(dev), &isd_mem_ops, d, "isd-mem", 0x1000);



    pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "gt64120_pci");

    return phb->bus;

hw/misc/a9scu.c

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static void a9_scu_realize(DeviceState *dev, Error ** errp) 
    A9SCUState *s = A9_SCU(dev);

    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);



    memory_region_init_io(&s->iomem, NULL, &a9_scu_ops, s, "a9-scu", 0x100);

    memory_region_init_io(&s->iomem, OBJECT(dev), &a9_scu_ops, s,

                          "a9-scu", 0x100);

    sysbus_init_mmio(sbd, &s->iomem);

}

hw/misc/applesmc.c

+2 −2
Original line number Diff line number Diff line
@@ -230,12 +230,12 @@ static void applesmc_isa_realize(DeviceState *dev, Error **errp) 
{

    AppleSMCState *s = APPLE_SMC(dev);



    memory_region_init_io(&s->io_data, NULL, &applesmc_data_io_ops, s,

    memory_region_init_io(&s->io_data, OBJECT(s), &applesmc_data_io_ops, s,

                          "applesmc-data", 4);

    isa_register_ioport(&s->parent_obj, &s->io_data,

                        s->iobase + APPLESMC_DATA_PORT);



    memory_region_init_io(&s->io_cmd, NULL, &applesmc_cmd_io_ops, s,

    memory_region_init_io(&s->io_cmd, OBJECT(s), &applesmc_cmd_io_ops, s,

                          "applesmc-cmd", 4);

    isa_register_ioport(&s->parent_obj, &s->io_cmd,

                        s->iobase + APPLESMC_CMD_PORT);

hw/misc/arm_l2x0.c

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ static int l2x0_priv_init(SysBusDevice *dev) 
{

    l2x0_state *s = FROM_SYSBUS(l2x0_state, dev);



    memory_region_init_io(&s->iomem, NULL, &l2x0_mem_ops, s, "l2x0_cc", 0x1000);

    memory_region_init_io(&s->iomem, OBJECT(dev), &l2x0_mem_ops, s,

                          "l2x0_cc", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    return 0;

}

hw/misc/arm_sysctl.c

+2 −1
Original line number Diff line number Diff line
@@ -589,7 +589,8 @@ static void arm_sysctl_init(Object *obj) 
    SysBusDevice *sd = SYS_BUS_DEVICE(obj);

    arm_sysctl_state *s = FROM_SYSBUS(arm_sysctl_state, sd);



    memory_region_init_io(&s->iomem, NULL, &arm_sysctl_ops, s, "arm-sysctl", 0x1000);

    memory_region_init_io(&s->iomem, OBJECT(dev), &arm_sysctl_ops, s,

                          "arm-sysctl", 0x1000);

    sysbus_init_mmio(sd, &s->iomem);

    qdev_init_gpio_in(dev, arm_sysctl_gpio_set, 2);

    qdev_init_gpio_out(dev, &s->pl110_mux_ctrl, 1);