summaryrefslogtreecommitdiff
path: root/hw/milkymist.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 19:03:24 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:41 +0200
commit1328cc01f18b416666cdc65c72efec33a6dce396 (patch)
treee3e7fc6d24c7c69b27150c5bd871843a91ba44ac /hw/milkymist.c
parentb143559655d0b558627cd7b6f71ad350451e3b3b (diff)
downloadqemu-1328cc01f18b416666cdc65c72efec33a6dce396.tar.gz
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>
Diffstat (limited to 'hw/milkymist.c')
-rw-r--r--hw/milkymist.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 8bb6a97b22..59f37b4429 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);