From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: alistair.francis@wdc.com, david@gibson.dropbear.id.au,
Daniel Henrique Barboza <danielhb413@gmail.com>
Subject: [PATCH for-7.2 v2 18/20] device_node.c: enable 'info fdt' to print subnodes
Date: Fri, 5 Aug 2022 06:39:46 -0300 [thread overview]
Message-ID: <20220805093948.82561-19-danielhb413@gmail.com> (raw)
In-Reply-To: <20220805093948.82561-1-danielhb413@gmail.com>
Printing subnodes of a given node will allow us to show a whole subtree,
which the additional perk of 'info fdt /' being able to print the whole
FDT.
Since we're now printing more than one subnode, change 'fdt_info' to
print the full path of the first node. This small tweak helps
identifying which node or subnode are being displayed.
To demostrate this capability without printing the whole FDT, the
'/cpus/cpu-map' node from the ARM 'virt' machine has a lot of subnodes:
(qemu) info fdt /cpus/cpu-map
/cpus/cpu-map {
socket0 {
cluster0 {
core0 {
cpu = <0x8001>
}
}
}
}
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
softmmu/device_tree.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 9d95e4120b..99d95c1cb9 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -728,17 +728,26 @@ static void fdt_prop_format_val(GString *buf, const char *propname,
g_string_append_printf(buf, "]\n");
}
-static void fdt_format_node(GString *buf, int node, int depth)
+
+static void fdt_format_node(GString *buf, int node, int depth,
+ const char *fullpath)
{
const struct fdt_property *prop = NULL;
+ const char *nodename = NULL;
const char *propname = NULL;
void *fdt = current_machine->fdt;
int padding = depth * 4;
int property = 0;
+ int parent = node;
int prop_size;
- g_string_append_printf(buf, "%*s%s {\n", padding, "",
- fdt_get_name(fdt, node, NULL));
+ if (fullpath != NULL) {
+ nodename = fullpath;
+ } else {
+ nodename = fdt_get_name(fdt, node, NULL);
+ }
+
+ g_string_append_printf(buf, "%*s%s {\n", padding, "", nodename);
padding += 4;
@@ -763,6 +772,10 @@ static void fdt_format_node(GString *buf, int node, int depth)
}
}
+ fdt_for_each_subnode(node, fdt, parent) {
+ fdt_format_node(buf, node, depth + 1, NULL);
+ }
+
padding -= 4;
g_string_append_printf(buf, "%*s}\n", padding, "");
}
@@ -783,7 +796,7 @@ HumanReadableText *qemu_fdt_qmp_query_fdt(const char *nodepath, Error **errp)
return NULL;
}
- fdt_format_node(buf, node, 0);
+ fdt_format_node(buf, node, 0, nodepath);
return human_readable_text_from_str(buf);
}
--
2.36.1
next prev parent reply other threads:[~2022-08-05 10:07 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 9:39 [PATCH for-7.2 v2 00/20] QMP/HMP: add 'dumpdtb' and 'info fdt' commands Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 01/20] hw/arm: do not free machine->fdt in arm_load_dtb() Daniel Henrique Barboza
2022-08-08 3:23 ` David Gibson
2022-08-08 23:00 ` Daniel Henrique Barboza
2022-08-12 22:03 ` Daniel Henrique Barboza
2022-08-15 2:36 ` David Gibson
2022-08-05 9:39 ` [PATCH for-7.2 v2 02/20] hw/microblaze: set machine->fdt in microblaze_load_dtb() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 03/20] hw/nios2: set machine->fdt in nios2_load_dtb() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 04/20] hw/ppc: set machine->fdt in ppce500_load_device_tree() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 05/20] hw/ppc: set machine->fdt in bamboo_load_device_tree() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 06/20] hw/ppc: set machine->fdt in sam460ex_load_device_tree() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 07/20] hw/ppc: set machine->fdt in xilinx_load_device_tree() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 08/20] hw/ppc: set machine->fdt in pegasos2_machine_reset() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 09/20] hw/ppc: set machine->fdt in pnv_reset() Daniel Henrique Barboza
2022-08-05 11:03 ` Frederic Barrat
2022-08-05 12:31 ` Daniel Henrique Barboza
2022-08-08 3:25 ` David Gibson
2022-08-08 6:47 ` Cédric Le Goater
2022-08-08 7:13 ` Cédric Le Goater
2022-08-10 19:30 ` Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 10/20] hw/ppc: set machine->fdt in spapr machine Daniel Henrique Barboza
2022-08-08 3:26 ` David Gibson
2022-08-12 22:23 ` Daniel Henrique Barboza
2022-08-15 2:37 ` David Gibson
2022-08-19 2:11 ` Alexey Kardashevskiy
2022-08-19 2:33 ` David Gibson
2022-08-19 9:42 ` Daniel Henrique Barboza
2022-08-22 3:05 ` David Gibson
2022-08-22 3:29 ` Alexey Kardashevskiy
2022-08-22 10:30 ` Daniel Henrique Barboza
2022-08-23 8:58 ` Alexey Kardashevskiy
2022-08-23 18:09 ` Daniel Henrique Barboza
2022-09-01 1:57 ` David Gibson
2022-08-05 9:39 ` [PATCH for-7.2 v2 11/20] hw/riscv: set machine->fdt in sifive_u_machine_init() Daniel Henrique Barboza
2022-08-07 22:46 ` Alistair Francis
2022-08-05 9:39 ` [PATCH for-7.2 v2 12/20] hw/riscv: set machine->fdt in spike_board_init() Daniel Henrique Barboza
2022-08-07 22:46 ` Alistair Francis
2022-08-05 9:39 ` [PATCH for-7.2 v2 13/20] hw/xtensa: set machine->fdt in xtfpga_init() Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 14/20] qmp/hmp, device_tree.c: introduce dumpdtb Daniel Henrique Barboza
2022-08-07 23:02 ` Alistair Francis
2022-08-08 3:30 ` David Gibson
2022-08-15 17:36 ` Daniel Henrique Barboza
2022-08-15 18:31 ` Dr. David Alan Gilbert
2022-08-15 19:20 ` Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 15/20] qmp/hmp, device_tree.c: introduce 'info fdt' command Daniel Henrique Barboza
2022-08-08 4:21 ` David Gibson
2022-08-15 22:48 ` Daniel Henrique Barboza
2022-08-18 2:46 ` David Gibson
2022-08-05 9:39 ` [PATCH for-7.2 v2 16/20] device_tree.c: support string props in fdt_format_node() Daniel Henrique Barboza
2022-08-08 4:36 ` David Gibson
2022-08-10 19:40 ` Daniel Henrique Barboza
2022-08-11 4:09 ` David Gibson
2022-08-05 9:39 ` [PATCH for-7.2 v2 17/20] device_tree.c: support remaining FDT prop types Daniel Henrique Barboza
2022-08-08 4:40 ` David Gibson
2022-08-05 9:39 ` Daniel Henrique Barboza [this message]
2022-08-05 9:39 ` [PATCH for-7.2 v2 19/20] device_tree.c: add fdt_format_property() helper Daniel Henrique Barboza
2022-08-05 9:39 ` [PATCH for-7.2 v2 20/20] hmp, device_tree.c: add 'info fdt <property>' support Daniel Henrique Barboza
2022-08-15 18:38 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220805093948.82561-19-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.