[v7,12/14] hw/riscv: set machine->fdt in spike_board_init()

Commit Message

Daniel Henrique Barboza Sept. 8, 2022, 7:40 p.m. UTC

This will enable support for the 'dumpdtb' QMP/HMP command for the spike
machine.

Cc: Palmer Dabbelt <[e-mail]>
Cc: Alistair Francis <[e-mail]>
Cc: Bin Meng <[e-mail]>
Reviewed-by: Alistair Francis <[e-mail]>
Signed-off-by: Daniel Henrique Barboza <[e-mail]>
---
 hw/riscv/spike.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Philippe Mathieu-Daudé Sept. 22, 2022, 10:55 a.m. UTC | #1

On 8/9/22 21:40, Daniel Henrique Barboza wrote:
> This will enable support for the 'dumpdtb' QMP/HMP command for the spike
> machine.
> 
> Cc: Palmer Dabbelt <[e-mail]>
> Cc: Alistair Francis <[e-mail]>
> Cc: Bin Meng <[e-mail]>
> Reviewed-by: Alistair Francis <[e-mail]>
> Signed-off-by: Daniel Henrique Barboza <[e-mail]>
> ---
>   hw/riscv/spike.c | 6 ++++++
>   1 file changed, 6 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 5ba34543c8..1e1d752c00 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -40,6 +40,8 @@ 
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 
+#include <libfdt.h>
+
 static const MemMapEntry spike_memmap[] = {
     [SPIKE_MROM] =     {     0x1000,     0xf000 },
     [SPIKE_HTIF] =     {  0x1000000,     0x1000 },
@@ -304,6 +306,10 @@  static void spike_board_init(MachineState *machine)
     /* 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;
+
     /* load the reset vector */
     riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base,
                               memmap[SPIKE_MROM].base,