From: "Alex Bennée" <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Cc: julien@xen.org, andre.przywara@arm.com, stefano.stabellini@linaro.org, "Alistair Francis" <alistair.francis@wdc.com>, "David Gibson" <david@gibson.dropbear.id.au>, xen-devel@lists.xenproject.org, stefano.stabellini@xilinx.com, "Alex Bennée" <alex.bennee@linaro.org>, stratos-dev@op-lists.linaro.org Subject: [PATCH v2 3/7] device_tree: add qemu_fdt_setprop_string_array helper Date: Thu, 11 Feb 2021 17:19:41 +0000 [thread overview] Message-ID: <20210211171945.18313-4-alex.bennee@linaro.org> (raw) In-Reply-To: <20210211171945.18313-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: <20201105175153.30489-4-alex.bennee@linaro.org> --- v2 - checkpatch long line fix --- include/sysemu/device_tree.h | 17 +++++++++++++++++ softmmu/device_tree.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) 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
WARNING: multiple messages have this Message-ID (diff)
From: "Alex Bennée" <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Cc: julien@xen.org, stefano.stabellini@linaro.org, stefano.stabellini@xilinx.com, andre.przywara@arm.com, stratos-dev@op-lists.linaro.org, xen-devel@lists.xenproject.org, "Alex Bennée" <alex.bennee@linaro.org>, "Alistair Francis" <alistair.francis@wdc.com>, "David Gibson" <david@gibson.dropbear.id.au> Subject: [PATCH v2 3/7] device_tree: add qemu_fdt_setprop_string_array helper Date: Thu, 11 Feb 2021 17:19:41 +0000 [thread overview] Message-ID: <20210211171945.18313-4-alex.bennee@linaro.org> (raw) In-Reply-To: <20210211171945.18313-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: <20201105175153.30489-4-alex.bennee@linaro.org> --- v2 - checkpatch long line fix --- include/sysemu/device_tree.h | 17 +++++++++++++++++ softmmu/device_tree.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) 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-02-11 17:33 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-11 17:19 [PATCH v2 0/7] Xen guest loader (to boot Xen+Kernel under TCG) Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-11 17:19 ` [PATCH v2 1/7] hw/board: promote fdt from ARM VirtMachineState to MachineState Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-11 17:40 ` Peter Maydell 2021-02-11 17:40 ` Peter Maydell 2021-02-11 17:19 ` [PATCH v2 2/7] hw/riscv: migrate fdt field to generic MachineState Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-11 17:19 ` Alex Bennée [this message] 2021-02-11 17:19 ` [PATCH v2 3/7] device_tree: add qemu_fdt_setprop_string_array helper Alex Bennée 2021-02-17 0:44 ` David Gibson 2021-02-17 0:44 ` David Gibson 2021-02-11 17:19 ` [PATCH v2 4/7] hw/core: implement a guest-loader to support static hypervisor guests Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-11 17:19 ` [PATCH v2 5/7] docs: move generic-loader documentation into the main manual Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-12 21:38 ` Alistair Francis 2021-02-12 21:38 ` Alistair Francis 2021-02-11 17:19 ` [PATCH v2 6/7] docs: add some documentation for the guest-loader Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-12 21:39 ` Alistair Francis 2021-02-12 21:39 ` Alistair Francis 2021-02-11 17:19 ` [PATCH v2 7/7] tests/avocado: add boot_xen tests Alex Bennée 2021-02-11 17:19 ` Alex Bennée 2021-02-17 14:31 ` Philippe Mathieu-Daudé 2021-02-17 14:31 ` Philippe Mathieu-Daudé 2021-02-17 20:46 ` Cleber Rosa 2021-02-17 20:46 ` Cleber Rosa 2021-02-17 22:22 ` Alex Bennée 2021-02-17 22:22 ` Alex Bennée 2021-02-18 15:15 ` Cleber Rosa 2021-02-18 15:15 ` Cleber Rosa 2021-02-18 9:43 ` Philippe Mathieu-Daudé 2021-02-18 9:43 ` Philippe Mathieu-Daudé 2021-02-18 15:22 ` Cleber Rosa 2021-02-18 15:22 ` Cleber Rosa 2021-02-25 13:09 ` [PATCH v2 0/7] Xen guest loader (to boot Xen+Kernel under TCG) Alex Bennée 2021-02-25 13:09 ` Alex Bennée
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=20210211171945.18313-4-alex.bennee@linaro.org \ --to=alex.bennee@linaro.org \ --cc=alistair.francis@wdc.com \ --cc=andre.przywara@arm.com \ --cc=david@gibson.dropbear.id.au \ --cc=julien@xen.org \ --cc=qemu-devel@nongnu.org \ --cc=stefano.stabellini@linaro.org \ --cc=stefano.stabellini@xilinx.com \ --cc=stratos-dev@op-lists.linaro.org \ --cc=xen-devel@lists.xenproject.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: linkBe 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.