From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EB46C433ED for ; Sun, 16 May 2021 14:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 197A861182 for ; Sun, 16 May 2021 14:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234313AbhEPO4m (ORCPT ); Sun, 16 May 2021 10:56:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:57066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233315AbhEPO4k (ORCPT ); Sun, 16 May 2021 10:56:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 70BDB61164; Sun, 16 May 2021 14:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621176925; bh=dn6GE+Lq6/Xug//qBZNXy7D+IA711hrw/+IBBSmvd2A=; h=From:To:Cc:Subject:Date:From; b=HqvDWxlSTLMlSuXotEbY29qRO3J5eu/aLC5UUBPegLohswRlzHWlAhQtB0scfaXVN dJx0Pn1jjQlN1dFMugjU0fGIMw2/hEVLcxG3CKBHsMVwkPmXGZEJbPZC/tthvQoqRo VAfv8lJ+tXwpH+WShSYEoWLjoZErG2kAc8Ui9Pgc2JfvLzcTr2M/+B18DzDLDs+geW Dtr0yOmW4kgG9sbTzYPA+xlEhFBriAaDxAu3OIG3YbcM4X/i7AbIyDWDOYYEd4AkTw /G7tPsW/phXFxQGo8Kakh7YrBLwdnrBmStP3YIOBlSkyy/R+tUa3Wu1KhuVUdh5Z1o qhI16lFYd4Hmw== From: Masami Hiramatsu To: Steven Rostedt Cc: LKML , Ingo Molnar , Devin Moore Subject: [PATCH 0/4] bootconfig: Add mixed subkeys and value under the same key Date: Sun, 16 May 2021 23:55:21 +0900 Message-Id: <162117692155.9011.16682190750100804269.stgit@devnote2> X-Mailer: git-send-email 2.25.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, The following series 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. This series depends on the previous bugfix which I sent last week; https://lore.kernel.org/lkml/162087519356.442660.11385099982318160180.stgit@devnote2/ 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 add raw value in the structured key, you have to define it outside of the brace. For example foo.bar = value1 foo.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 (4): 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 tools/bootconfig/main.c | 47 ++++++++++++++++---- 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 ++ 10 files changed, 58 insertions(+), 21 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)