From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 10 Nov 2007 19:21:30 +0000 (+0000)
Subject: Fix build failure.
X-Git-Tag: xen-3.3.0-rc1~791
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cd08ce8f3622e0ddee4a38ad9dfd919a54782228;p=qemu-xen-3.3-testing.git

Fix build failure.


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

diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 63059150..72255471 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -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.  */