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

Wang, Yin posted 1 patch 9 months, 1 week ago
Failed in applying to current master (apply log)
OvmfPkg/PlatformDxe/Platform.c       | 2 +-
OvmfPkg/PlatformDxe/PlatformConfig.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[edk2-devel] [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable
Posted by Wang, Yin 9 months, 1 week ago
Onemore need change beside 16acacf24c ("OvmfPkg: fix PlatformConfig")

Find by sct cases:ExtractConfigConformance
	ExtractConfigFunction
	ExtractConfig_Func fail on RiscVVirtQemu.

Signed-off-by: Yin Wang <yin.wang@intel.com>
---
 OvmfPkg/PlatformDxe/Platform.c       | 2 +-
 OvmfPkg/PlatformDxe/PlatformConfig.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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) {
diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c
index 4058a324eb..918c4a0de3 100644
--- a/OvmfPkg/PlatformDxe/PlatformConfig.c
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.c
@@ -46,7 +46,7 @@ PlatformConfigSave (
   // them more easily. For now, just save a binary dump.
   //
   Status = gRT->SetVariable (
-                  mVariableName,
+                  mHiiFormName,
                   &gOvmfPlatformConfigGuid,
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |
                   EFI_VARIABLE_RUNTIME_ACCESS,
@@ -93,7 +93,7 @@ PlatformConfigLoad (
   // (Incompatible changes require a GUID change.)
   //
   Status = GetVariable2 (
-             mVariableName,
+             mHiiFormName,
              &gOvmfPlatformConfigGuid,
              &Data,
              &DataSize
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107043): https://edk2.groups.io/g/devel/message/107043
Mute This Topic: https://groups.io/mt/100231365/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable
Posted by Gerd Hoffmann 9 months, 1 week ago
On Wed, Jul 19, 2023 at 03:45:20PM +0800, Yin Wang wrote:
> Onemore need change beside 16acacf24c ("OvmfPkg: fix PlatformConfig")
> 
> Find by sct cases:ExtractConfigConformance
> 	ExtractConfigFunction
> 	ExtractConfig_Func fail on RiscVVirtQemu.

>      ConfigRequestHdr = HiiConstructConfigHdr (
>                           &gOvmfPlatformConfigGuid,
> -                         mVariableName,
> +                         mHiiFormName,

Ok.

>    Status = gRT->SetVariable (
> -                  mVariableName,
> +                  mHiiFormName,

>    Status = GetVariable2 (
> -             mVariableName,
> +             mHiiFormName,

That looks wrong to me.

With only riscv failing I suspect some setup code is missing in the
riscv build.

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107054): https://edk2.groups.io/g/devel/message/107054
Mute This Topic: https://groups.io/mt/100231365/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable
Posted by Wang, Yin 9 months, 1 week ago
The last 2 change was found when I debug another two fail 
cases,RouteConfigFunction/RouteConfig_Func,  I will do more 
investigating on them. let's fallback  to patch v1. I will continue on 
that thread.
Thanks for your time.
Yin
On 7/19/2023 9:48 PM, Gerd Hoffmann wrote:
> On Wed, Jul 19, 2023 at 03:45:20PM +0800, Yin Wang wrote:
>> Onemore need change beside 16acacf24c ("OvmfPkg: fix PlatformConfig")
>>
>> Find by sct cases:ExtractConfigConformance
>> 	ExtractConfigFunction
>> 	ExtractConfig_Func fail on RiscVVirtQemu.
>>       ConfigRequestHdr = HiiConstructConfigHdr (
>>                            &gOvmfPlatformConfigGuid,
>> -                         mVariableName,
>> +                         mHiiFormName,
> Ok.
>
>>     Status = gRT->SetVariable (
>> -                  mVariableName,
>> +                  mHiiFormName,
>>     Status = GetVariable2 (
>> -             mVariableName,
>> +             mHiiFormName,
> That looks wrong to me.
>
> With only riscv failing I suspect some setup code is missing in the
> riscv build.
>
> take care,
>    Gerd
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107079): https://edk2.groups.io/g/devel/message/107079
Mute This Topic: https://groups.io/mt/100231365/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable
Posted by Wang, Yin 9 months, 1 week ago
Hi Grand
Thanks for quick reply, Yes, uefi variable mVariableName by shell command dmpstore, could you help to figure out where to initialize mVariableName for arm of x86?
Thanks
Yin

-----Original Message-----
From: Gerd Hoffmann <kraxel@redhat.com> 
Sent: Wednesday, July 19, 2023 9:48 PM
To: Wang, Yin <yin.wang@intel.com>
Cc: devel@edk2.groups.io; ard.biesheuvel@arm.com; Justen, Jordan L <jordan.l.justen@intel.com>; sunilvl@ventanamicro.com
Subject: Re: [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable

On Wed, Jul 19, 2023 at 03:45:20PM +0800, Yin Wang wrote:
> Onemore need change beside 16acacf24c ("OvmfPkg: fix PlatformConfig")
> 
> Find by sct cases:ExtractConfigConformance
> 	ExtractConfigFunction
> 	ExtractConfig_Func fail on RiscVVirtQemu.

>      ConfigRequestHdr = HiiConstructConfigHdr (
>                           &gOvmfPlatformConfigGuid,
> -                         mVariableName,
> +                         mHiiFormName,

Ok.

>    Status = gRT->SetVariable (
> -                  mVariableName,
> +                  mHiiFormName,

>    Status = GetVariable2 (
> -             mVariableName,
> +             mHiiFormName,

That looks wrong to me.

With only riscv failing I suspect some setup code is missing in the riscv build.

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107055): https://edk2.groups.io/g/devel/message/107055
Mute This Topic: https://groups.io/mt/100231365/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-