[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/38] hw/ppc: set machine->fdt in sam460ex_load_device_tree()
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 32/38] hw/ppc: set machine->fdt in sam460ex_load_device_tree() |
Date: |
Mon, 17 Oct 2022 16:20:03 -0300 |
This will enable support for 'dumpdtb' QMP/HMP command for the sam460ex
machine.
Setting machine->fdt requires a MachineState pointer to be used inside
sam460ex_load_device_tree(). Let's change the function to receive this
pointer from the caller. 'ramsize' and 'kernel_cmdline' can be retrieved
directly from the 'machine' pointer.
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220926173855.1159396-10-danielhb413@gmail.com>
---
hw/ppc/sam460ex.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index f03cdc9ecc..4a22ce3761 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -123,13 +123,12 @@ static int sam460ex_load_uboot(void)
return 0;
}
-static int sam460ex_load_device_tree(hwaddr addr,
- uint32_t ramsize,
+static int sam460ex_load_device_tree(MachineState *machine,
+ hwaddr addr,
hwaddr initrd_base,
- hwaddr initrd_size,
- const char *kernel_cmdline)
+ hwaddr initrd_size)
{
- uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(ramsize) };
+ uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(machine->ram_size) };
char *filename;
int fdt_size;
void *fdt;
@@ -163,7 +162,8 @@ static int sam460ex_load_device_tree(hwaddr addr,
qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
(initrd_base + initrd_size));
- qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
+ qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
+ machine->kernel_cmdline);
/* Copy data from the host device tree into the guest. Since the guest can
* directly access the timebase without host involvement, we must expose
@@ -200,7 +200,9 @@ static int sam460ex_load_device_tree(hwaddr addr,
EBC_FREQ);
rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
return fdt_size;
}
@@ -500,9 +502,8 @@ static void sam460ex_init(MachineState *machine)
if (machine->kernel_filename) {
int dt_size;
- dt_size = sam460ex_load_device_tree(FDT_ADDR, machine->ram_size,
- RAMDISK_ADDR, initrd_size,
- machine->kernel_cmdline);
+ dt_size = sam460ex_load_device_tree(machine, FDT_ADDR,
+ RAMDISK_ADDR, initrd_size);
boot_info->dt_base = FDT_ADDR;
boot_info->dt_size = dt_size;
--
2.37.3
- [PULL 21/38] hw/gpio/meson: Introduce dedicated config switch for hw/gpio/mpc8xxx, (continued)
- [PULL 21/38] hw/gpio/meson: Introduce dedicated config switch for hw/gpio/mpc8xxx, Daniel Henrique Barboza, 2022/10/17
- [PULL 29/38] qmp/hmp, device_tree.c: introduce dumpdtb, Daniel Henrique Barboza, 2022/10/17
- [PULL 31/38] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/10/17
- [PULL 23/38] hw/ppc/e500: Reduce usage of sysbus API, Daniel Henrique Barboza, 2022/10/17
- [PULL 25/38] hw/ppc/mpc8544ds: Add platform bus, Daniel Henrique Barboza, 2022/10/17
- [PULL 24/38] hw/ppc/mpc8544ds: Rename wrongly named method, Daniel Henrique Barboza, 2022/10/17
- [PULL 33/38] hw/ppc: set machine->fdt in xilinx_load_device_tree(), Daniel Henrique Barboza, 2022/10/17
- [PULL 35/38] hw/ppc: set machine->fdt in pnv_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 28/38] hw/ppc/spapr_pci.c: Use device_cold_reset() rather than device_legacy_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 30/38] hw/nios2: set machine->fdt in nios2_load_dtb(), Daniel Henrique Barboza, 2022/10/17
- [PULL 32/38] hw/ppc: set machine->fdt in sam460ex_load_device_tree(),
Daniel Henrique Barboza <=
- [PULL 34/38] hw/ppc: set machine->fdt in pegasos2_machine_reset(), Daniel Henrique Barboza, 2022/10/17
- [PULL 36/38] hw/ppc: set machine->fdt in spapr machine, Daniel Henrique Barboza, 2022/10/17
- [PULL 37/38] hw/riscv: set machine->fdt in sifive_u_machine_init(), Daniel Henrique Barboza, 2022/10/17
- [PULL 38/38] hw/riscv: set machine->fdt in spike_board_init(), Daniel Henrique Barboza, 2022/10/17
- Re: [PULL 00/38] ppc queue, Stefan Hajnoczi, 2022/10/18