X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=linux-user%2Fmain.c;h=0c5e6b5b431de2f7151e13ffa88cb77694545eab;hb=c35734b2a6f9b028edacd5813ff271728ce2a9e3;hp=b5a0247c4fdcd51fa32772602eed2bff54bda552;hpb=b1f9be3157368392b62d5c4213413d5adddd015b;p=qemu

diff --git a/linux-user/main.c b/linux-user/main.c
index b5a0247..0c5e6b5 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1644,7 +1644,7 @@ int main(int argc, char **argv)
 #elif defined(TARGET_MIPS)
                 mips_cpu_list(stdout, &fprintf);
 #endif
-                exit(1);
+                _exit(1);
             }
         } else 
 #ifdef USE_CODE_COPY
@@ -1849,9 +1849,17 @@ int main(int argc, char **argv)
     }
 #elif defined(TARGET_MIPS)
     {
+        mips_def_t *def;
         int i;
 
-        /* XXX: set CPU model */
+        /* Choose and initialise CPU */
+        if (cpu_model == NULL)
+            cpu_model = "24Kf";
+        mips_find_by_name(cpu_model, &def);
+        if (def == NULL)
+            cpu_abort(env, "Unable to find MIPS CPU definition\n");
+        cpu_mips_register(env, def);
+
         for(i = 0; i < 32; i++) {
             env->gpr[i] = regs->regs[i];
         }