From: Jeremy Kerr Date: Fri, 17 May 2013 03:41:04 +0000 (+0800) Subject: types: Add is_default to struct boot_option X-Git-Tag: v1.0.0~589 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=936e57208c8e651be0f3dee6cfc635d719410100;ds=sidebyside types: Add is_default to struct boot_option Signed-off-by: Jeremy Kerr --- diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 2792bf8..d3174af 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -177,7 +178,8 @@ int pb_protocol_boot_option_len(const struct boot_option *opt) 4 + optional_strlen(opt->icon_file) + 4 + optional_strlen(opt->boot_image_file) + 4 + optional_strlen(opt->initrd_file) + - 4 + optional_strlen(opt->boot_args); + 4 + optional_strlen(opt->boot_args) + + sizeof(opt->is_default); } int pb_protocol_boot_len(const struct boot_command *boot) @@ -226,6 +228,9 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt, pos += pb_protocol_serialise_string(pos, opt->initrd_file); pos += pb_protocol_serialise_string(pos, opt->boot_args); + *(bool *)pos = opt->is_default; + pos += sizeof(bool); + assert(pos <= buf + buf_len); (void)buf_len; @@ -421,6 +426,10 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt, if (read_string(opt, &pos, &len, &opt->boot_args)) goto out; + if (len < sizeof(bool)) + goto out; + opt->is_default = *(bool *)(pos); + rc = 0; out: diff --git a/lib/types/types.h b/lib/types/types.h index 90b23c3..5be2cb6 100644 --- a/lib/types/types.h +++ b/lib/types/types.h @@ -1,6 +1,7 @@ #ifndef _TYPES_H #define _TYPES_H +#include #include struct device { @@ -24,6 +25,7 @@ struct boot_option { char *boot_image_file; char *initrd_file; char *boot_args; + bool is_default; struct list_item list;