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

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

[Wang, Yin]

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@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Yin Wang <yin.wang@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Sunil V L <sunilvl@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 (#108228): https://edk2.groups.io/g/devel/message/108228
Mute This Topic: https://groups.io/mt/101090614/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Wang, Yin]

Hi Ard,

I have an EDK2 modification, which is located in the 
OvmfPkg/PlatformDxe/Platform.c file. The modification involves changing 
a Hii form name. Could you please review this change? Or do you know who 
I should ask to review it?

Thanks
Yin

On 9/1/2023 4:21 PM, Yin Wang wrote:
> 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@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Sunil V L <sunilvl@ventanamicro.com>
> Cc: Andrei Warkentin <andrei.warkentin@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Signed-off-by: Yin Wang <yin.wang@intel.com>
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
> Acked-by: Sunil V L <sunilvl@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) {
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108297): https://edk2.groups.io/g/devel/message/108297
Mute This Topic: https://groups.io/mt/101090614/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Dandan Bi]

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



Thanks,
Dandan
-----Original Message-----
From: Wang, Yin <yin.wang@intel.com> 
Sent: Friday, September 1, 2023 4:21 PM
To: devel@edk2.groups.io
Cc: Wang, Yin <yin.wang@intel.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Sunil V L <sunilvl@ventanamicro.com>; Warkentin, Andrei <andrei.warkentin@intel.com>; Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@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@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Yin Wang <yin.wang@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Sunil V L <sunilvl@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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Ard Biesheuvel]

On Wed, 6 Sept 2023 at 05:03, Bi, Dandan <dandan.bi@intel.com> wrote:
>
> Reviewed-by: Dandan Bi <dandan.bi@intel.com>
>


Thanks for the review

Merging as #4789

Thanks,

>
>
> Thanks,
> Dandan
> -----Original Message-----
> From: Wang, Yin <yin.wang@intel.com>
> Sent: Friday, September 1, 2023 4:21 PM
> To: devel@edk2.groups.io
> Cc: Wang, Yin <yin.wang@intel.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Sunil V L <sunilvl@ventanamicro.com>; Warkentin, Andrei <andrei.warkentin@intel.com>; Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@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@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Sunil V L <sunilvl@ventanamicro.com>
> Cc: Andrei Warkentin <andrei.warkentin@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Signed-off-by: Yin Wang <yin.wang@intel.com>
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
> Acked-by: Sunil V L <sunilvl@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 (#108309): https://edk2.groups.io/g/devel/message/108309
Mute This Topic: https://groups.io/mt/101090614/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-