diff mbox series

bootloader: EBG: update transaction marker handling

Message ID 20210126111020.10126-1-christian.storm@siemens.com
State Accepted
Headers show
Series bootloader: EBG: update transaction marker handling | expand

Commit Message

Christian Storm Jan. 26, 2021, 11:10 a.m. UTC
Use BOOTVAR_TRANSACTION introduced in commit 0e7dfdd "Fix setting
recovery_status flag in rescue mode" instead of hard-coding
"recovery_status".
Use get_state_string() introduced in commit 15dd8d9 "state: make
transaction marker handling use state's functions" instead of
hard-coding "in_progress".

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 bootloader/ebg.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Comments

Stefano Babic Jan. 26, 2021, 11:57 a.m. UTC | #1
On 26.01.21 12:10, Christian Storm wrote:
> Use BOOTVAR_TRANSACTION introduced in commit 0e7dfdd "Fix setting
> recovery_status flag in rescue mode" instead of hard-coding
> "recovery_status".
> Use get_state_string() introduced in commit 15dd8d9 "state: make
> transaction marker handling use state's functions" instead of
> hard-coding "in_progress".
> 
> Signed-off-by: Christian Storm <christian.storm@siemens.com>
> ---
>  bootloader/ebg.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/bootloader/ebg.c b/bootloader/ebg.c
> index 0f35c00..98107aa 100644
> --- a/bootloader/ebg.c
> +++ b/bootloader/ebg.c
> @@ -18,9 +18,6 @@
>  #include <state.h>
>  #include "bootloader.h"
>  
> -#define RCS_KEY   "recovery_status"
> -#define RCS_VALUE "in_progress"
> -
>  static ebgenv_t ebgenv = {0};
>  
>  int bootloader_env_set(const char *name, const char *value)
> @@ -37,8 +34,9 @@ int bootloader_env_set(const char *name, const char *value)
>  		return ret;
>  	}
>  
> -	if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0 &&
> -	    strncmp(value, RCS_VALUE, strlen(RCS_VALUE) + 1) == 0) {
> +	if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0 &&
> +	    strncmp(value, get_state_string(STATE_IN_PROGRESS),
> +		    strlen(get_state_string(STATE_IN_PROGRESS)) + 1) == 0) {
>  		/* Open or create a new environment to reflect
>  		 * EFI Boot Guard's representation of SWUpdate's
>  		 * recovery_status=in_progress. */
> @@ -81,10 +79,10 @@ int bootloader_env_unset(const char *name)
>  		return ret;
>  	}
>  
> -	if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0) {
> +	if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0) {
>  		ret = ebg_env_finalize_update(&ebgenv);
>  		if (ret) {
> -			ERROR("Cannot unset %s in bootloader environment: %s.", RCS_KEY, strerror(ret));
> +			ERROR("Cannot unset %s in bootloader environment: %s.", BOOTVAR_TRANSACTION, strerror(ret));
>  		}
>  	} else if (strncmp(name, (char *)STATE_KEY, strlen((char *)STATE_KEY) + 1) == 0) {
>  		/* Unsetting STATE_KEY is semantically equivalent to setting it to STATE_OK. */
> 
Reviewed-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/bootloader/ebg.c b/bootloader/ebg.c
index 0f35c00..98107aa 100644
--- a/bootloader/ebg.c
+++ b/bootloader/ebg.c
@@ -18,9 +18,6 @@ 
 #include <state.h>
 #include "bootloader.h"
 
-#define RCS_KEY   "recovery_status"
-#define RCS_VALUE "in_progress"
-
 static ebgenv_t ebgenv = {0};
 
 int bootloader_env_set(const char *name, const char *value)
@@ -37,8 +34,9 @@  int bootloader_env_set(const char *name, const char *value)
 		return ret;
 	}
 
-	if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0 &&
-	    strncmp(value, RCS_VALUE, strlen(RCS_VALUE) + 1) == 0) {
+	if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0 &&
+	    strncmp(value, get_state_string(STATE_IN_PROGRESS),
+		    strlen(get_state_string(STATE_IN_PROGRESS)) + 1) == 0) {
 		/* Open or create a new environment to reflect
 		 * EFI Boot Guard's representation of SWUpdate's
 		 * recovery_status=in_progress. */
@@ -81,10 +79,10 @@  int bootloader_env_unset(const char *name)
 		return ret;
 	}
 
-	if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0) {
+	if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0) {
 		ret = ebg_env_finalize_update(&ebgenv);
 		if (ret) {
-			ERROR("Cannot unset %s in bootloader environment: %s.", RCS_KEY, strerror(ret));
+			ERROR("Cannot unset %s in bootloader environment: %s.", BOOTVAR_TRANSACTION, strerror(ret));
 		}
 	} else if (strncmp(name, (char *)STATE_KEY, strlen((char *)STATE_KEY) + 1) == 0) {
 		/* Unsetting STATE_KEY is semantically equivalent to setting it to STATE_OK. */