Commit 300b1fc6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/c*: pass owner to memory_region_init* functions 



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

hw/char/cadence_uart.c

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

    UartState *s = FROM_SYSBUS(UartState, dev);



    memory_region_init_io(&s->iomem, NULL, &uart_ops, s, "uart", 0x1000);

    memory_region_init_io(&s->iomem, OBJECT(s), &uart_ops, s, "uart", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);

hw/char/debugcon.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void debugcon_isa_realizefn(DeviceState *dev, Error **errp) 
        error_propagate(errp, err);

        return;

    }

    memory_region_init_io(&s->io, NULL, &debugcon_ops, s,

    memory_region_init_io(&s->io, OBJECT(dev), &debugcon_ops, s,

                          TYPE_ISA_DEBUGCON_DEVICE, 1);

    memory_region_add_subregion(isa_address_space_io(d),

                                isa->iobase, &s->io);

hw/char/escc.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static int escc_init1(SysBusDevice *dev) 
    s->chn[0].otherchn = &s->chn[1];

    s->chn[1].otherchn = &s->chn[0];



    memory_region_init_io(&s->mmio, NULL, &escc_mem_ops, s, "escc",

    memory_region_init_io(&s->mmio, OBJECT(s), &escc_mem_ops, s, "escc",

                          ESCC_SIZE << s->it_shift);

    sysbus_init_mmio(dev, &s->mmio);

hw/char/etraxfs_ser.c

+2 −1
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ static int etraxfs_ser_init(SysBusDevice *dev) 
    struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev);



    sysbus_init_irq(dev, &s->irq);

    memory_region_init_io(&s->mmio, NULL, &ser_ops, s, "etraxfs-serial", R_MAX * 4);

    memory_region_init_io(&s->mmio, OBJECT(s), &ser_ops, s,

                          "etraxfs-serial", R_MAX * 4);

    sysbus_init_mmio(dev, &s->mmio);



    s->chr = qemu_char_get_next_serial();

hw/char/exynos4210_uart.c

+2 −2
Original line number Diff line number Diff line
@@ -630,8 +630,8 @@ static int exynos4210_uart_init(SysBusDevice *dev) 
    Exynos4210UartState *s = FROM_SYSBUS(Exynos4210UartState, dev);



    /* memory mapping */

    memory_region_init_io(&s->iomem, NULL, &exynos4210_uart_ops, s, "exynos4210.uart",

                          EXYNOS4210_UART_REGS_MEM_SIZE);

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

                          "exynos4210.uart", EXYNOS4210_UART_REGS_MEM_SIZE);

    sysbus_init_mmio(dev, &s->iomem);



    sysbus_init_irq(dev, &s->irq);