summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 13:54:41 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:43 +0200
commitf0f803669701a39e29f0daf62a729f7f3954a2a3 (patch)
tree95f9e15be858d29210213c44149e2c3379692371
parent30bf942d8cd822b22530be602084a0810db45936 (diff)
downloadfocaccia-qemu-f0f803669701a39e29f0daf62a729f7f3954a2a3.tar.gz
focaccia-qemu-f0f803669701a39e29f0daf62a729f7f3954a2a3.zip
mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/mips_fulong2e.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 1a8df10429..08d3aa0eb8 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -272,17 +272,19 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
     i2c_bus *smbus;
     int i;
     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    MIPSCPU *cpu;
     CPUMIPSState *env;
 
     /* init CPUs */
     if (cpu_model == NULL) {
         cpu_model = "Loongson-2E";
     }
-    env = cpu_init(cpu_model);
-    if (!env) {
+    cpu = cpu_mips_init(cpu_model);
+    if (cpu == NULL) {
         fprintf(stderr, "Unable to find CPU definition\n");
         exit(1);
     }
+    env = &cpu->env;
 
     qemu_register_reset(main_cpu_reset, env);