Commit 853dca12 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/t*: pass owner to memory_region_init* functions 



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

hw/timer/arm_mptimer.c

+2 −2
Original line number Diff line number Diff line
@@ -236,14 +236,14 @@ static int arm_mptimer_init(SysBusDevice *dev) 
     *  * timer for core 1

     * and so on.

     */

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

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

                          "arm_mptimer_timer", 0x20);

    sysbus_init_mmio(dev, &s->iomem);

    for (i = 0; i < s->num_cpu; i++) {

        TimerBlock *tb = &s->timerblock[i];

        tb->timer = qemu_new_timer_ns(vm_clock, timerblock_tick, tb);

        sysbus_init_irq(dev, &tb->irq);

        memory_region_init_io(&tb->iomem, NULL, &timerblock_ops, tb,

        memory_region_init_io(&tb->iomem, OBJECT(s), &timerblock_ops, tb,

                              "arm_mptimer_timerblock", 0x20);

        sysbus_init_mmio(dev, &tb->iomem);

    }

hw/timer/arm_timer.c

+4 −2
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ static int sp804_init(SysBusDevice *dev) 
    s->timer[1] = arm_timer_init(s->freq1);

    s->timer[0]->irq = qi[0];

    s->timer[1]->irq = qi[1];

    memory_region_init_io(&s->iomem, NULL, &sp804_ops, s, "sp804", 0x1000);

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

                          "sp804", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    vmstate_register(&dev->qdev, -1, &vmstate_sp804, s);

    return 0;
@@ -347,7 +348,8 @@ static int icp_pit_init(SysBusDevice *dev) 
    sysbus_init_irq(dev, &s->timer[1]->irq);

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



    memory_region_init_io(&s->iomem, NULL, &icp_pit_ops, s, "icp_pit", 0x1000);

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

                          "icp_pit", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    /* This device has no state to save/restore.  The component timers will

       save themselves.  */

hw/timer/cadence_ttc.c

+2 −1
Original line number Diff line number Diff line
@@ -409,7 +409,8 @@ static int cadence_ttc_init(SysBusDevice *dev) 
        sysbus_init_irq(dev, &s->timer[i].irq);

    }



    memory_region_init_io(&s->iomem, NULL, &cadence_ttc_ops, s, "timer", 0x1000);

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

                          "timer", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);



    return 0;

hw/timer/etraxfs_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ static int etraxfs_timer_init(SysBusDevice *dev) 
    sysbus_init_irq(dev, &t->irq);

    sysbus_init_irq(dev, &t->nmi);



    memory_region_init_io(&t->mmio, NULL, &timer_ops, t, "etraxfs-timer", 0x5c);

    memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t,

                          "etraxfs-timer", 0x5c);

    sysbus_init_mmio(dev, &t->mmio);

    qemu_register_reset(etraxfs_timer_reset, t);

    return 0;

hw/timer/exynos4210_mct.c

+2 −2
Original line number Diff line number Diff line
@@ -1449,8 +1449,8 @@ static int exynos4210_mct_init(SysBusDevice *dev) 
        sysbus_init_irq(dev, &s->l_timer[i].irq);

    }



    memory_region_init_io(&s->iomem, NULL, &exynos4210_mct_ops, s, "exynos4210-mct",

            MCT_SFR_SIZE);

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

                          "exynos4210-mct", MCT_SFR_SIZE);

    sysbus_init_mmio(dev, &s->iomem);



    return 0;