Revision cd08ce8f hw/dummy_m68k.c

b/hw/dummy_m68k.c
12 12

  
13 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 18
                     const char *kernel_filename, const char *kernel_cmdline,
18 19
                     const char *initrd_filename, const char *cpu_model)
19 20
{
......
22 23
    uint64_t elf_entry;
23 24
    target_ulong entry;
24 25

  
25
    env = cpu_init();
26 26
    if (!cpu_model)
27 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 34
    /* Initialize CPU registers.  */

Also available in: Unified diff