When printing a blob with 'dtc' using the '-O dts' option there are 3
distinct data types being printed: strings, arrays of uint32s and
regular byte arrays.
Previous patch added support to print strings. Let's add the remaining
formats. We want to resemble the format that 'dtc -O dts' uses, so every
uint32 array uses angle brackets (<>), and regular byte array uses square
brackets ([]). For properties that has no values we keep printing just
its name.
The /chosen FDT node from the pSeris machine gives an example of all
property types 'info fdt' is now able to display:
(qemu) info fdt /chosen
chosen {
ibm,architecture-vec-5 = [0 0]
rng-seed = <0x5967a270 0x62b0fb4f 0x8262b46a 0xabf48423 0xcce9615
0xf9daae64 0x66564790 0x357d1604>
ibm,arch-vec-5-platform-support = <0x178018c0 0x19001a40>
linux,pci-probe-only = <0x0>
stdout-path = '/vdevice/vty@71000000'
linux,stdout-path = '/vdevice/vty@71000000'
qemu,graphic-depth = <0x20>
qemu,graphic-height = <0x258>
qemu,graphic-width = <0x320>
}
Signed-off-by: Daniel Henrique Barboza <[email protected]>
---
softmmu/device_tree.c | 53 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 3c070acc0d..3a4d09483b 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -681,6 +681,46 @@ static bool fdt_prop_is_string(const void *data, int size)
return true;
}
+static bool fdt_prop_is_uint32_array(int size)
+{
+ return size % 4 == 0;
+}
+
+static void fdt_prop_print_uint32_array(const char *propname, const void *data,
+ int prop_size, int padding)
+{
+ const fdt32_t *array = data;
+ int array_len = prop_size / 4;
+ int i;
+
+ qemu_printf("%*s%s = <", padding, "", propname);
+ for (i = 0; i < array_len; i++) {
+ qemu_printf("0x%" PRIx32, fdt32_to_cpu(array[i]));
+
+ if (i < array_len - 1) {
+ qemu_printf(" ");
+ }
+ }
+ qemu_printf(">\n");
+}
+
+static void fdt_prop_print_val(const char *propname, const void *data,
+ int prop_size, int padding)
+{
+ const char *val = data;
+ int i;
+
+ qemu_printf("%*s%s = [", padding, "", propname);
+ for (i = 0; i < prop_size; i++) {
+ qemu_printf("%x", val[i]);
+
+ if (i < prop_size - 1) {
+ qemu_printf(" ");
+ }
+ }
+ qemu_printf("]\n");
+}
+
static void fdt_print_node(int node, int depth)
{
const struct fdt_property *prop = NULL;
@@ -698,10 +738,19 @@ 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));
+ if (prop_size == 0) {
+ qemu_printf("%*s%s;\n", padding, "", propname);
+ continue;
+ }
+
if (fdt_prop_is_string(prop->data, prop_size)) {
- qemu_printf("%*s%s = '%s'\n", padding, "", propname, prop->data);
+ qemu_printf("%*s%s = '%s'\n", padding, "",
+ propname, (char *)prop->data);
+ } else if (fdt_prop_is_uint32_array(prop_size)) {
+ fdt_prop_print_uint32_array(propname, prop->data, prop_size,
+ padding);
} else {
- qemu_printf("%*s%s;\n", padding, "", propname);
+ fdt_prop_print_val(propname, prop->data, prop_size, padding);
}
}
--
2.36.1
