mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 2/2] state: Add 'init_from_defaults' parameter
Date: Tue,  6 Feb 2018 08:47:30 +0100	[thread overview]
Message-ID: <20180206074730.28084-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20180206074730.28084-1-s.hauer@pengutronix.de>

The init_from_defaults parameter allows to detect if a state has been
initialized from default values, i.e. state_load failed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/state/state.c | 7 +++++++
 common/state/state.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/common/state/state.c b/common/state/state.c
index 5a1a1af856..cb979328c1 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -99,6 +99,7 @@ static int state_do_load(struct state *state, enum state_flags flags)
 		goto out;
 	}
 
+	state->init_from_defaults = 0;
 	state->dirty = 0;
 
 out:
@@ -179,10 +180,14 @@ static struct state *state_new(const char *name)
 	state->dirty = 1;
 	dev_add_param_bool(&state->dev, "dirty", state_set_deny, NULL, &state->dirty,
 			   NULL);
+
 	state->save_on_shutdown = 1;
 	dev_add_param_bool(&state->dev, "save_on_shutdown", NULL, NULL,
 			   &state->save_on_shutdown, NULL);
 
+	dev_add_param_bool(&state->dev, "init_from_defaults", state_set_deny, NULL,
+			   &state->init_from_defaults, NULL);
+
 	list_add_tail(&state->list, &state_list);
 
 	return state;
@@ -643,6 +648,8 @@ struct state *state_new_from_node(struct device_node *node, char *path,
 		goto out_release_state;
 	}
 
+	state->init_from_defaults = 1;
+
 	ret = of_register_fixup(of_state_fixup, state);
 	if (ret) {
 		goto out_release_state;
diff --git a/common/state/state.h b/common/state/state.h
index fcc6b9f5cd..da1c6acaeb 100644
--- a/common/state/state.h
+++ b/common/state/state.h
@@ -107,7 +107,9 @@ struct state {
 	uint32_t magic;
 
 	struct list_head variables; /* Sorted list of variables */
+
 	unsigned int dirty;
+	unsigned int init_from_defaults;
 	unsigned int save_on_shutdown;
 
 	struct state_backend_format *format;
-- 
2.15.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2018-02-06  7:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-06  7:47 [PATCH 1/2] state: refuse to set dirty parameter via setenv Sascha Hauer
2018-02-06  7:47 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180206074730.28084-2-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox