discover/yaboot: Remove known_names list
authorJeremy Kerr <jk@ozlabs.org>
Tue, 14 Jan 2014 03:04:54 +0000 (11:04 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 14 Jan 2014 03:07:03 +0000 (11:07 +0800)
The known_names list only duplicates the arg matching we do in the body
of the parser, and so introduces a problem when the array becomes out of
sync.

We drop the priority of the "unknown name" messages to pb_debug, as this
isn't really imporant unless we're debugging.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/yaboot-parser.c

index eaefbf0041572cfbcd7dd3fdf3a376d7bd657718..4dd1ea5be9648214f7a14b64b837839723fb9e60 100644 (file)
@@ -16,7 +16,6 @@
 
 struct yaboot_state {
        int globals_done;
-       const char *const *known_names;
 
        /* current option data */
        struct discover_boot_option *opt;
@@ -194,9 +193,6 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
        if (!state->globals_done && conf_set_global_option(conf, name, value))
                return;
 
-       if (!conf_param_in_list(state->known_names, name))
-               return;
-
        /* image */
        if (streq(name, "image")) {
                /* an image section finishes our global defintions */
@@ -244,7 +240,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 
        /* all other processing requires an image */
        if (!opt) {
-               pb_log("%s: unknown name: %s\n", __func__, name);
+               pb_debug("%s: unknown name: %s\n", __func__, name);
                return;
        }
 
@@ -310,7 +306,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
                return;
        }
 
-       pb_log("%s: unknown name: %s\n", __func__, name);
+       pb_debug("%s: unknown name: %s\n", __func__, name);
 }
 
 static struct conf_global_option yaboot_global_options[] = {
@@ -340,24 +336,6 @@ static const char *const yaboot_conf_files[] = {
        NULL
 };
 
-static const char *yaboot_known_names[] = {
-       "append",
-       "image",
-       "image[64bit]", /* SUSE extension */
-       "image[32bit]", /* SUSE extension */
-       "initrd",
-       "initrd-size",
-       "label",
-       "literal",
-       "ramdisk",
-       "read-only",
-       "read-write",
-       "root",
-       "device",
-       "partition",
-       NULL
-};
-
 static int yaboot_parse(struct discover_context *dc)
 {
        const char * const *filename;
@@ -383,8 +361,6 @@ static int yaboot_parse(struct discover_context *dc)
        conf->finish = yaboot_finish;
        conf->parser_info = state = talloc_zero(conf, struct yaboot_state);
 
-       state->known_names = yaboot_known_names;
-
        state->opt = NULL;
 
        for (filename = yaboot_conf_files; *filename; filename++) {