To support printing string properties in 'info fdt' we need to determine whether a void data might contain a string.
We do that by casting the void data to a string array and: - check if the array finishes with a null character - check if all characters are printable If both conditions are met, we'll consider it to be a string data type and print it accordingly. After this change, 'info fdt' is now able to print string properties. Here's an example with the ARM 'virt' machine: (qemu) info fdt /chosen chosen { stdout-path = '/pl011@9000000' rng-seed; kaslr-seed; } Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com> --- softmmu/device_tree.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index 899c239c5c..3c070acc0d 100644 --- a/softmmu/device_tree.c +++ b/softmmu/device_tree.c @@ -663,6 +663,24 @@ void fdt_save(const char *filename, Error **errp) error_setg(errp, "Error when saving machine FDT to file %s", filename); } +static bool fdt_prop_is_string(const void *data, int size) +{ + const char *str = data; + int i; + + if (size <= 0 || str[size - 1] != '\0') { + return false; + } + + for (i = 0; i < size - 1; i++) { + if (!g_ascii_isprint(str[i])) { + return false; + } + } + + return true; +} + static void fdt_print_node(int node, int depth) { const struct fdt_property *prop = NULL; @@ -680,7 +698,11 @@ static void fdt_print_node(int node, int depth) prop = fdt_get_property_by_offset(fdt, property, &prop_size); propname = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); - qemu_printf("%*s%s;\n", padding, "", propname); + if (fdt_prop_is_string(prop->data, prop_size)) { + qemu_printf("%*s%s = '%s'\n", padding, "", propname, prop->data); + } else { + qemu_printf("%*s%s;\n", padding, "", propname); + } } padding -= 4; -- 2.36.1