[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH v5 1/9] microblaze: boot.c: Don't try to find NULL
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
Re: [Qemu-arm] [PATCH v5 1/9] microblaze: boot.c: Don't try to find NULL pointer |
|
Date: |
Wed, 17 Jan 2018 10:20:36 -0300 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 |
Hi Alistair,
Maybe reworded "Don't try to find NULL file"
On 01/16/2018 08:22 PM, Alistair Francis wrote:
> 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>
> ---
>
> 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 457a08a2fe..35bfeda7aa 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.14.1
- [Qemu-arm] [PATCH v5 0/9] Add the ZynqMP PMU and IPI, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 2/9] xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 1/9] microblaze: boot.c: Don't try to find NULL pointer, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 3/9] xlnx-zynqmp-pmu: Add the CPU and memory, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 4/9] aarch64-softmmu.mak: Use an ARM specific config, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 6/9] xlnx-zynqmp-pmu: Connect the PMU interrupt controller, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 5/9] xlnx-pmu-iomod-intc: Add the PMU Interrupt controller, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 7/9] xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device, Alistair Francis, 2018/01/16
- [Qemu-arm] [PATCH v5 8/9] xlnx-zynqmp-pmu: Connect the IPI device to the PMU, Alistair Francis, 2018/01/16
- Re: [Qemu-arm] [PATCH v5 0/9] Add the ZynqMP PMU and IPI, Alistair Francis, 2018/01/16