discover: Introduce a container type for boot options

This change introduces a new type, struct discover_boot_option. Like
struct discover_device adds discover-specific data to struct device,
struct discover_boot_option allows the discover server to store more
than just the boot option strings for a boot option.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 23 insertions, 8 deletions

diff --git a/test/parser/parser-test.c b/test/parser/parser-test.c
index d8ec75b..cd6e62f 100644
--- a/test/parser/parser-test.c
+++ b/test/parser/parser-test.c
@@ -22,17 +22,32 @@ struct device *discover_context_device(struct discover_context *ctx)
 	return ctx->device->device;
 }
 
+struct discover_boot_option *discover_boot_option_create(
+		struct discover_context *ctx,
+		struct discover_device *dev)
+{
+	struct discover_boot_option *opt;
+
+	opt = talloc_zero(ctx, struct discover_boot_option);
+	opt->option = talloc(opt, struct boot_option);
+	opt->device = dev;
+
+	return opt;
+}
+
 void discover_context_add_boot_option(struct discover_context *ctx,
-		struct boot_option *boot_option)
+		struct discover_boot_option *boot_option)
 {
+	struct boot_option *opt = boot_option->option;
+
 	fprintf(testf, "%s: %s\n", __func__, ctx->device->device->id);
-	fprintf(testf, " id     '%s'\n", boot_option->id);
-	fprintf(testf, " name   '%s'\n", boot_option->name);
-	fprintf(testf, " descr  '%s'\n", boot_option->description);
-	fprintf(testf, " icon   '%s'\n", boot_option->icon_file);
-	fprintf(testf, " image  '%s'\n", boot_option->boot_image_file);
-	fprintf(testf, " initrd '%s'\n", boot_option->initrd_file);
-	fprintf(testf, " args   '%s'\n", boot_option->boot_args);
+	fprintf(testf, " id     '%s'\n", opt->id);
+	fprintf(testf, " name   '%s'\n", opt->name);
+	fprintf(testf, " descr  '%s'\n", opt->description);
+	fprintf(testf, " icon   '%s'\n", opt->icon_file);
+	fprintf(testf, " image  '%s'\n", opt->boot_image_file);
+	fprintf(testf, " initrd '%s'\n", opt->initrd_file);
+	fprintf(testf, " args   '%s'\n", opt->boot_args);
 	fflush(testf);
 }