[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] RISC-V: Don't add NULL bootargs to device-tree
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PULL 10/10] RISC-V: Don't add NULL bootargs to device-tree |
Date: |
Thu, 11 Oct 2018 20:32:15 +0000 |
From: Michael Clark <address@hidden>
Cc: Palmer Dabbelt <address@hidden>
Cc: Alistair Francis <address@hidden>
Signed-off-by: Michael Clark <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Palmer Dabbelt <address@hidden>
Signed-off-by: Alistair Francis <address@hidden>
---
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 4e273119c3..0c51c61082 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -259,7 +259,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 be5ef85e81..8a712ed490 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 3f30eb74d2..62add47667 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -284,7 +284,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;
--
2.17.1
- [Qemu-devel] [PULL 00/10] riscv-pullreq queue, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 01/10] hw/riscv/virt: Increase the number of interrupts, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 03/10] riscv: Enable VGA and PCIE_VGA, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 02/10] hw/riscv/virt: Connect the gpex PCIe, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 05/10] hw/riscv/virt: Connect a VirtIO net PCIe device, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 06/10] RISC-V: Allow setting and clearing multiple irqs, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 08/10] RISC-V: Update CSR and interrupt definitions, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 07/10] RISC-V: Move non-ops from op_helper to cpu_helper, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 04/10] hw/riscv/sifive_u: Connect the Xilinx PCIe, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 09/10] RISC-V: Add missing free for plic_hart_config, Alistair Francis, 2018/10/11
- [Qemu-devel] [PULL 10/10] RISC-V: Don't add NULL bootargs to device-tree,
Alistair Francis <=