On Thu, Dec 22, 2022 at 4:30 AM Daniel Henrique Barboza
<dbarb...@ventanamicro.com> wrote:
>
> The MachineState object provides a 'fdt' pointer that is already being
> used by other RISC-V machines, and it's also used by the 'dumpdtb' QMP
> command.
>
> Remove the 'fdt' pointer from SpikeState and use MachineState::fdt
> instead.
>
> Signed-off-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/riscv/spike.c | 12 +++++-------
> include/hw/riscv/spike.h | 2 --
> 2 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index 13946acf0d..d96f013e2e 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -52,6 +52,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry
> *memmap,
> uint64_t mem_size, const char *cmdline, bool
> is_32_bit)
> {
> void *fdt;
> + int fdt_size;
> uint64_t addr, size;
> unsigned long clint_addr;
> int cpu, socket;
> @@ -64,7 +65,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry
> *memmap,
> "sifive,clint0", "riscv,clint0"
> };
>
> - fdt = s->fdt = create_device_tree(&s->fdt_size);
> + fdt = mc->fdt = create_device_tree(&fdt_size);
> if (!fdt) {
> error_report("create_device_tree() failed");
> exit(1);
> @@ -296,18 +297,15 @@ static void spike_board_init(MachineState *machine)
> hwaddr end = riscv_load_initrd(machine->initrd_filename,
> machine->ram_size, kernel_entry,
> &start);
> - qemu_fdt_setprop_cell(s->fdt, "/chosen",
> + qemu_fdt_setprop_cell(machine->fdt, "/chosen",
> "linux,initrd-start", start);
> - qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end",
> + qemu_fdt_setprop_cell(machine->fdt, "/chosen", "linux,initrd-end",
> end);
> }
>
> /* Compute the fdt load address in dram */
> fdt_load_addr = riscv_load_fdt(memmap[SPIKE_DRAM].base,
> - machine->ram_size, s->fdt);
> -
> - /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
> - machine->fdt = s->fdt;
> + machine->ram_size, machine->fdt);
>
> /* load the reset vector */
> riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base,
> diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h
> index 73d69234de..d13a147942 100644
> --- a/include/hw/riscv/spike.h
> +++ b/include/hw/riscv/spike.h
> @@ -37,8 +37,6 @@ struct SpikeState {
>
> /*< public >*/
> RISCVHartArrayState soc[SPIKE_SOCKETS_MAX];
> - void *fdt;
> - int fdt_size;
> };
>
> enum {
> --
> 2.38.1
>
>
