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 5A69C94127A for ; Fri, 1 Sep 2023 08:48:05 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=DtS2jxbVyH2WX2btPHurM3mA+Slumz7oulN4QfQ2QrM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1693558084; v=1; b=NQyhmAm9b5joipHKK3Xx4phfe7x4CJyh69bYXH49v+MDrbfEVLy92qBFMzYoUQQsvUjdToU1 6CnE67Ca0yeuIYsy5gbh8bA3kXB0cXX0eijvZQyarq5gEMa7DAIAvA2t+tjw6h8Y1v849D2P8Nh gJPkFwnILXN8Z3DYLwCL5jpQ= X-Received: by 127.0.0.2 with SMTP id wGXgYY7687511xwJWFQoOUxS; Fri, 01 Sep 2023 01:48:04 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.1843.1693556483406563357 for ; Fri, 01 Sep 2023 01:21:23 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10819"; a="361189543" X-IronPort-AV: E=Sophos;i="6.02,219,1688454000"; d="scan'208";a="361189543" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2023 01:21:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10819"; a="863464179" X-IronPort-AV: E=Sophos;i="6.02,219,1688454000"; d="scan'208";a="863464179" X-Received: from wyam675.sh.intel.com ([10.239.160.23]) by orsmga004.jf.intel.com with ESMTP; 01 Sep 2023 01:21:20 -0700 From: "Wang, Yin" To: devel@edk2.groups.io Cc: Yin Wang , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Sunil V L , Andrei Warkentin , Dandan Bi , Eric Dong Subject: [edk2-devel] [PATCH v5 1/1] OvmfPkg: Fix Hii form name mismatch with EFI variable Date: Fri, 1 Sep 2023 16:21:17 +0800 Message-Id: <20230901082117.1618901-1-yin.wang@intel.com> MIME-Version: 1.0 Precedence: Bulk 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 List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: A0CjoUq8qpOxGwAfBPKAquTkx7686176AA= 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=NQyhmAm9; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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 Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Sunil V L Cc: Andrei Warkentin Cc: Dandan Bi Cc: Eric Dong Signed-off-by: Yin Wang Acked-by: Gerd Hoffmann Acked-by: Sunil V L --- v5: Re-organize commit message v4: Update commit message about version history - aefcc918: Enhance ExtractConfig() to match UEFI specification, adding check of whether " 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 ( //=0D ConfigRequestHdr =3D HiiConstructConfigHdr (=0D &gOvmfPlatformConfigGuid,=0D - mVariableName,=0D + mHiiFormName,=0D mImageHandle=0D );=0D if (ConfigRequestHdr =3D=3D NULL) {=0D --=20 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] -=-=-=-=-=-=-=-=-=-=-=-