diff options
| author | Daniel Henrique Barboza <danielhb413@gmail.com> | 2022-09-26 14:38:45 -0300 |
|---|---|---|
| committer | Daniel Henrique Barboza <danielhb413@gmail.com> | 2022-10-17 16:15:10 -0300 |
| commit | 610cba317c28d1b4ecb6ea36c754c225f4b917ad (patch) | |
| tree | 6e8804aacd79c6e27b0403382f10e1de02603be1 /hw | |
| parent | bf353ad55590f227d8b96b35e4c8bd6ab1a3d8de (diff) | |
| download | qemu-610cba317c28d1b4ecb6ea36c754c225f4b917ad.zip qemu-610cba317c28d1b4ecb6ea36c754c225f4b917ad.tar.gz qemu-610cba317c28d1b4ecb6ea36c754c225f4b917ad.tar.bz2 | |
hw/nios2: set machine->fdt in nios2_load_dtb()
This will enable support for 'dumpdtb' QMP/HMP command for all nios2
machines that uses nios2_load_dtb().
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220926173855.1159396-7-danielhb413@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/nios2/boot.c | 8 | ||||
| -rw-r--r-- | hw/nios2/meson.build | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 21cbfff..b30a7b1 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -43,6 +43,8 @@ #include "boot.h" +#include <libfdt.h> + #define NIOS2_MAGIC 0x534f494e static struct nios2_boot_info { @@ -81,6 +83,7 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr) static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize, const char *kernel_cmdline, const char *dtb_filename) { + MachineState *machine = MACHINE(qdev_get_machine()); int fdt_size; void *fdt = NULL; int r; @@ -113,7 +116,10 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize, } cpu_physical_memory_write(bi.fdt, fdt, fdt_size); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt = fdt; + return fdt_size; } diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build index 6c58e808..22277bd 100644 --- a/hw/nios2/meson.build +++ b/hw/nios2/meson.build @@ -1,5 +1,5 @@ nios2_ss = ss.source_set() -nios2_ss.add(files('boot.c')) +nios2_ss.add(files('boot.c'), fdt) nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c')) nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true: files('generic_nommu.c')) |