diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 19:21:30 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 19:21:30 +0000 |
| commit | cd08ce8f3622e0ddee4a38ad9dfd919a54782228 (patch) | |
| tree | 955ff3de411d689452bda9cb285706fe7219dea4 /hw/dummy_m68k.c | |
| parent | ca02f31955113212eb250a3c58c7ab26b1a2a8df (diff) | |
| download | focaccia-qemu-cd08ce8f3622e0ddee4a38ad9dfd919a54782228.tar.gz focaccia-qemu-cd08ce8f3622e0ddee4a38ad9dfd919a54782228.zip | |
Fix build failure.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3568 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/dummy_m68k.c')
| -rw-r--r-- | hw/dummy_m68k.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index 6305915087..7225547114 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. */ |