From: Andreas Färber <afaerber@suse.de>
Date: Fri, 4 May 2012 14:09:50 +0000 (+0200)
Subject: armv7m: Use cpu_arm_init() to obtain ARMCPU
X-Git-Tag: v1.2.0-rc0~315^2~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f37c99b27b7e89c77d30c82f46485fd2bc61ab8;p=thirdparty%2Fqemu.git

armv7m: Use cpu_arm_init() to obtain ARMCPU

Needed for armv7m_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/armv7m.c b/hw/armv7m.c
index 4aac076e48a..4e5971c5750 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -160,6 +160,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
                       int flash_size, int sram_size,
                       const char *kernel_filename, const char *cpu_model)
 {
+    ARMCPU *cpu;
     CPUARMState *env;
     DeviceState *nvic;
     /* FIXME: make this local state.  */
@@ -177,13 +178,15 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
     flash_size *= 1024;
     sram_size *= 1024;
 
-    if (!cpu_model)
+    if (cpu_model == NULL) {
 	cpu_model = "cortex-m3";
-    env = cpu_init(cpu_model);
-    if (!env) {
+    }
+    cpu = cpu_arm_init(cpu_model);
+    if (cpu == NULL) {
         fprintf(stderr, "Unable to find CPU definition\n");
         exit(1);
     }
+    env = &cpu->env;
 
 #if 0
     /* > 32Mb SRAM gets complicated because it overlaps the bitband area.