On Wed, Aug 7, 2019 at 3:54 PM Bin Meng <bmeng...@gmail.com> wrote:
> There is no need to return fdt at the end of create_fdt() because
> it's already saved in s->fdt. Other machines (sifive_u, spike)
> don't do it neither.
>
> Signed-off-by: Bin Meng <bmeng...@gmail.com>
> ---
>
> Changes in v2: None
>
> hw/riscv/virt.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 2f75195..6bfa721 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -112,7 +112,7 @@ static void create_pcie_irq_map(void *fdt, char
> *nodename,
> 0x1800, 0, 0, 0x7);
> }
>
> -static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry
> *memmap,
> +static void create_fdt(RISCVVirtState *s, const struct MemmapEntry
> *memmap,
> uint64_t mem_size, const char *cmdline)
> {
> void *fdt;
> @@ -316,8 +316,6 @@ static void *create_fdt(RISCVVirtState *s, const
> struct MemmapEntry *memmap,
> qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
> }
> g_free(nodename);
> -
> - return fdt;
> }
>
>
> @@ -373,7 +371,6 @@ static void riscv_virt_board_init(MachineState
> *machine)
> size_t plic_hart_config_len;
> int i;
> unsigned int smp_cpus = machine->smp.cpus;
> - void *fdt;
>
> /* Initialize SOC */
> object_initialize_child(OBJECT(machine), "soc", &s->soc,
> sizeof(s->soc),
> @@ -392,7 +389,7 @@ static void riscv_virt_board_init(MachineState
> *machine)
> main_mem);
>
> /* create device tree */
> - fdt = create_fdt(s, memmap, machine->ram_size,
> machine->kernel_cmdline);
> + create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline);
>
> /* boot rom */
> memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",
> @@ -411,9 +408,9 @@ static void riscv_virt_board_init(MachineState
> *machine)
> hwaddr end = riscv_load_initrd(machine->initrd_filename,
> machine->ram_size,
> kernel_entry,
> &start);
> - qemu_fdt_setprop_cell(fdt, "/chosen",
> + qemu_fdt_setprop_cell(s->fdt, "/chosen",
> "linux,initrd-start", start);
> - qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
> + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end",
> end);
> }
> }
> --
> 2.7.4
>
>
>
Reviewed-by: Chih-Min Chao <chihmin.c...@sifive.com>
