This change adds config_set, to allow the configuration to be updated,
but calling the storage backend's save() method.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
static struct config *config;
static struct config_storage *storage;
static struct config *config;
static struct config_storage *storage;
-static void config_set_defaults(struct config *config)
+void config_set_defaults(struct config *config)
{
config->autoboot_enabled = true;
config->autoboot_timeout_sec = 10;
{
config->autoboot_enabled = true;
config->autoboot_timeout_sec = 10;
-static void dump_config(struct config *config)
+void dump_config(struct config *config);
+void dump_config(struct config *config)
int config_init(void *ctx)
{
int config_init(void *ctx)
{
- config = talloc(ctx, struct config);
+ config_ctx = talloc_new(ctx);
+
+ config = talloc(config_ctx, struct config);
config_set_defaults(config);
storage = create_powerpc_nvram_storage(config);
config_set_defaults(config);
storage = create_powerpc_nvram_storage(config);
+int config_set(struct config *newconfig)
+{
+ int rc;
+
+ if (!storage || !storage->save)
+ return -1;
+
+ if (newconfig == config)
+ return 0;
+
+ pb_log("new configuration data received\n");
+ dump_config(config);
+
+ rc = storage->save(storage, config);
+
+ if (!rc)
+ config = talloc_steal(config_ctx, newconfig);
+ else
+ pb_log("error saving new configuration; changes lost\n");
+
+ return rc;
+}
+
/* A non-exported function to allow the test infrastructure to initialise
* (and change) the configuration variables */
struct parser_test;
/* A non-exported function to allow the test infrastructure to initialise
* (and change) the configuration variables */
struct parser_test;
+ talloc_free(config_ctx);
int config_init(void *ctx);
const struct config *config_get(void);
int config_init(void *ctx);
const struct config *config_get(void);
+int config_set(struct config *config);
void config_set_autoboot(bool autoboot_enabled);
int config_fini(void);
void config_set_autoboot(bool autoboot_enabled);
int config_fini(void);
+/* for use by the storage backends */
+void config_set_defaults(struct config *config);
+
#endif /* CONFIGURATION_H */
#endif /* CONFIGURATION_H */
struct config_storage {
int (*load)(struct config_storage *st, struct config *config);
struct config_storage {
int (*load)(struct config_storage *st, struct config *config);
+ int (*save)(struct config_storage *st, struct config *config);
};
struct config_storage *create_powerpc_nvram_storage(void *ctx);
};
struct config_storage *create_powerpc_nvram_storage(void *ctx);