[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 1/9] microblaze: boot.c: Don't try to find NULL fi
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PULL v2 1/9] microblaze: boot.c: Don't try to find NULL file |
Date: |
Fri, 26 Jan 2018 11:22:34 +0100 |
From: Alistair Francis <address@hidden>
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 <address@hidden>
Reported-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
hw/microblaze/boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 457a08a..35bfeda 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);
}
--
2.7.4
- [Qemu-devel] [PULL v2 0/9] Xilinx queue, Edgar E. Iglesias, 2018/01/26
- [Qemu-devel] [PULL v2 3/9] xlnx-zynqmp-pmu: Add the CPU and memory, Edgar E. Iglesias, 2018/01/26
- [Qemu-devel] [PULL v2 4/9] aarch64-softmmu.mak: Use an ARM specific config, Edgar E. Iglesias, 2018/01/26
- [Qemu-devel] [PULL v2 7/9] xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device, Edgar E. Iglesias, 2018/01/26
- [Qemu-devel] [PULL v2 1/9] microblaze: boot.c: Don't try to find NULL file,
Edgar E. Iglesias <=
- [Qemu-devel] [PULL v2 5/9] xlnx-pmu-iomod-intc: Add the PMU Interrupt controller, Edgar E. Iglesias, 2018/01/26
- [Qemu-devel] [PULL v2 2/9] xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU, Edgar E. Iglesias, 2018/01/26
- Re: [Qemu-devel] [PULL v2 0/9] Xilinx queue, Peter Maydell, 2018/01/26
- [Qemu-devel] [PULL v2 8/9] xlnx-zynqmp-pmu: Connect the IPI device to the PMU, Edgar E. Iglesias, 2018/01/26