public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH 1/1] OvmfPkg: fix PlatformConfig
@ 2022-12-09 11:22 Gerd Hoffmann
  2022-12-23 11:55 ` [edk2-devel] " Ard Biesheuvel
  0 siblings, 1 reply; 2+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 11:22 UTC (permalink / raw)
  To: devel
  Cc: Gerd Hoffmann, Oliver Steffen, Jiewen Yao, Pawel Polawski,
	Jordan Justen, Ard Biesheuvel

The Hii form is named "MainFormState" and the EFI variable is named
"PlatformConfig".  Take into account the different names.

Fixes: aefcc91805fd ("OvmfPkg/PlatformDxe: Handle all requests in ExtractConfig and RouteConfig")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 OvmfPkg/PlatformDxe/PlatformConfig.h | 1 +
 OvmfPkg/PlatformDxe/Platform.c       | 4 ++--
 OvmfPkg/PlatformDxe/PlatformConfig.c | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h
index 5d9b457b1b4b..93d06a9a6b1a 100644
--- a/OvmfPkg/PlatformDxe/PlatformConfig.h
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.h
@@ -51,5 +51,6 @@ PlatformConfigLoad (
 #define PLATFORM_CONFIG_F_DOWNGRADE            BIT63
 
 extern CHAR16  mVariableName[];
+extern CHAR16  mHiiFormName[];
 
 #endif // _PLATFORM_CONFIG_H_
diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c
index ac31fafbdce3..e58e75eb2203 100644
--- a/OvmfPkg/PlatformDxe/Platform.c
+++ b/OvmfPkg/PlatformDxe/Platform.c
@@ -258,7 +258,7 @@ ExtractConfig (
       !HiiIsConfigHdrMatch (
          Request,
          &gOvmfPlatformConfigGuid,
-         mVariableName
+         mHiiFormName
          )
       )
   {
@@ -447,7 +447,7 @@ RouteConfig (
       !HiiIsConfigHdrMatch (
          Configuration,
          &gOvmfPlatformConfigGuid,
-         mVariableName
+         mHiiFormName
          )
       )
   {
diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c
index f5ac2d0609ff..4058a324eb8c 100644
--- a/OvmfPkg/PlatformDxe/PlatformConfig.c
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.c
@@ -22,6 +22,7 @@
 // Name of the UEFI variable that we use for persistent storage.
 //
 CHAR16  mVariableName[] = L"PlatformConfig";
+CHAR16  mHiiFormName[]  = L"MainFormState";
 
 /**
   Serialize and persistently save platform configuration.
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [edk2-devel] [PATCH 1/1] OvmfPkg: fix PlatformConfig
  2022-12-09 11:22 [PATCH 1/1] OvmfPkg: fix PlatformConfig Gerd Hoffmann
@ 2022-12-23 11:55 ` Ard Biesheuvel
  0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2022-12-23 11:55 UTC (permalink / raw)
  To: devel, kraxel
  Cc: Oliver Steffen, Jiewen Yao, Pawel Polawski, Jordan Justen,
	Ard Biesheuvel

On Fri, 9 Dec 2022 at 12:22, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The Hii form is named "MainFormState" and the EFI variable is named
> "PlatformConfig".  Take into account the different names.
>
> Fixes: aefcc91805fd ("OvmfPkg/PlatformDxe: Handle all requests in ExtractConfig and RouteConfig")
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Merged as #3828

> ---
>  OvmfPkg/PlatformDxe/PlatformConfig.h | 1 +
>  OvmfPkg/PlatformDxe/Platform.c       | 4 ++--
>  OvmfPkg/PlatformDxe/PlatformConfig.c | 1 +
>  3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h
> index 5d9b457b1b4b..93d06a9a6b1a 100644
> --- a/OvmfPkg/PlatformDxe/PlatformConfig.h
> +++ b/OvmfPkg/PlatformDxe/PlatformConfig.h
> @@ -51,5 +51,6 @@ PlatformConfigLoad (
>  #define PLATFORM_CONFIG_F_DOWNGRADE            BIT63
>
>  extern CHAR16  mVariableName[];
> +extern CHAR16  mHiiFormName[];
>
>  #endif // _PLATFORM_CONFIG_H_
> diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c
> index ac31fafbdce3..e58e75eb2203 100644
> --- a/OvmfPkg/PlatformDxe/Platform.c
> +++ b/OvmfPkg/PlatformDxe/Platform.c
> @@ -258,7 +258,7 @@ ExtractConfig (
>        !HiiIsConfigHdrMatch (
>           Request,
>           &gOvmfPlatformConfigGuid,
> -         mVariableName
> +         mHiiFormName
>           )
>        )
>    {
> @@ -447,7 +447,7 @@ RouteConfig (
>        !HiiIsConfigHdrMatch (
>           Configuration,
>           &gOvmfPlatformConfigGuid,
> -         mVariableName
> +         mHiiFormName
>           )
>        )
>    {
> diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c
> index f5ac2d0609ff..4058a324eb8c 100644
> --- a/OvmfPkg/PlatformDxe/PlatformConfig.c
> +++ b/OvmfPkg/PlatformDxe/PlatformConfig.c
> @@ -22,6 +22,7 @@
>  // Name of the UEFI variable that we use for persistent storage.
>  //
>  CHAR16  mVariableName[] = L"PlatformConfig";
> +CHAR16  mHiiFormName[]  = L"MainFormState";
>
>  /**
>    Serialize and persistently save platform configuration.
> --
> 2.38.1
>
>
>
> 
>
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-12-23 11:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-09 11:22 [PATCH 1/1] OvmfPkg: fix PlatformConfig Gerd Hoffmann
2022-12-23 11:55 ` [edk2-devel] " Ard Biesheuvel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox