aboutsummaryrefslogtreecommitdiff
path: root/hw/armv7m.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-14 04:21:52 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit4bd7466166b8c1b612c7f01a124b24ab2a0ace14 (patch)
tree75891417cf185f4ea58b7d60d3e5ebccb33c9e86 /hw/armv7m.c
parent3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a (diff)
arm_pic: Pass ARMCPU to arm_pic_init_cpu()
Pass it through to arm_pic_cpu_handler(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
Diffstat (limited to 'hw/armv7m.c')
-rw-r--r--hw/armv7m.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c
index 418139aa08..8cec78db96 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -215,7 +215,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
nvic = qdev_create(NULL, "armv7m_nvic");
env->nvic = nvic;
qdev_init_nofail(nvic);
- cpu_pic = arm_pic_init_cpu(env);
+ cpu_pic = arm_pic_init_cpu(cpu);
sysbus_connect_irq(sysbus_from_qdev(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]);
for (i = 0; i < 64; i++) {
pic[i] = qdev_get_gpio_in(nvic, i);