Commit 7c6e8797 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 715d4b96

hw/ppc/pnv.c

+3 −3
Original line number Diff line number Diff line
@@ -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,7 +393,7 @@ 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",

            error_report("qemu: could not load kernel'%s'",

                         machine->kernel_filename);

            exit(1);

        }