motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/mips/boston: Support dumpdtb monitor commands

Browse source 
The boston machine doesn't set MachineState::fdt to the DTB blob that
it has loaded or created, which means that the QMP/HMP dumpdtb
monitor commands don't work.

Setting MachineState::fdt is easy in the non-FIT codepath: we can
simply do so immediately before loading the DTB into guest memory.
The FIT codepath is a bit more awkward as currently the FIT loader
throws away the memory that the FDT was in after it loads it into
guest memory.  So we add a void *pfdt argument to load_fit() for it
to store the FDT pointer into.

There is some readjustment required of the pointer handling in
loader-fit.c, so that it applies 'const' only where it should (e.g.
the data pointer we get back from fdt_getprop() is const, because
it's into the middle of the input FDT data, but the pointer that
fit_load_image_alloc() should not be const, because it's freshly
allocated memory that the caller can change if it likes).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20250206151214.2947842-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2025-02-06 15:12:12 +00:00
parent dfd0de7186
commit db0dd33559
3 changed files with 46 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/hw/loader-fit.h
View file

@ -30,12 +30,27 @@ struct fit_loader_match {
struct fit_loader {
const struct fit_loader_match *matches;
hwaddr (*addr_to_phys)(void *opaque, uint64_t addr);
const void *(*fdt_filter)(void *opaque, const void *fdt,
const void *match_data, hwaddr *load_addr);
void *(*fdt_filter)(void *opaque, const void *fdt,
const void *match_data, hwaddr *load_addr);
const void *(*kernel_filter)(void *opaque, const void *kernel,
hwaddr *load_addr, hwaddr *entry_addr);
};
int load_fit(const struct fit_loader *ldr, const char *filename, void *opaque);
/**
* load_fit: load a FIT format image
* @ldr: structure defining board specific properties and hooks
* @filename: image to load
* @pfdt: pointer to update with address of FDT blob
* @opaque: opaque value passed back to the hook functions in @ldr
* Returns: 0 on success, or a negative errno on failure
*
* @pfdt is used to tell the caller about the FDT blob. On return, it
* has been set to point to the FDT blob, and it is now the caller's
* responsibility to free that memory with g_free(). Usually the caller
* will want to pass in &machine->fdt here, to record the FDT blob for
* the dumpdtb option and QMP/HMP commands.
*/
int load_fit(const struct fit_loader *ldr, const char *filename, void **pfdt,
void *opaque);
#endif /* HW_LOADER_FIT_H */