diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-08 02:35:15 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-08 02:35:15 +0100 |
| commit | 2ac711791b2e4aabc5e4046b7428727828c705eb (patch) | |
| tree | c4ed47028dee4949cc7eace9760a20d1759406e2 /hw/ppc_newworld.c | |
| parent | e612a1f7256bb3546cf3e9ae6cad3997c4153663 (diff) | |
| download | qemu-2ac711791b2e4aabc5e4046b7428727828c705eb.tar.gz | |
Replace cpu_abort with hw_error
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/ppc_newworld.c')
| -rw-r--r-- | hw/ppc_newworld.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index f67b727e6c..0fe8c5f14a 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -146,7 +146,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, /* Load OpenBIOS (ELF) */ bios_size = load_elf(buf, 0, NULL, NULL, NULL); if (bios_size < 0 || bios_size > BIOS_SIZE) { - cpu_abort(env, "qemu: could not load PowerPC bios '%s'\n", buf); + hw_error("qemu: could not load PowerPC bios '%s'\n", buf); exit(1); } @@ -190,8 +190,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, kernel_base, ram_size - kernel_base); if (kernel_size < 0) { - cpu_abort(env, "qemu: could not load kernel '%s'\n", - kernel_filename); + hw_error("qemu: could not load kernel '%s'\n", kernel_filename); exit(1); } /* load initrd */ @@ -200,8 +199,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, initrd_size = load_image_targphys(initrd_filename, initrd_base, ram_size - initrd_base); if (initrd_size < 0) { - cpu_abort(env, "qemu: could not load initial ram disk '%s'\n", - initrd_filename); + hw_error("qemu: could not load initial ram disk '%s'\n", + initrd_filename); exit(1); } } else { @@ -278,7 +277,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, break; #endif /* defined(TARGET_PPC64) */ default: - cpu_abort(env, "Bus model not supported on mac99 machine\n"); + hw_error("Bus model not supported on mac99 machine\n"); exit(1); } } |