Commit 1437c94b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/i*: pass owner to memory_region_init* functions 



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

hw/i2c/bitbang_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int gpio_i2c_init(SysBusDevice *dev) 
    GPIOI2CState *s = FROM_SYSBUS(GPIOI2CState, dev);

    i2c_bus *bus;



    memory_region_init(&s->dummy_iomem, NULL, "gpio_i2c", 0);

    memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0);

    sysbus_init_mmio(dev, &s->dummy_iomem);



    bus = i2c_init_bus(&dev->qdev, "i2c");

hw/i2c/exynos4210_i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -301,8 +301,8 @@ static int exynos4210_i2c_realize(SysBusDevice *dev) 
{

    Exynos4210I2CState *s = EXYNOS4_I2C(dev);



    memory_region_init_io(&s->iomem, NULL, &exynos4210_i2c_ops, s, TYPE_EXYNOS4_I2C,

                          EXYNOS4_I2C_MEM_SIZE);

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

                          TYPE_EXYNOS4_I2C, EXYNOS4_I2C_MEM_SIZE);

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);

    s->bus = i2c_init_bus(&dev->qdev, "i2c");

hw/i2c/omap_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int omap_i2c_init(SysBusDevice *dev) 
    sysbus_init_irq(dev, &s->irq);

    sysbus_init_irq(dev, &s->drq[0]);

    sysbus_init_irq(dev, &s->drq[1]);

    memory_region_init_io(&s->iomem, NULL, &omap_i2c_ops, s, "omap.i2c",

    memory_region_init_io(&s->iomem, OBJECT(s), &omap_i2c_ops, s, "omap.i2c",

                          (s->revision < OMAP2_INTR_REV) ? 0x800 : 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    s->bus = i2c_init_bus(&dev->qdev, NULL);

hw/i2c/pm_smbus.c

+2 −1
Original line number Diff line number Diff line
@@ -181,5 +181,6 @@ static const MemoryRegionOps pm_smbus_ops = { 
void pm_smbus_init(DeviceState *parent, PMSMBus *smb)

{

    smb->smbus = i2c_init_bus(parent, "i2c");

    memory_region_init_io(&smb->io, NULL, &pm_smbus_ops, smb, "pm-smbus", 64);

    memory_region_init_io(&smb->io, OBJECT(parent), &pm_smbus_ops, smb,

                          "pm-smbus", 64);

}

hw/i2c/versatile_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int versatile_i2c_init(SysBusDevice *dev) 


    bus = i2c_init_bus(&dev->qdev, "i2c");

    s->bitbang = bitbang_i2c_init(bus);

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

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

                          "versatile_i2c", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    return 0;