commit aaed909a495e78364abc6812df672d2e764961a8
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 10 15:15:54 2007 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 10 15:15:54 2007 +0000
tree 704ab4280f250fa310bee6a3d0ba94e5417daef3
parent 7d77bf200682ed8cbd0c94bdfbac64dc4b23b149

added cpu_model parameter to cpu_init()


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3562 c046a42c-6fe2-441c-8c8c-71466251a162

hw/mips_r4k.c

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index e4817e6..5a8bf6c 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -135,7 +135,6 @@
 {
     CPUState *env = opaque;
     cpu_reset(env);
-    cpu_mips_register(env, NULL);
 
     if (loaderparams.kernel_filename)
         load_kernel (env);
@@ -164,10 +163,11 @@
         cpu_model = "24Kf";
 #endif
     }
-    if (mips_find_by_name(cpu_model, &def) != 0)
-        def = NULL;
-    env = cpu_init();
-    cpu_mips_register(env, def);
+    env = cpu_init(cpu_model);
+    if (!env) {
+        fprintf(stderr, "Unable to find CPU definition\n");
+        exit(1);
+    }
     register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
     qemu_register_reset(main_cpu_reset, env);