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

hw/d*: pass owner to memory_region_init* functions 



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

hw/display/cirrus_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -2967,7 +2967,7 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) 


     /* setup PCI */



    memory_region_init(&s->pci_bar, NULL, "cirrus-pci-bar0", 0x2000000);

    memory_region_init(&s->pci_bar, OBJECT(dev), "cirrus-pci-bar0", 0x2000000);



    /* XXX: add byte swapping apertures */

    memory_region_add_subregion(&s->pci_bar, 0, &s->cirrus_linear_io);

hw/display/exynos4210_fimd.c

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

    sysbus_init_irq(dev, &s->irq[2]);



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

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

            "exynos4210.fimd", FIMD_REGS_SIZE);

    sysbus_init_mmio(dev, &s->iomem);

    s->console = graphic_console_init(DEVICE(dev), &exynos4210_fimd_ops, s);

hw/display/jazz_led.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int jazz_led_init(SysBusDevice *dev) 
{

    LedState *s = FROM_SYSBUS(LedState, dev);



    memory_region_init_io(&s->iomem, NULL, &led_ops, s, "led", 1);

    memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);

    sysbus_init_mmio(dev, &s->iomem);



    s->con = graphic_console_init(DEVICE(dev), &jazz_led_ops, s);

hw/display/milkymist-tmu2.c

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


    sysbus_init_irq(dev, &s->irq);



    memory_region_init_io(&s->regs_region, NULL, &tmu2_mmio_ops, s,

    memory_region_init_io(&s->regs_region, OBJECT(s), &tmu2_mmio_ops, s,

            "milkymist-tmu2", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);

hw/display/milkymist-vgafb.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int milkymist_vgafb_init(SysBusDevice *dev) 
{

    MilkymistVgafbState *s = FROM_SYSBUS(typeof(*s), dev);



    memory_region_init_io(&s->regs_region, NULL, &vgafb_mmio_ops, s,

    memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s,

            "milkymist-vgafb", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);