From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH 10/10] kconfig: turn defaults and additional prompt for choice members into error
Date: Mon, 6 May 2024 00:01:50 +0900 [thread overview]
Message-ID: <CAK7LNARNC0ma5FP8WJ23RP-8K2iEz3vDhoB7mhqaFyLP85zgpw@mail.gmail.com> (raw)
In-Reply-To: <20240504183333.2031860-10-masahiroy@kernel.org>
On Sun, May 5, 2024 at 3:34 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> menu_finalize() warns default properties for choice members and prompts
> outside the choice block. These should be hard errors.
>
> While I was here, I moved the checks to slim down menu_finalize().
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> scripts/kconfig/menu.c | 10 ----------
> scripts/kconfig/parser.y | 39 +++++++++++++++++++++++++++++++++++++++
> 2 files changed, 39 insertions(+), 10 deletions(-)
>
> diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
> index a9b1e451dfe7..bee96c9964fd 100644
> --- a/scripts/kconfig/menu.c
> +++ b/scripts/kconfig/menu.c
> @@ -507,16 +507,6 @@ static void _menu_finalize(struct menu *parent, bool inside_choice)
> menu->sym && !sym_is_choice_value(menu->sym)) {
> current_entry = menu;
> menu->sym->flags |= SYMBOL_CHOICEVAL;
> - for (prop = menu->sym->prop; prop; prop = prop->next) {
> - if (prop->type == P_DEFAULT)
> - prop_warn(prop, "defaults for choice "
> - "values not supported");
> - if (prop->menu == menu)
> - continue;
> - if (prop->type == P_PROMPT &&
> - prop->menu->parent->sym != sym)
> - prop_warn(prop, "choice value used outside its choice group");
> - }
> /* Non-tristate choice values of tristate choices must
> * depend on the choice being set to Y. The choice
> * values' dependencies were propagated to their
> diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
> index ed86869e5ed0..0a9e249b5dcc 100644
> --- a/scripts/kconfig/parser.y
> +++ b/scripts/kconfig/parser.y
> @@ -476,6 +476,37 @@ assign_val:
>
> %%
>
> +/**
> + * choice_check_sanity - check sanity of a choice member
> + *
> + * @menu: menu of the choice member
> + *
> + * Return: -1 if an error is found, 0 otherwise.
> + */
> +static int choice_check_sanity(struct menu *menu)
> +{
> + struct property *prop;
> + int ret = 0;
> +
> + for (prop = menu->sym->prop; prop; prop = prop->next) {
> + if (prop->type == P_DEFAULT) {
> + fprintf(stderr, "%s:%d: error: %s",
> + prop->filename, prop->lineno,
> + "defaults for choice values not supported\n");
> + ret = -1;
> + }
> +
> + if (prop->menu != menu && prop->type == P_PROMPT) {
> + fprintf(stderr, "%s:%d: error: %s",
> + prop->filename, prop->lineno,
> + "choice value has a prompt outside its choice group\n");
> + ret = -1;
> + }
> + }
> +
> + return ret;
> +}
> +
I observed an error in powerpc.
I will fix up this as follows:
diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index 0a9e249b5dcc..ff709001b1f0 100644
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -496,7 +496,8 @@ static int choice_check_sanity(struct menu *menu)
ret = -1;
}
- if (prop->menu != menu && prop->type == P_PROMPT) {
+ if (prop->menu != menu && prop->type == P_PROMPT &&
+ prop->menu->parent != menu->parent) {
fprintf(stderr, "%s:%d: error: %s",
prop->filename, prop->lineno,
"choice value has a prompt outside its
choice group\n");
--
Best Regards
Masahiro Yamada
prev parent reply other threads:[~2024-05-05 15:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 18:33 [PATCH 01/10] kconfig: gconf: redraw pane correctly after loading a config file Masahiro Yamada
2024-05-04 18:33 ` [PATCH 02/10] kconfig: gconf: remove debug code Masahiro Yamada
2024-05-04 18:33 ` [PATCH 03/10] kconfig: gconf: use MENU_CHANGED instead of SYMBOL_CHANGED Masahiro Yamada
2024-05-04 18:33 ` [PATCH 04/10] kconfig: used linked list in sym_set_changed() Masahiro Yamada
2024-05-04 18:33 ` [PATCH 05/10] kconfig: add sym_get_choice_menu() helper Masahiro Yamada
2024-05-04 18:33 ` [PATCH 06/10] kconfig: use sym_get_choice_menu() in conf_write_defconfig() Masahiro Yamada
2024-05-04 18:33 ` [PATCH 07/10] kconfig: use menu_list_for_each_sym() in sym_check_choice_deps() Masahiro Yamada
2024-05-04 18:33 ` [PATCH 08/10] kconfig: turn conf_choice() into void function Masahiro Yamada
2024-05-04 18:33 ` [PATCH 09/10] kconfig: turn missing prompt for choice members into error Masahiro Yamada
2024-05-04 18:33 ` [PATCH 10/10] kconfig: turn defaults and additional " Masahiro Yamada
2024-05-05 15:01 ` Masahiro Yamada [this message]
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=CAK7LNARNC0ma5FP8WJ23RP-8K2iEz3vDhoB7mhqaFyLP85zgpw@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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 read-only IMAP folder(s) and NNTP newsgroup(s).