[edk2-devel] [PATCH v5 1/1] OvmfPkg: Fix Hii form name mismatch with EFI variable

[Dandan Bi]

Reviewed-by: Dandan Bi <dandan.bi at intel.com>



Thanks,
Dandan
-----Original Message-----
From: Wang, Yin <yin.wang at intel.com> 
Sent: Friday, September 1, 2023 4:21 PM
To: devel at edk2.groups.io
Cc: Wang, Yin <yin.wang at intel.com>; Ard Biesheuvel <ardb+tianocore at kernel.org>; Yao, Jiewen <jiewen.yao at intel.com>; Justen, Jordan L <jordan.l.justen at intel.com>; Gerd Hoffmann <kraxel at redhat.com>; Sunil V L <sunilvl at ventanamicro.com>; Warkentin, Andrei <andrei.warkentin at intel.com>; Bi, Dandan <dandan.bi at intel.com>; Dong, Eric <eric.dong at intel.com>
Subject: [PATCH v5 1/1] OvmfPkg: Fix Hii form name mismatch with EFI variable

The Hii form is named "MainFormState" while the EFI variable is named  "PlatformConfig".
This discrepancy in names causes the following SCT cases to fail on
RiscVVirtQemu:
ExtractConfigConformance
ExtractConfigFunction
ExtractConfig_Func

Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>
Cc: Jiewen Yao <jiewen.yao at intel.com>
Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: Gerd Hoffmann <kraxel at redhat.com>
Cc: Sunil V L <sunilvl at ventanamicro.com>
Cc: Andrei Warkentin <andrei.warkentin at intel.com>
Cc: Dandan Bi <dandan.bi at intel.com>
Cc: Eric Dong <eric.dong at intel.com>
Signed-off-by: Yin Wang <yin.wang at intel.com>
Acked-by: Gerd Hoffmann <kraxel at redhat.com>
Acked-by: Sunil V L <sunilvl at ventanamicro.com>
---
v5: Re-organize commit message
v4: Update commit message about version history

- aefcc918: Enhance ExtractConfig() to match UEFI specification,
  adding check of whether "<ConfigHdr> matches the GUID and name"
- 16acacf2: Fix Hii form name mismatch in ExtractConfig()
- This patch: Add one more fix for Hii form name mismatch

v3: Gerd comments on v2 that caused issues may related to RISC-V specific config. To address this separately, the patch was restored to v1, and details were added to the commit message.

v2: Add two more changes which caused other two SCT Hii cases to fail.

v1: Initial version
---
 OvmfPkg/PlatformDxe/Platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index cd3bfd554c..c32439683d 100644
--- a/OvmfPkg/PlatformDxe/Platform.c
+++ b/OvmfPkg/PlatformDxe/Platform.c
@@ -279,7 +279,7 @@ ExtractConfig (
     //     ConfigRequestHdr = HiiConstructConfigHdr (                          &gOvmfPlatformConfigGuid,-                         mVariableName,+                         mHiiFormName,                          mImageHandle                          );     if (ConfigRequestHdr == NULL) {-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108299): https://edk2.groups.io/g/devel/message/108299
Mute This Topic: https://groups.io/mt/101090614/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-