On 05/22/2018 09:15 PM, Michael Clark wrote:
With your Signed-off-by:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/riscv/sifive_u.c | 4 +++-
> hw/riscv/spike.c | 6 ++++--
> hw/riscv/virt.c | 4 +++-
> 3 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 326b0f434cff..02721d43c474 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -206,7 +206,9 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,
>
> qemu_fdt_add_subnode(fdt, "/chosen");
> qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
> - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + if (cmdline) {
> + qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + }
> g_free(nodename);
> }
>
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index f94e2b670799..5dd7d28aed4e 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -156,8 +156,10 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,
> g_free(cells);
> g_free(nodename);
>
> - qemu_fdt_add_subnode(fdt, "/chosen");
> - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + if (cmdline) {
> + qemu_fdt_add_subnode(fdt, "/chosen");
> + qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + }
> }
>
> static void spike_v1_10_0_board_init(MachineState *machine)
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 321fa6e8122a..c889aa3cd269 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -253,7 +253,9 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
>
> qemu_fdt_add_subnode(fdt, "/chosen");
> qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
> - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + if (cmdline) {
> + qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> + }
> g_free(nodename);
>
> return fdt;
>