diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
| commit | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (patch) | |
| tree | fe43017f2bf431bc55a90b28e6c0e9357c4d46bd /hw/arm-misc.h | |
| parent | 444dc48298c480e42e15a8fe676be737d8a6b2a1 (diff) | |
| parent | 2b90ca040c59d73943061e49f39455964e8af158 (diff) | |
| download | focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.gz focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/arm-misc.h')
| -rw-r--r-- | hw/arm-misc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h index f8a747289b..af403a159a 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -11,13 +11,16 @@ #ifndef ARM_MISC_H #define ARM_MISC_H 1 +#include "memory.h" + /* The CPU is also modeled as an interrupt controller. */ #define ARM_PIC_CPU_IRQ 0 #define ARM_PIC_CPU_FIQ 1 qemu_irq *arm_pic_init_cpu(CPUState *env); /* armv7m.c */ -qemu_irq *armv7m_init(int flash_size, int sram_size, +qemu_irq *armv7m_init(MemoryRegion *address_space_mem, + int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model); /* arm_boot.c */ |