Messages in this thread | | | From | Masami Hiramatsu <> | Subject | [PATCH v3 0/6] bootconfig: Add mixed subkeys and value under the same key | Date | Wed, 2 Jun 2021 15:24:22 +0900 |
| |
Hi,
Here is the 3rd version of the series which updates bootconfig to support mixed subkeys and a value under the same key.
Since the kernel cmdline accepts options like "aaa.bbb=val1 aaa.bbb.ccc=val2", it is better that the bootconfig also support it.
Here is the previous series: https://lore.kernel.org/lkml/162157886618.78209.11141970623539574861.stgit@devnote2/
In this version, I rebased on top of the latest linus tree and add the build error fix [1/6](*) and a cleanup patch [6/6].
(*) https://lore.kernel.org/lkml/162087519356.442660.11385099982318160180.stgit@devnote2/
Changes in v3 [1/6]: - Added from separated thread. This is a fundamental fix. [6/6]: - New cleanup patch.
With this series, sub-keys and a value can co-exist under a parent key. For example, following config is allowed.
foo = value1 foo.bar = value2
Note, since there is no syntax to put a raw value directly under a structured key, you have to define it outside of the brace. For example,
foo { bar = value1 bar { baz = value2 qux = value3 } }
Also, the order of the value node under a key is fixed. If there are a value and subkeys, the value is always the first child node of the key. Thus if user specifies subkeys first, e.g.
foo.bar = value1 foo = value2
In the program (and /proc/bootconfig), it will be shown as below
foo = value2 foo.bar = value1
Thank you,
---
Masami Hiramatsu (6): tools/bootconfig: Fix a build error accroding to undefined fallthrough bootconfig: Change array value to use child node bootconfig: Support mixing a value and subkeys under a key tools/bootconfig: Support mixed value and subkey test cases docs: bootconfig: Update for mixing value and subkeys bootconfig: Share the checksum function with tools
tools/bootconfig/include/linux/bootconfig.h | 4 + tools/bootconfig/main.c | 62 +++++++++++++------- tools/bootconfig/samples/bad-mixed-kv1.bconf | 3 - tools/bootconfig/samples/bad-mixed-kv2.bconf | 3 - tools/bootconfig/samples/bad-override.bconf | 3 - tools/bootconfig/samples/bad-override2.bconf | 3 - tools/bootconfig/samples/good-mixed-append.bconf | 4 + tools/bootconfig/samples/good-mixed-kv1.bconf | 3 + tools/bootconfig/samples/good-mixed-kv2.bconf | 3 + tools/bootconfig/samples/good-mixed-kv3.bconf | 6 ++ tools/bootconfig/samples/good-mixed-override.bconf | 4 + 11 files changed, 64 insertions(+), 34 deletions(-) delete mode 100644 tools/bootconfig/samples/bad-mixed-kv1.bconf delete mode 100644 tools/bootconfig/samples/bad-mixed-kv2.bconf delete mode 100644 tools/bootconfig/samples/bad-override.bconf delete mode 100644 tools/bootconfig/samples/bad-override2.bconf create mode 100644 tools/bootconfig/samples/good-mixed-append.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv1.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv2.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv3.bconf create mode 100644 tools/bootconfig/samples/good-mixed-override.bconf
-- Masami Hiramatsu (Linaro) <mhiramat@kernel.org>
| |