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 16/20] device_tree.c: support string props in fdt_format_node()
Date: Fri, 5 Aug 2022 06:39:44 -0300 [thread overview]
Message-ID: <20220805093948.82561-17-danielhb413@gmail.com> (raw)
In-Reply-To: <20220805093948.82561-1-danielhb413@gmail.com>
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 <danielhb413@gmail.com>
---
softmmu/device_tree.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 3fb07b537f..8691c3ccc0 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -663,6 +663,24 @@ void qemu_fdt_qmp_dumpdtb(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_format_node(GString *buf, int node, int depth)
{
const struct fdt_property *prop = NULL;
@@ -681,7 +699,12 @@ static void fdt_format_node(GString *buf, int node, int depth)
prop = fdt_get_property_by_offset(fdt, property, &prop_size);
propname = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
- g_string_append_printf(buf, "%*s%s;\n", padding, "", propname);
+ if (fdt_prop_is_string(prop->data, prop_size)) {
+ g_string_append_printf(buf, "%*s%s = '%s'\n",
+ padding, "", propname, prop->data);
+ } else {
+ g_string_append_printf(buf, "%*s%s;\n", padding, "", propname);
+ }
}
padding -= 4;
--
2.36.1
next prev parent reply other threads:[~2022-08-05 10:22 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 ` Daniel Henrique Barboza [this message]
2022-08-08 4:36 ` [PATCH for-7.2 v2 16/20] device_tree.c: support string props in fdt_format_node() 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 ` [PATCH for-7.2 v2 18/20] device_node.c: enable 'info fdt' to print subnodes Daniel Henrique Barboza
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-17-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.