hw/ppc/pnv: Use error_report instead of hw_error if a ROM file can't be found
PATCH 1/1 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 <[email protected]>
--- hw/ppc/pnv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/ppc/pnv.c +3 -3
@@ -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 ); } }
Signature · 1 line
1.8.3.1
David Gibson
AppliedQuoted 5 lines · Thomas Huth
hw_error()is for CPU related errors only (it dumps the CPU registers and callsabort()!), so usingerror_report()is the better choice of reporting an error in case we simply did not find a file.Signed-off-by Thomas Huth <[email protected]>
Applied to ppc-for-2.9.
Quoted 28 lines
--- hw/ppc/pnv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/ppc/pnv.c +3
-3@@ -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 ); } }
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson