diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-06 21:25:08 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-07-04 17:42:48 +0200 |
| commit | 853dca12055ea74994629d06798165d811c5e1e2 (patch) | |
| tree | 7393d45ca718837aa7c6e97fe9e894fe4e78b1e8 /hw/timer/arm_mptimer.c | |
| parent | 2977673992b7d363d0f402ee7c4217795fe13809 (diff) | |
| download | qemu-853dca12055ea74994629d06798165d811c5e1e2.zip qemu-853dca12055ea74994629d06798165d811c5e1e2.tar.gz qemu-853dca12055ea74994629d06798165d811c5e1e2.tar.bz2 | |
hw/t*: pass owner to memory_region_init* functions
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/timer/arm_mptimer.c')
| -rw-r--r-- | hw/timer/arm_mptimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index e78f820..d23462d 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -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); } |