| Message ID | 20220904233456.209027-7-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | QMP/HMP: introduce 'dumpdtb' | expand |
On Sun, 4 Sep 2022, Daniel Henrique Barboza wrote: > 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. > > Cc: BALATON Zoltan <balaton@eik.bme.hu> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> but could you please do the same at least for bamboo and virtex too to keep these consistent? (and to simplify them a little.) Regards, BALATON Zoltan > --- > 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 850bb3b817..5d09d3c6ab 100644 > --- a/hw/ppc/sam460ex.c > +++ b/hw/ppc/sam460ex.c > @@ -131,13 +131,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; > @@ -171,7 +170,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 > @@ -208,7 +208,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; > } > @@ -496,9 +498,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; >
On 9/5/22 04:15, BALATON Zoltan wrote: > On Sun, 4 Sep 2022, Daniel Henrique Barboza wrote: >> 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. >> >> Cc: BALATON Zoltan <balaton@eik.bme.hu> >> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > > Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> > > but could you please do the same at least for bamboo and virtex too to keep these consistent? (and to simplify them a little.) I'll wait for more reviews in the other patches then I'll repost with these changes in bamboo and virtex. Thanks, Daniel > > Regards, > BALATON Zoltan > >> --- >> 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 850bb3b817..5d09d3c6ab 100644 >> --- a/hw/ppc/sam460ex.c >> +++ b/hw/ppc/sam460ex.c >> @@ -131,13 +131,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; >> @@ -171,7 +170,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 >> @@ -208,7 +208,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; >> } >> @@ -496,9 +498,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; >>
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 850bb3b817..5d09d3c6ab 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -131,13 +131,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; @@ -171,7 +170,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 @@ -208,7 +208,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; } @@ -496,9 +498,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;
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. Cc: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/ppc/sam460ex.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)