From: Andreas Färber <afaerber@suse.de>
Date: Fri, 4 May 2012 17:03:24 +0000 (+0200)
Subject: milkymist: Use cpu_lm32_init() to obtain LM32CPU
X-Git-Tag: v1.2.0-rc0~315^2~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1328cc01f18b416666cdc65c72efec33a6dce396;p=thirdparty%2Fqemu.git

milkymist: Use cpu_lm32_init() to obtain LM32CPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
---

diff --git a/hw/milkymist.c b/hw/milkymist.c
index 8bb6a97b22b..59f37b44298 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -79,6 +79,7 @@ milkymist_init(ram_addr_t ram_size_not_used,
                           const char *kernel_cmdline,
                           const char *initrd_filename, const char *cpu_model)
 {
+    LM32CPU *cpu;
     CPULM32State *env;
     int kernel_size;
     DriveInfo *dinfo;
@@ -105,7 +106,8 @@ milkymist_init(ram_addr_t ram_size_not_used,
     if (cpu_model == NULL) {
         cpu_model = "lm32-full";
     }
-    env = cpu_init(cpu_model);
+    cpu = cpu_lm32_init(cpu_model);
+    env = &cpu->env;
     reset_info->env = env;
 
     cpu_lm32_set_phys_msb_ignore(env, 1);