discover: Fix boot with initrd error

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 6f278c89ac00e24185b8d8071152b3825076b413..31637c611c19993a390bd6e1fe86ff917a96ba58 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -38,8 +38,38 @@
  * action = 0x2: device remove message
  *  payload:
  *   4-byte len, id
+ *
+ * action = 0x3: boot
+ *  payload:
+ *   4-byte len, boot option id
+ *   4-byte len, boot_image_file
+ *   4-byte len, initrd_file
+ *   4-byte len, boot_args
+ *
  */
 
+void pb_protocol_dump_device(const struct device *dev, const char *text,
+       FILE *stream)
+{
+       struct boot_option *opt;
+
+       fprintf(stream, "%snew dev:\n", text);
+       fprintf(stream, "%s\tid:   %s\n", text, dev->id);
+       fprintf(stream, "%s\tname: %s\n", text, dev->name);
+       fprintf(stream, "%s\tdesc: %s\n", text, dev->description);
+       fprintf(stream, "%s\ticon: %s\n", text, dev->icon_file);
+       fprintf(stream, "%s\tboot options:\n", text);
+       list_for_each_entry(&dev->boot_options, opt, list) {
+               fprintf(stream, "%s\t\tid:   %s\n", text, opt->id);
+               fprintf(stream, "%s\t\tname: %s\n", text, opt->name);
+               fprintf(stream, "%s\t\tdesc: %s\n", text, opt->description);
+               fprintf(stream, "%s\t\ticon: %s\n", text, opt->icon_file);
+               fprintf(stream, "%s\t\tboot: %s\n", text, opt->boot_image_file);
+               fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file);
+               fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
+       }
+}
+
 int pb_protocol_device_cmp(const struct device *a, const struct device *b)
 {
        return !strcmp(a->id, b->id);
@@ -153,6 +183,14 @@ int pb_protocol_device_len(const struct device *dev)
        return len;
 }
 
+int pb_protocol_boot_len(const struct boot_command *boot)
+{
+       return  4 + optional_strlen(boot->option_id) +
+               4 + optional_strlen(boot->boot_image_file) +
+               4 + optional_strlen(boot->initrd_file) +
+               4 + optional_strlen(boot->boot_args);
+}
+
 int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len)
 {
        struct boot_option *opt;
@@ -188,6 +226,23 @@ int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_le
        }
 
        assert(pos <= buf + buf_len);
+       (void)buf_len;
+
+       return 0;
+}
+
+int pb_protocol_serialise_boot_command(const struct boot_command *boot,
+               char *buf, int buf_len)
+{
+       char *pos = buf;
+
+       pos += pb_protocol_serialise_string(pos, boot->option_id);
+       pos += pb_protocol_serialise_string(pos, boot->boot_image_file);
+       pos += pb_protocol_serialise_string(pos, boot->initrd_file);
+       pos += pb_protocol_serialise_string(pos, boot->boot_args);
+
+       assert(pos <= buf + buf_len);
+       (void)buf_len;
 
        return 0;
 }
@@ -311,6 +366,8 @@ struct device *pb_protocol_deserialise_device(void *ctx,
        n_options = __be32_to_cpu(*(uint32_t *)pos);
        pos += sizeof(uint32_t);
 
+       dev->n_options = n_options;
+
        list_init(&dev->boot_options);
 
        for (i = 0; i < n_options; i++) {
@@ -347,3 +404,34 @@ out_err:
        talloc_free(dev);
        return NULL;
 }
+
+struct boot_command *pb_protocol_deserialise_boot_command(void *ctx,
+               const struct pb_protocol_message *message)
+{
+       struct boot_command *cmd;
+       const char *pos;
+       unsigned int len;
+
+       len = message->payload_len;
+       pos = message->payload;
+
+       cmd = talloc(ctx, struct boot_command);
+
+       if (read_string(cmd, &pos, &len, &cmd->option_id))
+               goto out_err;
+
+       if (read_string(cmd, &pos, &len, &cmd->boot_image_file))
+               goto out_err;
+
+       if (read_string(cmd, &pos, &len, &cmd->initrd_file))
+               goto out_err;
+
+       if (read_string(cmd, &pos, &len, &cmd->boot_args))
+               goto out_err;
+
+       return cmd;
+
+out_err:
+       talloc_free(cmd);
+       return NULL;
+}