From 2c9b15cab12c21e32dffb67c5e18f3dc407ca224 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 6 Jun 2013 05:41:28 -0400 Subject: memory: add owner argument to initialization functions Signed-off-by: Paolo Bonzini --- hw/timer/lm32_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/timer/lm32_timer.c') diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index e06fac7..2ab8588 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -180,7 +180,7 @@ static int lm32_timer_init(SysBusDevice *dev) s->ptimer = ptimer_init(s->bh); ptimer_set_freq(s->ptimer, s->freq_hz); - memory_region_init_io(&s->iomem, &timer_ops, s, "timer", R_MAX * 4); + memory_region_init_io(&s->iomem, NULL, &timer_ops, s, "timer", R_MAX * 4); sysbus_init_mmio(dev, &s->iomem); return 0; -- cgit v1.1 From 853dca12055ea74994629d06798165d811c5e1e2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 6 Jun 2013 21:25:08 -0400 Subject: hw/t*: pass owner to memory_region_init* functions Signed-off-by: Paolo Bonzini --- hw/timer/lm32_timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/timer/lm32_timer.c') diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 2ab8588..016dade 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -180,7 +180,8 @@ static int lm32_timer_init(SysBusDevice *dev) s->ptimer = ptimer_init(s->bh); ptimer_set_freq(s->ptimer, s->freq_hz); - memory_region_init_io(&s->iomem, NULL, &timer_ops, s, "timer", R_MAX * 4); + memory_region_init_io(&s->iomem, OBJECT(s), &timer_ops, s, + "timer", R_MAX * 4); sysbus_init_mmio(dev, &s->iomem); return 0; -- cgit v1.1