parsers: dynamically register parsers

[petitboot] / discover / kboot-parser.c

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index b28603e3895107299b4a27b4a5e1260f97b6c0cc..884658e8d07bcd6da655fb536bf13d56f27aad85 100644 (file)
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -9,18 +9,18 @@
 #include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
-#include "paths.h"
+#include "resource.h"
 
 static void kboot_process_pair(struct conf_context *conf, const char *name,
                char *value)
 {
        const char *const *ignored_names = conf->parser_info;
-       struct device *dev;
+       struct discover_boot_option *d_opt;
+       struct boot_option *opt;
        char *pos;
        char *args;
        const char *initrd;
        const char *root;
-       struct boot_option *opt;
 
        /* ignore bare values */
 
@@ -35,13 +35,15 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 
        /* opt must be associated with dc */
 
-       dev = conf->dc->device->device;
-       opt = talloc_zero(dev, struct boot_option);
+       d_opt = talloc_zero(conf->dc, struct discover_boot_option);
+       d_opt->device = conf->dc->device;
+       opt = talloc_zero(d_opt, struct boot_option);
 
        if (!opt)
                return;
 
-       opt->id = talloc_asprintf(opt, "%s#%s", dev->id, name);
+       opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->device->id,
+                       name);
        opt->name = talloc_strdup(opt, name);
 
        args = talloc_strdup(opt, "");
@@ -81,8 +83,8 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        }
 
 out_add:
-       opt->boot_image_file = resolve_path(opt, value,
-                       conf->dc->device->device_path);
+       d_opt->boot_image = create_devpath_resource(opt,
+                               conf->dc->device, value);
 
        if (root) {
                opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
@@ -91,8 +93,8 @@ out_add:
                opt->boot_args = args;
 
        if (initrd) {
-               opt->initrd_file = resolve_path(opt, initrd,
-                               conf->dc->device->device_path);
+               d_opt->initrd = create_devpath_resource(opt,
+                               conf->dc->device, initrd);
 
                opt->description = talloc_asprintf(opt, "%s initrd=%s %s",
                        value, initrd, opt->boot_args);
@@ -103,7 +105,7 @@ out_add:
        conf_strip_str(opt->boot_args);
        conf_strip_str(opt->description);
 
-       discover_context_add_boot_option(conf->dc, opt);
+       discover_context_add_boot_option(conf->dc, d_opt);
 }
 
 static struct conf_global_option kboot_global_options[] = {
@@ -155,8 +157,11 @@ static int kboot_parse(struct discover_context *dc, char *buf, int len)
        return 1;
 }
 
-struct parser __kboot_parser = {
-       .name           = "kboot",
-       .parse          = kboot_parse,
-       .filenames      = kboot_conf_files,
+static struct parser kboot_parser = {
+       .name                   = "kboot",
+       .parse                  = kboot_parse,
+       .filenames              = kboot_conf_files,
+       .resolve_resource       = resolve_devpath_resource,
 };
+
+register_parser(kboot_parser);