discover: Introduce a container type for boot options

[petitboot] / discover / event-parser.c

diff --git a/discover/event-parser.c b/discover/event-parser.c
index 0b96a09ba72365b774b406d94d30feb60f247530..289fee96bdf8da7f688b985ad66b7216985dcbd6 100644 (file)
--- a/discover/event-parser.c
+++ b/discover/event-parser.c
@@ -6,6 +6,7 @@
 #include "talloc/talloc.h"
 #include "event.h"
 #include "parser-utils.h"
+#include "device-handler.h"
 
 /**
  * parse_user_event - Parse a user event.
@@ -13,14 +14,19 @@
  * Understands params: name, image, args.
  */
 
-int parse_user_event(struct device *device, struct event *event)
+int parse_user_event(struct discover_context *ctx, struct event *event)
 {
+       struct discover_boot_option *d_opt;
        struct boot_option *opt;
+       struct device *dev;
        const char *p;
 
-       opt = talloc_zero(device, struct boot_option);
+       dev = ctx->device->device;
 
-       if (!opt)
+       d_opt = discover_boot_option_create(ctx, ctx->device);
+       opt = d_opt->option;
+
+       if (!d_opt)
                goto fail;
 
        p = event_get_param(event, "name");
@@ -30,7 +36,8 @@ int parse_user_event(struct device *device, struct event *event)
                goto fail;
        }
 
-       opt->id = talloc_asprintf(opt, "%s#%s", device->id, p);
+       opt->id = talloc_asprintf(opt, "%s#%s", dev->id, p);
+       opt->device_id = talloc_strdup(opt, dev->id);
        opt->name = talloc_strdup(opt, p);
 
        p = event_get_param(event, "image");
@@ -51,11 +58,11 @@ int parse_user_event(struct device *device, struct event *event)
        opt->description = talloc_asprintf(opt, "%s %s", opt->boot_image_file,
                opt->boot_args);
 
-       device_add_boot_option(device, opt);
+       discover_context_add_boot_option(ctx, d_opt);
 
        return 0;
 
 fail:
-       talloc_free(opt);
+       talloc_free(d_opt);
        return -1;
 }