From: Alistair Francis <alistair.francis@xilinx.com>
Date: Mon, 22 Jan 2018 19:43:16 +0000 (-0800)
Subject: microblaze: boot.c: Don't try to find NULL file
X-Git-Tag: v2.12.0-rc0~129^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4c6d3600beab8b976f373f6e5b68066e9b9fdaa;p=thirdparty%2Fqemu.git

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: Alistair Francis <alistair.francis@xilinx.com>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 457a08a2fe3..35bfeda7aa7 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -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);
     }