summaryrefslogtreecommitdiffstats
path: root/discover/kboot-parser.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-03-14 14:18:54 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-04-29 14:31:20 +1000
commite4f5bd235894c11823ac1befe8c8c43063cad026 (patch)
treec5787f3434f43d331edfb55dc64d1d4dfe1cb807 /discover/kboot-parser.c
parent397dc244bfdc2a57fc3e8fd191b0ef60c8a4b66b (diff)
downloadtalos-petitboot-e4f5bd235894c11823ac1befe8c8c43063cad026.zip
talos-petitboot-e4f5bd235894c11823ac1befe8c8c43063cad026.tar.gz
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>
Diffstat (limited to 'discover/kboot-parser.c')
-rw-r--r--discover/kboot-parser.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index b28603e..cb6a248 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -15,12 +15,12 @@ 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, "");
@@ -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[] = {
OpenPOWER on IntegriCloud