From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.10782.1670584970875439172 for ; Fri, 09 Dec 2022 03:22:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XZSUvRoN; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670584969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzfhF6NwVhZJSQoDgmc5uRpD2jyn/2z7UBEF1eDTr54=; b=XZSUvRoNF1BpxTpj+YRujpVVfGZyasfK4ZPDZzfZ+hGinJ5LEQ/kcCMuNLk5GxoOWIF5cw CWFKrJP0KgAg566WnXFx6Q+Qdc6xl7XXPmvjX08zgmUcIpmAkFYOhp0qYziQ6wZYKwvlAb aHZx432Zoowf9TND7Q02z4K4DDe2uj4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-rf_60G0lNK2PQFt1ft8ZOg-1; Fri, 09 Dec 2022 06:22:48 -0500 X-MC-Unique: rf_60G0lNK2PQFt1ft8ZOg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6AC980A0C3; Fri, 9 Dec 2022 11:22:47 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAA7C2166B26; Fri, 9 Dec 2022 11:22:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2A776180092D; Fri, 9 Dec 2022 12:22:44 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Oliver Steffen , Jiewen Yao , Pawel Polawski , Jordan Justen , Ard Biesheuvel Subject: [PATCH 1/1] OvmfPkg: fix PlatformConfig Date: Fri, 9 Dec 2022 12:22:44 +0100 Message-Id: <20221209112244.4009233-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true The Hii form is named "MainFormState" and the EFI variable is named "PlatformConfig". Take into account the different names. Fixes: aefcc91805fd ("OvmfPkg/PlatformDxe: Handle all requests in ExtractConfig and RouteConfig") Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformDxe/PlatformConfig.h | 1 + OvmfPkg/PlatformDxe/Platform.c | 4 ++-- OvmfPkg/PlatformDxe/PlatformConfig.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h index 5d9b457b1b4b..93d06a9a6b1a 100644 --- a/OvmfPkg/PlatformDxe/PlatformConfig.h +++ b/OvmfPkg/PlatformDxe/PlatformConfig.h @@ -51,5 +51,6 @@ PlatformConfigLoad ( #define PLATFORM_CONFIG_F_DOWNGRADE BIT63 extern CHAR16 mVariableName[]; +extern CHAR16 mHiiFormName[]; #endif // _PLATFORM_CONFIG_H_ diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index ac31fafbdce3..e58e75eb2203 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -258,7 +258,7 @@ ExtractConfig ( !HiiIsConfigHdrMatch ( Request, &gOvmfPlatformConfigGuid, - mVariableName + mHiiFormName ) ) { @@ -447,7 +447,7 @@ RouteConfig ( !HiiIsConfigHdrMatch ( Configuration, &gOvmfPlatformConfigGuid, - mVariableName + mHiiFormName ) ) { diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c index f5ac2d0609ff..4058a324eb8c 100644 --- a/OvmfPkg/PlatformDxe/PlatformConfig.c +++ b/OvmfPkg/PlatformDxe/PlatformConfig.c @@ -22,6 +22,7 @@ // Name of the UEFI variable that we use for persistent storage. // CHAR16 mVariableName[] = L"PlatformConfig"; +CHAR16 mHiiFormName[] = L"MainFormState"; /** Serialize and persistently save platform configuration. -- 2.38.1