X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=dbbda406fe5a022c518c656c4b44e11b692010da;hp=cf27b8ec49c35ff47bfdfff00cc43f36e9f06015;hb=9a5c9c9331f0c0c539cad423a4654015598b0d9d;hpb=bc72527a1426c2159112707d3a6c9bb544fd6647

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index cf27b8e..dbbda40 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -37,6 +37,7 @@
  *    4-byte len, initrd_file
  *    4-byte len, dtb_file
  *    4-byte len, boot_args
+ *    4-byte len, args_sig_file
  *
  * action = 0x2: device remove message
  *  payload:
@@ -49,6 +50,7 @@
  *   4-byte len, initrd_file
  *   4-byte len, dtb_file
  *   4-byte len, boot_args
+ *   4-byte len, args_sig_file
  *
  */
 
@@ -72,6 +74,9 @@ void pb_protocol_dump_device(const struct device *dev, const char *text,
 		fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file);
 		fprintf(stream, "%s\t\tdtb:  %s\n", text, opt->dtb_file);
 		fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
+		fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file);
+		fprintf(stream, "%s\t\ttype: %s\n", text,
+			opt->type == DISCOVER_BOOT_OPTION ? "boot" : "plugin");
 	}
 }
 
@@ -197,7 +202,9 @@ int pb_protocol_boot_option_len(const struct boot_option *opt)
 		4 + optional_strlen(opt->initrd_file) +
 		4 + optional_strlen(opt->dtb_file) +
 		4 + optional_strlen(opt->boot_args) +
-		sizeof(opt->is_default);
+		4 + optional_strlen(opt->args_sig_file) +
+		sizeof(opt->is_default) +
+		sizeof(opt->type);
 }
 
 int pb_protocol_boot_len(const struct boot_command *boot)
@@ -206,14 +213,16 @@ int pb_protocol_boot_len(const struct boot_command *boot)
 		4 + optional_strlen(boot->boot_image_file) +
 		4 + optional_strlen(boot->initrd_file) +
 		4 + optional_strlen(boot->dtb_file) +
-		4 + optional_strlen(boot->boot_args);
+		4 + optional_strlen(boot->boot_args) +
+		4 + optional_strlen(boot->args_sig_file) +
+		4 + optional_strlen(boot->console);
 }
 
-int pb_protocol_boot_status_len(const struct boot_status *status)
+int pb_protocol_boot_status_len(const struct status *status)
 {
-	return  4 +
+	return  4 +	/* type */
 		4 + optional_strlen(status->message) +
-		4 + optional_strlen(status->detail) +
+		4 +	/* backlog */
 		4;
 }
 
@@ -225,11 +234,26 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		4 + optional_strlen(sysinfo->identifier) +
 		4 + 4;
 
+	len +=	4;
+	for (i = 0; i < sysinfo->n_primary; i++)
+		len += 4 + optional_strlen(sysinfo->platform_primary[i]);
+	len +=	4;
+	for (i = 0; i < sysinfo->n_other; i++)
+		len += 4 + optional_strlen(sysinfo->platform_other[i]);
+
+	len +=	4;
+	for (i = 0; i < sysinfo->n_bmc_current; i++)
+		len += 4 + optional_strlen(sysinfo->bmc_current[i]);
+	len +=	4;
+	for (i = 0; i < sysinfo->n_bmc_golden; i++)
+		len += 4 + optional_strlen(sysinfo->bmc_golden[i]);
+
 	for (i = 0; i < sysinfo->n_interfaces; i++) {
 		struct interface_info *if_info = sysinfo->interfaces[i];
 		len +=	4 + if_info->hwaddr_size +
 			4 + optional_strlen(if_info->name) +
-			sizeof(if_info->link);
+			sizeof(if_info->link) +
+			4 + optional_strlen(if_info->address);
 	}
 
 	for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -239,6 +263,9 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 			4 + optional_strlen(bd_info->mountpoint);
 	}
 
+	/* BMC MAC */
+	len += HWADDR_SIZE;
+
 	return len;
 }
 
@@ -257,8 +284,11 @@ static int pb_protocol_interface_config_len(struct interface_config *conf)
 	if (conf->method == CONFIG_METHOD_STATIC) {
 		len += 4 + optional_strlen(conf->static_config.address);
 		len += 4 + optional_strlen(conf->static_config.gateway);
+		len += 4 + optional_strlen(conf->static_config.url);
 	}
 
+	len += 4 /* conf->override */;
+
 	return len;
 }
 
@@ -267,7 +297,8 @@ int pb_protocol_config_len(const struct config *config)
 	unsigned int i, len;
 
 	len =	4 /* config->autoboot_enabled */ +
-		4 /* config->autoboot_timeout_sec */;
+		4 /* config->autoboot_timeout_sec */ +
+		4 /* config->safe_mode */;
 
 	len += 4;
 	for (i = 0; i < config->network.n_interfaces; i++)
@@ -278,8 +309,56 @@ int pb_protocol_config_len(const struct config *config)
 	for (i = 0; i < config->network.n_dns_servers; i++)
 		len += 4 + optional_strlen(config->network.dns_servers[i]);
 
+	len += 4 + optional_strlen(config->http_proxy);
+	len += 4 + optional_strlen(config->https_proxy);
+
 	len += 4;
-	len += config->n_boot_priorities * 8;
+	for (i = 0; i < config->n_autoboot_opts; i++) {
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+			len += 4 + 4;
+		else
+			len += 4 + 4 +
+				optional_strlen(config->autoboot_opts[i].uuid);
+	}
+
+	len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
+
+	len += 4; /* allow_writes */
+
+	len += 4; /* n_consoles */
+	for (i = 0; i < config->n_consoles; i++)
+		len += 4 + optional_strlen(config->consoles[i]);
+
+	len += 4 + optional_strlen(config->boot_console);
+	len += 4; /* manual_console */
+
+	len += 4 + optional_strlen(config->lang);
+
+	return len;
+}
+
+int pb_protocol_url_len(const char *url)
+{
+	/* url + length field */
+	return 4 + optional_strlen(url);
+}
+
+
+int pb_protocol_plugin_option_len(const struct plugin_option *opt)
+{
+	unsigned int i, len = 0;
+
+	len += 4 + optional_strlen(opt->id);
+	len += 4 + optional_strlen(opt->name);
+	len += 4 + optional_strlen(opt->vendor);
+	len += 4 + optional_strlen(opt->vendor_id);
+	len += 4 + optional_strlen(opt->version);
+	len += 4 + optional_strlen(opt->date);
+	len += 4 + optional_strlen(opt->plugin_file);
+
+	len += 4; /* n_executables */
+	for (i = 0; i < opt->n_executables; i++)
+		len += 4 + optional_strlen(opt->executables[i]);
 
 	return len;
 }
@@ -316,10 +395,14 @@ 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->dtb_file);
 	pos += pb_protocol_serialise_string(pos, opt->boot_args);
+	pos += pb_protocol_serialise_string(pos, opt->args_sig_file);
 
 	*(bool *)pos = opt->is_default;
 	pos += sizeof(bool);
 
+	*(uint32_t *)pos = __cpu_to_be32(opt->type);
+	pos += 4;
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
@@ -336,6 +419,8 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
 	pos += pb_protocol_serialise_string(pos, boot->initrd_file);
 	pos += pb_protocol_serialise_string(pos, boot->dtb_file);
 	pos += pb_protocol_serialise_string(pos, boot->boot_args);
+	pos += pb_protocol_serialise_string(pos, boot->args_sig_file);
+	pos += pb_protocol_serialise_string(pos, boot->console);
 
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
@@ -343,7 +428,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
 	return 0;
 }
 
-int pb_protocol_serialise_boot_status(const struct boot_status *status,
+int pb_protocol_serialise_boot_status(const struct status *status,
 		char *buf, int buf_len)
 {
 	char *pos = buf;
@@ -352,10 +437,9 @@ int pb_protocol_serialise_boot_status(const struct boot_status *status,
 	pos += sizeof(uint32_t);
 
 	pos += pb_protocol_serialise_string(pos, status->message);
-	pos += pb_protocol_serialise_string(pos, status->detail);
 
-	*(uint32_t *)pos = __cpu_to_be32(status->type);
-	pos += sizeof(uint32_t);
+	*(bool *)pos = __cpu_to_be32(status->backlog);
+	pos += sizeof(bool);
 
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
@@ -372,6 +456,26 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 	pos += pb_protocol_serialise_string(pos, sysinfo->type);
 	pos += pb_protocol_serialise_string(pos, sysinfo->identifier);
 
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_primary);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_primary; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_primary[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_other; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_other[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_current);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_bmc_current; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->bmc_current[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_golden);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_bmc_golden; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->bmc_golden[i]);
+
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces);
 	pos += sizeof(uint32_t);
 
@@ -388,6 +492,8 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 
 		*(bool *)pos = if_info->link;
 		pos += sizeof(bool);
+
+		pos += pb_protocol_serialise_string(pos, if_info->address);
 	}
 
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -401,6 +507,12 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 		pos += pb_protocol_serialise_string(pos, bd_info->mountpoint);
 	}
 
+	if (sysinfo->bmc_mac)
+		memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE);
+	else
+		memset(pos, 0, HWADDR_SIZE);
+	pos += HWADDR_SIZE;
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
@@ -429,8 +541,13 @@ static int pb_protocol_serialise_config_interface(char *buf,
 				conf->static_config.address);
 		pos += pb_protocol_serialise_string(pos,
 				conf->static_config.gateway);
+		pos += pb_protocol_serialise_string(pos,
+				conf->static_config.url);
 	}
 
+	*(uint32_t *)pos = conf->override;
+	pos += 4;
+
 	return pos - buf;
 }
 
@@ -446,6 +563,9 @@ int pb_protocol_serialise_config(const struct config *config,
 	*(uint32_t *)pos = __cpu_to_be32(config->autoboot_timeout_sec);
 	pos += 4;
 
+	*(uint32_t *)pos = config->safe_mode;
+	pos += 4;
+
 	*(uint32_t *)pos = __cpu_to_be32(config->network.n_interfaces);
 	pos += 4;
 	for (i = 0; i < config->network.n_interfaces; i++) {
@@ -461,17 +581,82 @@ int pb_protocol_serialise_config(const struct config *config,
 				config->network.dns_servers[i]);
 	}
 
-	*(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
+	pos += pb_protocol_serialise_string(pos, config->http_proxy);
+	pos += pb_protocol_serialise_string(pos, config->https_proxy);
+
+	*(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
 	pos += 4;
-	for (i = 0; i < config->n_boot_priorities; i++) {
-		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].type);
-		pos += 4;
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].priority);
+			__cpu_to_be32(config->autoboot_opts[i].boot_type);
 		pos += 4;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			*(uint32_t *)pos =
+				__cpu_to_be32(config->autoboot_opts[i].type);
+			pos += 4;
+		} else {
+			pos += pb_protocol_serialise_string(pos,
+						config->autoboot_opts[i].uuid);
+		}
 	}
 
+	*(uint32_t *)pos = __cpu_to_be32(config->ipmi_bootdev);
+	pos += 4;
+	*(uint32_t *)pos = config->ipmi_bootdev_persistent;
+	pos += 4;
+
+	*(uint32_t *)pos = config->allow_writes;
+	pos += 4;
+
+	*(uint32_t *)pos = __cpu_to_be32(config->n_consoles);
+	pos += 4;
+	for (i = 0; i < config->n_consoles; i++)
+		pos += pb_protocol_serialise_string(pos, config->consoles[i]);
+
+	pos += pb_protocol_serialise_string(pos, config->boot_console);
+	*(uint32_t *)pos = config->manual_console;
+	pos += 4;
+
+	pos += pb_protocol_serialise_string(pos, config->lang);
+
+	assert(pos <= buf + buf_len);
+	(void)buf_len;
+
+	return 0;
+}
+
+int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
+{
+	char *pos = buf;
+
+	pos += pb_protocol_serialise_string(pos, url);
+
+	assert(pos <=buf+buf_len);
+	(void)buf_len;
+
+	return 0;
+}
+
+int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
+		char *buf, int buf_len)
+{
+	char *pos = buf;
+	unsigned int i;
+
+	pos += pb_protocol_serialise_string(pos, opt->id);
+	pos += pb_protocol_serialise_string(pos, opt->name);
+	pos += pb_protocol_serialise_string(pos, opt->vendor);
+	pos += pb_protocol_serialise_string(pos, opt->vendor_id);
+	pos += pb_protocol_serialise_string(pos, opt->version);
+	pos += pb_protocol_serialise_string(pos, opt->date);
+	pos += pb_protocol_serialise_string(pos, opt->plugin_file);
+
+	*(uint32_t *)pos = __cpu_to_be32(opt->n_executables);
+	pos += 4;
+
+	for (i = 0; i < opt->n_executables; i++)
+		pos += pb_protocol_serialise_string(pos, opt->executables[i]);
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
@@ -640,9 +825,17 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
 	if (read_string(opt, &pos, &len, &opt->boot_args))
 		goto out;
 
+	if (read_string(opt, &pos, &len, &opt->args_sig_file))
+		goto out;
+
 	if (len < sizeof(bool))
 		goto out;
 	opt->is_default = *(bool *)(pos);
+	pos += sizeof(bool);
+	len -= sizeof(bool);
+
+	if (read_u32(&pos, &len, &opt->type))
+		return -1;
 
 	rc = 0;
 
@@ -675,13 +868,19 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd,
 	if (read_string(cmd, &pos, &len, &cmd->boot_args))
 		goto out;
 
+	if (read_string(cmd, &pos, &len, &cmd->args_sig_file))
+		goto out;
+
+	if (read_string(cmd, &pos, &len, &cmd->console))
+		goto out;
+
 	rc = 0;
 
 out:
 	return rc;
 }
 
-int pb_protocol_deserialise_boot_status(struct boot_status *status,
+int pb_protocol_deserialise_boot_status(struct status *status,
 		const struct pb_protocol_message *message)
 {
 	unsigned int len;
@@ -698,8 +897,8 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
 	status->type = __be32_to_cpu(*(uint32_t *)(pos));
 
 	switch (status->type) {
-	case BOOT_STATUS_ERROR:
-	case BOOT_STATUS_INFO:
+	case STATUS_ERROR:
+	case STATUS_INFO:
 		break;
 	default:
 		goto out;
@@ -708,22 +907,13 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
 	pos += sizeof(uint32_t);
 	len -= sizeof(uint32_t);
 
-	/* message and detail strings */
+	/* message string */
 	if (read_string(status, &pos, &len, &status->message))
 		goto out;
 
-	if (read_string(status, &pos, &len, &status->detail))
-		goto out;
-
-	/* and finally, progress */
-	if (len < sizeof(uint32_t))
-		goto out;
-
-	status->progress = __be32_to_cpu(*(uint32_t *)(pos));
-
-	/* clamp to 100% */
-	if (status->progress > 100)
-		status->progress = 100;
+	/* backlog */
+	status->backlog = *(bool *)pos;
+	pos += sizeof(status->backlog);
 
 	rc = 0;
 
@@ -737,6 +927,7 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	unsigned int len, i;
 	const char *pos;
 	int rc = -1;
+	char *tmp;
 
 	len = message->payload_len;
 	pos = message->payload;
@@ -748,6 +939,48 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	if (read_string(sysinfo, &pos, &len, &sysinfo->identifier))
 		goto out;
 
+	/* Platform version strings for openpower platforms */
+	if (read_u32(&pos, &len, &sysinfo->n_primary))
+		goto out;
+	sysinfo->platform_primary = talloc_array(sysinfo, char *,
+						sysinfo->n_primary);
+	for (i = 0; i < sysinfo->n_primary; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_primary[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	if (read_u32(&pos, &len, &sysinfo->n_other))
+		goto out;
+	sysinfo->platform_other = talloc_array(sysinfo, char *,
+						sysinfo->n_other);
+	for (i = 0; i < sysinfo->n_other; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_other[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	/* BMC version strings for openpower platforms */
+	if (read_u32(&pos, &len, &sysinfo->n_bmc_current))
+		goto out;
+	sysinfo->bmc_current = talloc_array(sysinfo, char *,
+						sysinfo->n_bmc_current);
+	for (i = 0; i < sysinfo->n_bmc_current; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->bmc_current[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	if (read_u32(&pos, &len, &sysinfo->n_bmc_golden))
+		goto out;
+	sysinfo->bmc_golden = talloc_array(sysinfo, char *,
+						sysinfo->n_bmc_golden);
+	for (i = 0; i < sysinfo->n_bmc_golden; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->bmc_golden[i] = talloc_strdup(sysinfo, tmp);
+	}
+
 	/* number of interfaces */
 	if (read_u32(&pos, &len, &sysinfo->n_interfaces))
 		goto out;
@@ -776,6 +1009,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 		if_info->link = *(bool *)pos;
 		pos += sizeof(if_info->link);
 
+		if (read_string(if_info, &pos, &len, &if_info->address))
+			goto out;
+
 		sysinfo->interfaces[i] = if_info;
 	}
 
@@ -801,8 +1037,18 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 
 		sysinfo->blockdevs[i] = bd_info;
 	}
-	rc = 0;
 
+	for (i = 0; i < HWADDR_SIZE; i++) {
+		if (pos[i] != 0) {
+			sysinfo->bmc_mac = talloc_memdup(sysinfo, pos, HWADDR_SIZE);
+			break;
+		}
+	}
+
+	pos += HWADDR_SIZE;
+	len -= HWADDR_SIZE;
+
+	rc = 0;
 out:
 	return rc;
 }
@@ -835,8 +1081,15 @@ static int pb_protocol_deserialise_config_interface(const char **buf,
 
 		if (read_string(iface, buf, len, &iface->static_config.gateway))
 			return -1;
+
+		if (read_string(iface, buf, len, &iface->static_config.url))
+			return -1;
 	}
 
+	if (read_u32(buf, len, &tmp))
+		return -1;
+	iface->override = !!tmp;
+
 	return 0;
 }
 
@@ -846,6 +1099,7 @@ int pb_protocol_deserialise_config(struct config *config,
 	unsigned int len, i, tmp;
 	const char *pos;
 	int rc = -1;
+	char *str;
 
 	len = message->payload_len;
 	pos = message->payload;
@@ -857,6 +1111,10 @@ int pb_protocol_deserialise_config(struct config *config,
 	if (read_u32(&pos, &len, &config->autoboot_timeout_sec))
 		goto out;
 
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->safe_mode = !!tmp;
+
 	if (read_u32(&pos, &len, &config->network.n_interfaces))
 		goto out;
 
@@ -878,28 +1136,132 @@ int pb_protocol_deserialise_config(struct config *config,
 			config->network.n_dns_servers);
 
 	for (i = 0; i < config->network.n_dns_servers; i++) {
-		char *tmp;
-		if (read_string(config->network.dns_servers, &pos, &len, &tmp))
+		if (read_string(config->network.dns_servers, &pos, &len, &str))
 			goto out;
-		config->network.dns_servers[i] = tmp;
+		config->network.dns_servers[i] = str;
 	}
 
-	if (read_u32(&pos, &len, &config->n_boot_priorities))
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+	config->http_proxy = str;
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+	config->https_proxy = str;
+
+	if (read_u32(&pos, &len, &config->n_autoboot_opts))
 		goto out;
-	config->boot_priorities = talloc_array(config, struct boot_priority,
-			config->n_boot_priorities);
+	config->autoboot_opts = talloc_array(config, struct autoboot_option,
+			config->n_autoboot_opts);
 
-	for (i = 0; i < config->n_boot_priorities; i++) {
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		if (read_u32(&pos, &len, &tmp))
 			goto out;
-		config->boot_priorities[i].priority = (int)tmp;
-		if (read_u32(&pos, &len, &tmp))
+		config->autoboot_opts[i].boot_type = (int)tmp;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			if (read_u32(&pos, &len, &tmp))
+				goto out;
+			config->autoboot_opts[i].type = tmp;
+		} else {
+			if (read_string(config, &pos, &len, &str))
+				goto out;
+			config->autoboot_opts[i].uuid = str;
+		}
+	}
+
+	if (read_u32(&pos, &len, &config->ipmi_bootdev))
+		goto out;
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->ipmi_bootdev_persistent = !!tmp;
+
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->allow_writes = !!tmp;
+
+	if (read_u32(&pos, &len, &config->n_consoles))
+		goto out;
+
+	config->consoles = talloc_array(config, char *, config->n_consoles);
+	for (i = 0; i < config->n_consoles; i++) {
+		if (read_string(config->consoles, &pos, &len, &str))
 			goto out;
-		config->boot_priorities[i].type = tmp;
+		config->consoles[i] = str;
 	}
 
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+
+	config->boot_console = str;
+
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->manual_console = !!tmp;
+
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+
+	config->lang = str;
+
 	rc = 0;
 
 out:
 	return rc;
 }
+
+int pb_protocol_deserialise_plugin_option(struct plugin_option *opt,
+		const struct pb_protocol_message *message)
+{
+	unsigned int len, i, tmp;
+	const char *pos;
+	int rc = -1;
+	char *str;
+
+	len = message->payload_len;
+	pos = message->payload;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->id = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->name = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->vendor = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->vendor_id = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->version = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->date = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->plugin_file = str;
+
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	opt->n_executables = tmp;
+
+	opt->executables = talloc_zero_array(opt, char *, opt->n_executables);
+	if (!opt->executables)
+		goto out;
+
+	for (i = 0; i < opt->n_executables; i++) {
+		if (read_string(opt, &pos, &len, &str))
+			goto out;
+		opt->executables[i] = talloc_strdup(opt, str);
+	}
+
+	rc = 0;
+out:
+	return rc;
+}