From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Alistair Francis" <alistair.francis@wdc.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PULL v2 09/15] device_tree: add qemu_fdt_setprop_string_array helper
Date: Wed, 10 Mar 2021 15:59:56 +0000 [thread overview]
Message-ID: <20210310160002.11659-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210310160002.11659-1-alex.bennee@linaro.org>
A string array in device tree is simply a series of \0 terminated
strings next to each other. As libfdt doesn't support that directly
we need to build it ourselves.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20210303173642.3805-4-alex.bennee@linaro.org>
diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h
index 982c89345f..8a2fe55622 100644
--- a/include/sysemu/device_tree.h
+++ b/include/sysemu/device_tree.h
@@ -70,6 +70,23 @@ int qemu_fdt_setprop_u64(void *fdt, const char *node_path,
const char *property, uint64_t val);
int qemu_fdt_setprop_string(void *fdt, const char *node_path,
const char *property, const char *string);
+
+/**
+ * qemu_fdt_setprop_string_array: set a string array property
+ *
+ * @fdt: pointer to the dt blob
+ * @name: node name
+ * @prop: property array
+ * @array: pointer to an array of string pointers
+ * @len: length of array
+ *
+ * assigns a string array to a property. This function converts and
+ * array of strings to a sequential string with \0 separators before
+ * setting the property.
+ */
+int qemu_fdt_setprop_string_array(void *fdt, const char *node_path,
+ const char *prop, char **array, int len);
+
int qemu_fdt_setprop_phandle(void *fdt, const char *node_path,
const char *property,
const char *target_node_path);
diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index b9a3ddc518..2691c58cf6 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -21,6 +21,7 @@
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/bswap.h"
+#include "qemu/cutils.h"
#include "sysemu/device_tree.h"
#include "sysemu/sysemu.h"
#include "hw/loader.h"
@@ -397,6 +398,31 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,
return r;
}
+/*
+ * libfdt doesn't allow us to add string arrays directly but they are
+ * test a series of null terminated strings with a length. We build
+ * the string up here so we can calculate the final length.
+ */
+int qemu_fdt_setprop_string_array(void *fdt, const char *node_path,
+ const char *prop, char **array, int len)
+{
+ int ret, i, total_len = 0;
+ char *str, *p;
+ for (i = 0; i < len; i++) {
+ total_len += strlen(array[i]) + 1;
+ }
+ p = str = g_malloc0(total_len);
+ for (i = 0; i < len; i++) {
+ int len = strlen(array[i]) + 1;
+ pstrcpy(p, len, array[i]);
+ p += len;
+ }
+
+ ret = qemu_fdt_setprop(fdt, node_path, prop, str, total_len);
+ g_free(str);
+ return ret;
+}
+
const void *qemu_fdt_getprop(void *fdt, const char *node_path,
const char *property, int *lenp, Error **errp)
{
--
2.20.1
next prev parent reply other threads:[~2021-03-10 16:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 15:59 [PULL v2 00/15] testing, docs, semihosting move and guest-loader Alex Bennée
2021-03-10 15:59 ` [PULL v2 01/15] docs/system: add a gentle prompt for the complexity to come Alex Bennée
2021-03-10 15:59 ` [PULL v2 02/15] tests/docker: add a test-tcg for building then running check-tcg Alex Bennée
2021-03-10 15:59 ` [PULL v2 03/15] gitlab-ci.yml: Allow custom # of parallel linkers Alex Bennée
2021-03-10 15:59 ` [PULL v2 04/15] gitlab-ci.yml: Add jobs to test CFI flags Alex Bennée
2021-03-22 13:39 ` Philippe Mathieu-Daudé
2021-03-22 14:06 ` Alex Bennée
2021-03-22 14:08 ` Daniele Buono
2021-03-10 15:59 ` [PULL v2 05/15] tests/docker: Use --arch-only when building Debian cross image Alex Bennée
2021-03-10 15:59 ` [PULL v2 06/15] .editorconfig: update the automatic mode setting for Emacs Alex Bennée
2021-03-10 15:59 ` [PULL v2 07/15] hw/board: promote fdt from ARM VirtMachineState to MachineState Alex Bennée
2021-03-10 15:59 ` [PULL v2 08/15] hw/riscv: migrate fdt field to generic MachineState Alex Bennée
2021-03-10 15:59 ` Alex Bennée [this message]
2021-03-10 15:59 ` [PULL v2 10/15] hw/core: implement a guest-loader to support static hypervisor guests Alex Bennée
2021-03-10 15:59 ` [PULL v2 11/15] docs: move generic-loader documentation into the main manual Alex Bennée
2021-03-10 15:59 ` [PULL v2 12/15] docs: add some documentation for the guest-loader Alex Bennée
2021-03-10 16:00 ` [PULL v2 13/15] tests/avocado: add boot_xen tests Alex Bennée
2021-03-10 16:00 ` [PULL v2 14/15] semihosting: Move include/hw/semihosting/ -> include/semihosting/ Alex Bennée
2021-03-10 16:00 ` [PULL v2 15/15] semihosting: Move hw/semihosting/ -> semihosting/ Alex Bennée
2021-03-11 18:55 ` [PULL v2 00/15] testing, docs, semihosting move and guest-loader Peter Maydell
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=20210310160002.11659-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=david@gibson.dropbear.id.au \
--cc=peter.maydell@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).