]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Fix build failure.
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Sat, 10 Nov 2007 19:21:30 +0000 (19:21 +0000)
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Sat, 10 Nov 2007 19:21:30 +0000 (19:21 +0000)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3568 c046a42c-6fe2-441c-8c8c-71466251a162

hw/dummy_m68k.c

index 63059150879174926f1f435cd4effd6c4a4d05f7..72255471142ff48d3dfd9073b8807e09cf911374 100644 (file)
@@ -12,8 +12,9 @@
 
 /* Board init.  */
 
-static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device,
-                     DisplayState *ds, const char **fd_filename, int snapshot,
+static void dummy_m68k_init(int ram_size, int vga_ram_size,
+                     const char *boot_device, DisplayState *ds,
+                     const char **fd_filename, int snapshot,
                      const char *kernel_filename, const char *kernel_cmdline,
                      const char *initrd_filename, const char *cpu_model)
 {
@@ -22,11 +23,12 @@ static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device,
     uint64_t elf_entry;
     target_ulong entry;
 
-    env = cpu_init();
     if (!cpu_model)
         cpu_model = "cfv4e";
-    if (cpu_m68k_set_model(env, cpu_model)) {
-        cpu_abort(env, "Unable to find m68k CPU definition\n");
+    env = cpu_init(cpu_model);
+    if (!env) {
+        fprintf(stderr, "Unable to find m68k CPU definition\n");
+        exit(1);
     }
 
     /* Initialize CPU registers.  */