[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb(
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb() |
Date: |
Mon, 26 Sep 2022 14:38:44 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for all
microblaze machines that uses microblaze_load_dtb().
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/microblaze/boot.c | 8 +++++++-
hw/microblaze/meson.build | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 25ad54754e..bec0538ce6 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -40,6 +40,8 @@
#include "boot.h"
+#include <libfdt.h>
+
static struct
{
void (*machine_cpu_reset)(MicroBlazeCPU *);
@@ -73,6 +75,7 @@ static int microblaze_load_dtb(hwaddr addr,
const char *kernel_cmdline,
const char *dtb_filename)
{
+ MachineState *machine = MACHINE(qdev_get_machine());
int fdt_size;
void *fdt = NULL;
int r;
@@ -105,7 +108,10 @@ static int microblaze_load_dtb(hwaddr addr,
}
cpu_physical_memory_write(addr, fdt, fdt_size);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return fdt_size;
}
diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build
index bb9e4eb8f4..a38a397872 100644
--- a/hw/microblaze/meson.build
+++ b/hw/microblaze/meson.build
@@ -1,5 +1,5 @@
microblaze_ss = ss.source_set()
-microblaze_ss.add(files('boot.c'))
+microblaze_ss.add(files('boot.c'), fdt)
microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true:
files('petalogix_s3adsp1800_mmu.c'))
microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true:
files('petalogix_ml605_mmu.c'))
microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true:
files('xlnx-zynqmp-pmu.c'))
--
2.37.3
- [PATCH v8 00/16] QMP/HMP: introduce 'dumpdtb', Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 02/16] hw/core: free ms->fdt in machine_finalize(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 01/16] qmp/hmp, device_tree.c: introduce dumpdtb, Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 06/16] hw/nios2: set machine->fdt in nios2_load_dtb(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb(),
Daniel Henrique Barboza <=
- [PATCH v8 08/16] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 12/16] hw/ppc: set machine->fdt in pnv_reset(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 16/16] hw/xtensa: set machine->fdt in xtfpga_init(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 10/16] hw/ppc: set machine->fdt in xilinx_load_device_tree(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 11/16] hw/ppc: set machine->fdt in pegasos2_machine_reset(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 15/16] hw/riscv: set machine->fdt in spike_board_init(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 03/16] hw/arm: do not free machine->fdt in arm_load_dtb(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 13/16] hw/ppc: set machine->fdt in spapr machine, Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 09/16] hw/ppc: set machine->fdt in sam460ex_load_device_tree(), Daniel Henrique Barboza, 2022/09/26
- [PATCH v8 04/16] hw/mips: set machine->fdt in boston_mach_init(), Daniel Henrique Barboza, 2022/09/26