| Message ID | 1485946990-11090-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Feb 01, 2017 at 12:03:10PM +0100, Thomas Huth wrote: > 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> Applied to ppc-for-2.9. > --- > hw/ppc/pnv.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 83597fe..4fab5c0 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); > } > }
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 83597fe..4fab5c0 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); } }
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> --- hw/ppc/pnv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)