OvmfPkg: fix PlatformConfig

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>

diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c
index ac31fafbdce3c0fe474c805c97c9e29d6eb7f9a7..e58e75eb220318556f5c4e7dd88ee268c6827730 100644 (file)
--- a/OvmfPkg/PlatformDxe/Platform.c
+++ b/OvmfPkg/PlatformDxe/Platform.c
@@ -258,7 +258,7 @@ ExtractConfig (
       !HiiIsConfigHdrMatch (\r
          Request,\r
          &gOvmfPlatformConfigGuid,\r
-         mVariableName\r
+         mHiiFormName\r
          )\r
       )\r
   {\r
@@ -447,7 +447,7 @@ RouteConfig (
       !HiiIsConfigHdrMatch (\r
          Configuration,\r
          &gOvmfPlatformConfigGuid,\r
-         mVariableName\r
+         mHiiFormName\r
          )\r
       )\r
   {\r

diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c
index f5ac2d0609ffc77aea3db821033eb9c4dc13aa01..4058a324eb8cf61ebdfb3dee20951fb5f51ba21f 100644 (file)
--- 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.\r
 //\r
 CHAR16  mVariableName[] = L"PlatformConfig";\r
+CHAR16  mHiiFormName[]  = L"MainFormState";\r
 \r
 /**\r
   Serialize and persistently save platform configuration.\r

diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h
index 5d9b457b1b4bc180edfa3b360cb98761da44f10d..93d06a9a6b1a9a429d4543c933dd6198430a14a7 100644 (file)
--- a/OvmfPkg/PlatformDxe/PlatformConfig.h
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.h
@@ -51,5 +51,6 @@ PlatformConfigLoad (
 #define PLATFORM_CONFIG_F_DOWNGRADE            BIT63\r
 \r
 extern CHAR16  mVariableName[];\r
+extern CHAR16  mHiiFormName[];\r
 \r
 #endif // _PLATFORM_CONFIG_H_\r