diff options
| author | Avi Kivity | 2011-08-15 16:17:17 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-22 17:20:10 +0200 |
| commit | 755c08022507c451d33135eca2a0d2c8a8b78286 (patch) | |
| tree | 8cb50342278c6dd5ea490debac7ee69bc5fc5238 /hw/armv7m_nvic.c | |
| parent | apic: convert to memory API (diff) | |
| download | qemu-755c08022507c451d33135eca2a0d2c8a8b78286.tar.gz qemu-755c08022507c451d33135eca2a0d2c8a8b78286.tar.xz qemu-755c08022507c451d33135eca2a0d2c8a8b78286.zip | |
arm_gic: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/armv7m_nvic.c')
| -rw-r--r-- | hw/armv7m_nvic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 1df8d4db45..bf8c3c50dc 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -13,6 +13,7 @@ #include "sysbus.h" #include "qemu-timer.h" #include "arm-misc.h" +#include "exec-memory.h" /* 32 internal lines (16 used for system exceptions) plus 64 external interrupt lines. */ @@ -384,7 +385,7 @@ static int armv7m_nvic_init(SysBusDevice *dev) nvic_state *s= FROM_SYSBUSGIC(nvic_state, dev); gic_init(&s->gic); - cpu_register_physical_memory(0xe000e000, 0x1000, s->gic.iomemtype); + memory_region_add_subregion(get_system_memory(), 0xe000e000, &s->gic.iomem); s->systick.timer = qemu_new_timer_ns(vm_clock, systick_timer_tick, s); vmstate_register(&dev->qdev, -1, &vmstate_nvic, s); return 0; |