Commit d4c6d360 authored by Alistair Francis's avatar Alistair Francis Committed by Edgar E. Iglesias
Browse files

microblaze: boot.c: Don't try to find NULL file 



Previously if no device tree was passed to microblaze_load_kernel() then
qemu_find_file() would try to find a NULL pointer. To avoid this put a
check around qemu_find_file().

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 2077fef9

hw/microblaze/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, 
    kernel_cmdline = qemu_opt_get(machine_opts, "append");

    dtb_arg = qemu_opt_get(machine_opts, "dtb");

    /* default to pcbios dtb as passed by machine_init */

    if (!dtb_arg) {

    if (!dtb_arg && dtb_filename) {

        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);

    }