From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 66BE5D80696 for ; Wed, 19 Jul 2023 07:45:36 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=AESp2inkabCbINZAIPOWCG0Jo3zdLs/t4fRN5c00EvM=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Unsubscribe:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1689752735; v=1; b=N1+WPRYZnC39r+ure8x50DyQWVSRAdNR6dsHRJGOCGQlc48L+i5OBTT2fSiXnYViMBEsMhGL eLGR/YkxuuTtcmrK5cTi56om7YnuCL9hUPWzJpli9rr0F+Al5Nh3s/qUeY8Y6ULbR8pP+D9dm1V eLr9ntQdv6WRh0unLDD2ygI0= X-Received: by 127.0.0.2 with SMTP id 5puSYY7687511xM4BAyF0RcS; Wed, 19 Jul 2023 00:45:35 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.8828.1689752734649789973 for ; Wed, 19 Jul 2023 00:45:34 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="345986943" X-IronPort-AV: E=Sophos;i="6.01,216,1684825200"; d="scan'208";a="345986943" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2023 00:45:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="717893047" X-IronPort-AV: E=Sophos;i="6.01,216,1684825200"; d="scan'208";a="717893047" X-Received: from yin-optiplex-7090.sh.intel.com ([10.239.160.32]) by orsmga007.jf.intel.com with ESMTP; 19 Jul 2023 00:45:22 -0700 From: "Wang, Yin" To: devel@edk2.groups.io Cc: kraxel@redhat.com, ard.biesheuvel@arm.com, jordan.l.justen@intel.com, sunilvl@ventanamicro.com, Yin Wang Subject: [edk2-devel] [PATCH] OvmfPkg:Fix Hii form name mismatch with EFI variable Date: Wed, 19 Jul 2023 15:45:20 +0800 Message-Id: <1764780e0f2ebce561f7c9fafb2a225706a50348.1689752592.git.yin.wang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yin.wang@intel.com X-Gm-Message-State: 4GCjEEI48LL2H0xcgenWYRhYx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=N1+WPRYZ; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Onemore need change beside 16acacf24c ("OvmfPkg: fix PlatformConfig") Find by sct cases:ExtractConfigConformance ExtractConfigFunction ExtractConfig_Func fail on RiscVVirtQemu. Signed-off-by: Yin Wang --- 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 ( //=0D ConfigRequestHdr =3D HiiConstructConfigHdr (=0D &gOvmfPlatformConfigGuid,=0D - mVariableName,=0D + mHiiFormName,=0D mImageHandle=0D );=0D if (ConfigRequestHdr =3D=3D NULL) {=0D diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/Pla= tformConfig.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.=0D //=0D Status =3D gRT->SetVariable (=0D - mVariableName,=0D + mHiiFormName,=0D &gOvmfPlatformConfigGuid,=0D EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACC= ESS |=0D EFI_VARIABLE_RUNTIME_ACCESS,=0D @@ -93,7 +93,7 @@ PlatformConfigLoad ( // (Incompatible changes require a GUID change.)=0D //=0D Status =3D GetVariable2 (=0D - mVariableName,=0D + mHiiFormName,=0D &gOvmfPlatformConfigGuid,=0D &Data,=0D &DataSize=0D --=20 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-