commit 0633879f1ac38b18d84c46dda506300cc8329723
author pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 23 19:58:11 2007 +0000
committer pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 23 19:58:11 2007 +0000
tree 8df64e0861c32132c7a08af16451629f1ec69112
parent 9daea9067aae3e324f14c6b139621c10683fc550

m68k/ColdFire system emulation.


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

linux-user/main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index ccb8c26..0f4dbda 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1977,13 +1977,12 @@
     }
 #elif defined(TARGET_M68K)
     {
-        m68k_def_t *def;
-        def = m68k_find_by_name("cfv4e");
-        if (def == NULL) {
+        if (cpu_model == NULL)
+            cpu_model = "cfv4e";
+        if (cpu_m68k_set_model(env, cpu_model)) {
             cpu_abort(cpu_single_env,
                       "Unable to find m68k CPU definition\n");
         }
-        cpu_m68k_register(cpu_single_env, def);
         env->pc = regs->pc;
         env->dregs[0] = regs->d0;
         env->dregs[1] = regs->d1;