static const char *devtree_dir = "/proc/device-tree/";
struct platform_powerpc {
- struct param_list params;
+ struct param_list *params;
struct ipmi *ipmi;
- bool ipmi_bootdev_persistent;
int (*get_ipmi_bootdev)(
struct platform_powerpc *platform,
uint8_t *bootdev, bool *persistent);
if (namelen == 0)
continue;
- if (!param_list_is_known_n(&platform->params, name, namelen))
+ if (!param_list_is_known_n(platform->params, name, namelen))
continue;
*value = '\0';
value++;
- param_list_set(&platform->params, name, value, false);
+ param_list_set(platform->params, name, value, false);
}
return 0;
process->path = "nvram";
process->argv = argv;
- param_list_for_each(&platform->params, param) {
+ param_list_for_each(platform->params, param) {
char *paramstr;
if (!param->modified)
return rc;
}
-static char *interface_config_str(void *ctx, struct interface_config *config)
-{
- char *str;
-
- /* todo: HWADDR size is hardcoded as 6, but we may need to handle
- * different hardware address formats */
- str = talloc_asprintf(ctx, "%02x:%02x:%02x:%02x:%02x:%02x,",
- config->hwaddr[0], config->hwaddr[1],
- config->hwaddr[2], config->hwaddr[3],
- config->hwaddr[4], config->hwaddr[5]);
-
- if (config->ignore) {
- str = talloc_asprintf_append(str, "ignore");
-
- } else if (config->method == CONFIG_METHOD_DHCP) {
- str = talloc_asprintf_append(str, "dhcp");
-
- } else if (config->method == CONFIG_METHOD_STATIC) {
- str = talloc_asprintf_append(str, "static,%s%s%s%s%s",
- config->static_config.address,
- config->static_config.gateway ? "," : "",
- config->static_config.gateway ?: "",
- config->static_config.url ? "," : "",
- config->static_config.url ?: "");
- }
- return str;
-}
-
-static char *dns_config_str(void *ctx, const char **dns_servers, int n)
-{
- char *str;
- int i;
-
- str = talloc_strdup(ctx, "dns,");
- for (i = 0; i < n; i++) {
- str = talloc_asprintf_append(str, "%s%s",
- i == 0 ? "" : ",",
- dns_servers[i]);
- }
-
- return str;
-}
-
-static void update_network_config(struct param_list *pl, const char *param_name,
- const struct config *config)
-{
- unsigned int i;
- char *val;
-
- /*
- * Don't store IPMI overrides to NVRAM. If this was a persistent
- * override it was already stored in NVRAM by
- * get_ipmi_network_override()
- */
- if (config->network.n_interfaces &&
- config->network.interfaces[0]->override)
- return;
-
- val = talloc_strdup(pl, "");
-
- for (i = 0; i < config->network.n_interfaces; i++) {
- char *iface_str = interface_config_str(pl,
- config->network.interfaces[i]);
- val = talloc_asprintf_append(val, "%s%s",
- *val == '\0' ? "" : " ", iface_str);
- talloc_free(iface_str);
- }
-
- if (config->network.n_dns_servers) {
- char *dns_str = dns_config_str(pl,
- config->network.dns_servers,
- config->network.n_dns_servers);
- val = talloc_asprintf_append(val, "%s%s",
- *val == '\0' ? "" : " ", dns_str);
- talloc_free(dns_str);
- }
-
- param_list_set_non_empty(pl, param_name, val, true);
-
- talloc_free(val);
-}
-
-static void update_bootdev_config(struct param_list *pl, const char *param_name,
- const struct config *config)
-{
- char *val = NULL, *boot_str = NULL, *tmp = NULL;
- struct autoboot_option *opt;
- const char delim = ' ';
- unsigned int i;
-
- if (!config->n_autoboot_opts)
- val = "";
-
- for (i = 0; i < config->n_autoboot_opts; i++) {
- opt = &config->autoboot_opts[i];
- switch (opt->boot_type) {
- case BOOT_DEVICE_TYPE:
- boot_str = talloc_asprintf(config, "%s%c",
- device_type_name(opt->type),
- delim);
- break;
- case BOOT_DEVICE_UUID:
- boot_str = talloc_asprintf(config, "uuid:%s%c",
- opt->uuid, delim);
- break;
- }
- tmp = val = talloc_asprintf_append(val, "%s", boot_str);
- }
-
- param_list_set_non_empty(pl, param_name, val, true);
-
- talloc_free(tmp);
- if (boot_str)
- talloc_free(boot_str);
-}
-
-static void update_config(struct param_list *pl, struct config *config,
- const struct config *defaults)
+static void params_update_all(struct param_list *pl,
+ const struct config *config, const struct config *defaults)
{
char *tmp = NULL;
const char *val;
val = config->https_proxy ?: "";
param_list_set_non_empty(pl, "petitboot,https_proxy", val, true);
- update_network_config(pl, "petitboot,network", config);
- update_bootdev_config(pl, "petitboot,bootdevs", config);
+ params_update_network_values(pl, "petitboot,network", config);
+ params_update_bootdev_values(pl, "petitboot,bootdevs", config);
}
static void config_set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
{
uint16_t resp_len;
uint8_t resp[8];
+ char *debug_buf;
int rc;
uint8_t req[] = {
0x05, /* parameter selector: boot flags */
return -1;
}
- pb_debug("IPMI get_bootdev response:\n");
- for (int i = 0; i < resp_len; i++)
- pb_debug("%x ", resp[i]);
- pb_debug("\n");
+ debug_buf = format_buffer(platform, resp, resp_len);
+ pb_debug_fn("IPMI get_bootdev response:\n%s\n", debug_buf);
+ talloc_free(debug_buf);
if (resp[0] != 0) {
pb_log("platform: non-zero completion code %d from IPMI req\n",
uint16_t min_len = 12, resp_len = 53, version;
const uint32_t magic_value = 0x21706221;
uint8_t resp[resp_len];
+ char *debug_buf;
uint32_t cookie;
bool persistent;
int i, rc;
resp, &resp_len,
ipmi_timeout);
- pb_debug("IPMI net override resp [%d][%d]:\n", rc, resp_len);
- if (resp_len > 0) {
- for (i = 0; i < resp_len; i++) {
- pb_debug(" %02x", resp[i]);
- if (i && (i + 1) % 16 == 0 && i != resp_len - 1)
- pb_debug("\n");
- else if (i && (i + 1) % 8 == 0)
- pb_debug(" ");
- }
- pb_debug("\n");
- }
+ debug_buf = format_buffer(platform, resp, resp_len);
+ pb_debug_fn("IPMI net override response:\n%s\n", debug_buf);
+ talloc_free(debug_buf);
if (rc) {
pb_debug("IPMI network config option unavailable\n");
if (!rc && persistent) {
/* Write this new config to NVRAM */
- update_network_config(&platform->params, "petitboot,network",
- config);
+ params_update_network_values(platform->params,
+ "petitboot,network", config);
rc = write_nvram(platform);
if (rc)
pb_log("platform: Failed to save persistent interface override\n");
if (rc)
pb_log_fn("Failed to parse nvram\n");
- config_populate_all(config, &platform->params);
+ config_populate_all(config, platform->params);
if (platform->get_ipmi_bootdev) {
bool bootdev_persistent;
defaults = talloc_zero(platform, struct config);
config_set_defaults(defaults);
- update_config(&platform->params, config, defaults);
+ params_update_all(platform->params, config, defaults);
talloc_free(defaults);
return write_nvram(platform);
return false;
platform = talloc_zero(ctx, struct platform_powerpc);
- param_list_init(&platform->params, common_known_params());
+ platform->params = talloc_zero(platform, struct param_list);
+ param_list_init(platform->params, common_known_params());
p->platform_data = platform;
projects / petitboot / blobdiff