gwj / at91sam9263 · Commits

Commit cd08ce8f3622e0ddee4a38ad9dfd919a54782228

Authored by pbrook
1 parent ca02f319

Fix build failure. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3568 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 7 additions and 5 deletions
hw/dummy_m68k.c
  View file @cd08ce8
@@ -12,8 +12,9 @@ @@ -12,8 +12,9 @@
12 12
13 /* Board init. */ 13 /* Board init. */
14 14
15 -static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device,  
16 - DisplayState *ds, const char **fd_filename, int snapshot, 15 +static void dummy_m68k_init(int ram_size, int vga_ram_size,
  16 + const char *boot_device, DisplayState *ds,
  17 + const char **fd_filename, int snapshot,
17 const char *kernel_filename, const char *kernel_cmdline, 18 const char *kernel_filename, const char *kernel_cmdline,
18 const char *initrd_filename, const char *cpu_model) 19 const char *initrd_filename, const char *cpu_model)
19 { 20 {
@@ -22,11 +23,12 @@ static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device, @@ -22,11 +23,12 @@ static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device,
22 uint64_t elf_entry; 23 uint64_t elf_entry;
23 target_ulong entry; 24 target_ulong entry;
24 25
25 - env = cpu_init();  
26 if (!cpu_model) 26 if (!cpu_model)
27 cpu_model = "cfv4e"; 27 cpu_model = "cfv4e";
28 - if (cpu_m68k_set_model(env, cpu_model)) {  
29 - cpu_abort(env, "Unable to find m68k CPU definition\n"); 28 + env = cpu_init(cpu_model);
  29 + if (!env) {
  30 + fprintf(stderr, "Unable to find m68k CPU definition\n");
  31 + exit(1);
30 } 32 }
31 33
32 /* Initialize CPU registers. */ 34 /* Initialize CPU registers. */