kconfig: loop as long as we changed some symbols in randconfig

Because of choice-in-a-choice constructs, it can happen that not all
symbols are assigned a value during randconfig, leading in rare cases
to this situation:

    ---8<--- choice-in-choice.in
    choice
        bool "A/B/C"
    config A
        bool "A"

    config B
        bool "B"
    if B
    choice
        bool "E/F"
    config E
        bool "E"
    config F
        bool "F"
    endchoice
    endif # B

    config C
        bool "C"
    endchoice
    ---8<---

    $ ./config/conf --randconfig choice-in-choice.in
    [--SNIP--]
    $ ./config/conf --silentoldconfig choice-in-choice.in </dev/null
    [--SNIP--]
    A/B/C
      1. A (A)
    > 2. B (B)
      3. C (C)
    choice[1-3]: 2
      E/F
      > 1. E (E) (NEW)
        2. F (F) (NEW)
      choice[1-2]: aborted!

    Console input/output is redirected. Run 'make oldconfig' to update
    configuration.

Fix this by looping in randconfig for as long as some symbol gets assigned
a value.

Note: this was spotted with the USB EHCI Debug Device Gadget (USB_G_DBGP),
which uses this choice-in-a-choice construct, and exhibits this problem.
The example above is just a stripped-down minimalist test-case.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/config/conf.c b/config/conf.c
index 893f031283114ef403c44ca2e9706d2ec551902e..e308f5bf09a546b85017eea5e551ddbc8ceecc7b 100644 (file)
--- a/config/conf.c
+++ b/config/conf.c
@@ -615,7 +615,8 @@ int main(int ac, char **av)
                conf_set_all_new_symbols(def_default);
                break;
        case randconfig:
                conf_set_all_new_symbols(def_default);
                break;
        case randconfig:

-               conf_set_all_new_symbols(def_random);
+               /* Really nothing to do in this loop */
+               while (conf_set_all_new_symbols(def_random)) ;

                break;
        case defconfig:
                conf_set_all_new_symbols(def_default);
                break;
        case defconfig:
                conf_set_all_new_symbols(def_default);

diff --git a/config/confdata.c b/config/confdata.c
index 4a88b8dd7246f2beb956c66cce9ba0bb068925f6..8128254a6265626e1f89efdec27d6ea06b830ea1 100644 (file)
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -1103,7 +1103,7 @@ void conf_set_changed_callback(void (*fn)(void))
        conf_changed_callback = fn;
 }
 
        conf_changed_callback = fn;
 }
 

-static void randomize_choice_values(struct symbol *csym)
+static bool randomize_choice_values(struct symbol *csym)

 {
        struct property *prop;
        struct symbol *sym;
 {
        struct property *prop;
        struct symbol *sym;


@@ -1116,7 +1116,7 @@ static void randomize_choice_values(struct symbol *csym)
         * In both cases stop.
         */
        if (csym->curr.tri != yes)
         * In both cases stop.
         */
        if (csym->curr.tri != yes)

-               return;
+               return false;

 
        prop = sym_get_choice_prop(csym);
 
 
        prop = sym_get_choice_prop(csym);
 


@@ -1147,6 +1147,8 @@ static void randomize_choice_values(struct symbol *csym)
        csym->flags |= SYMBOL_DEF_USER;
        /* clear VALID to get value calculated */
        csym->flags &= ~(SYMBOL_VALID);
        csym->flags |= SYMBOL_DEF_USER;
        /* clear VALID to get value calculated */
        csym->flags &= ~(SYMBOL_VALID);

+
+       return true;

 }
 
 void set_all_choice_values(struct symbol *csym)
 }
 
 void set_all_choice_values(struct symbol *csym)


@@ -1169,7 +1171,7 @@ void set_all_choice_values(struct symbol *csym)
        csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
 }
 
        csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
 }
 

-void conf_set_all_new_symbols(enum conf_def_mode mode)
+bool conf_set_all_new_symbols(enum conf_def_mode mode)

 {
        struct symbol *sym, *csym;
        int i, cnt, pby, pty, ptm;      /* pby: probability of boolean  = y
 {
        struct symbol *sym, *csym;
        int i, cnt, pby, pty, ptm;      /* pby: probability of boolean  = y


@@ -1217,6 +1219,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                        exit( 1 );
                }
        }
                        exit( 1 );
                }
        }

+       bool has_changed = false;

 
        for_all_symbols(i, sym) {
                if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
 
        for_all_symbols(i, sym) {
                if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))


@@ -1224,6 +1227,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                switch (sym_get_type(sym)) {
                case S_BOOLEAN:
                case S_TRISTATE:
                switch (sym_get_type(sym)) {
                case S_BOOLEAN:
                case S_TRISTATE:

+                       has_changed = true;

                        switch (mode) {
                        case def_yes:
                                sym->def[S_DEF_USER].tri = yes;
                        switch (mode) {
                        case def_yes:
                                sym->def[S_DEF_USER].tri = yes;


@@ -1282,6 +1286,12 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
 
                sym_calc_value(csym);
                if (mode == def_random)
 
                sym_calc_value(csym);
                if (mode == def_random)

-                       randomize_choice_values(csym);
+                       has_changed = randomize_choice_values(csym);
+               else {
+                       set_all_choice_values(csym);
+                       has_changed = true;
+               }

        }
        }

+
+       return has_changed;

 }
 }

diff --git a/config/lkc.h b/config/lkc.h
index 0c8d4191ca87940b8653034c1ab56e6883eaab50..09f4edfdc91132887e1e54e09faf1a9b99865965 100644 (file)
--- a/config/lkc.h
+++ b/config/lkc.h
@@ -86,7 +86,7 @@ const char *conf_get_autoconfig_name(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);

-void conf_set_all_new_symbols(enum conf_def_mode mode);
+bool conf_set_all_new_symbols(enum conf_def_mode mode);

 void set_all_choice_values(struct symbol *csym);
 
 struct conf_printer {
 void set_all_choice_values(struct symbol *csym);
 
 struct conf_printer {