summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huth2017-02-01 12:03:10 +0100
committerDavid Gibson2017-02-01 23:30:07 +0100
commit7c6e8797337c24520b48d8b50a900a747e50f974 (patch)
tree560eff9034c125dc07f7265541aba2dac1d31486
parentppc/kvm: Handle the "family" CPU via alias instead of registering new types (diff)
downloadqemu-7c6e8797337c24520b48d8b50a900a747e50f974.tar.gz
qemu-7c6e8797337c24520b48d8b50a900a747e50f974.tar.xz
qemu-7c6e8797337c24520b48d8b50a900a747e50f974.zip
hw/ppc/pnv: Use error_report instead of hw_error if a ROM file can't be found
hw_error() is for CPU related errors only (it dumps the CPU registers and calls abort()!), so using error_report() is the better choice of reporting an error in case we simply did not find a file. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--hw/ppc/pnv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 83597fe92b..4fab5c0ae7 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -381,7 +381,7 @@ static void ppc_powernv_init(MachineState *machine)
fw_size = load_image_targphys(fw_filename, FW_LOAD_ADDR, FW_MAX_SIZE);
if (fw_size < 0) {
- hw_error("qemu: could not load OPAL '%s'\n", fw_filename);
+ error_report("qemu: could not load OPAL '%s'", fw_filename);
exit(1);
}
g_free(fw_filename);
@@ -393,8 +393,8 @@ static void ppc_powernv_init(MachineState *machine)
kernel_size = load_image_targphys(machine->kernel_filename,
KERNEL_LOAD_ADDR, 0x2000000);
if (kernel_size < 0) {
- hw_error("qemu: could not load kernel'%s'\n",
- machine->kernel_filename);
+ error_report("qemu: could not load kernel'%s'",
+ machine->kernel_filename);
exit(1);
}
}