From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web11.70576.1671796553974217686 for ; Fri, 23 Dec 2022 03:55:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=huoK3kph; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 463CA61F2D for ; Fri, 23 Dec 2022 11:55:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EB83C433D2 for ; Fri, 23 Dec 2022 11:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671796552; bh=dVMOCWwurU0TFqgM8MncvzkKIvYwvMwOL3SHkGSnxTU=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=huoK3kphPXQMO311L9+whS9jht1fPfF84OHHkchV/pbslm3S4J9KHBBNgQlUan1Hr ol0XenkSaX+ANZpQrUDgSOBg6OoSMpO5n5kZtkhKrJoOKCmxAfGiIorPo922lZnOGW rHuPNuZsH3UW3yNYjmxEp41EoK0tBki19EfJ5PzoKskJHgBYPLS68pz4GmWeszjn3I JAMkBa9dkDb3LbYlLurGBtr410wzWffbiHtjHtZOnJTD+ca0MmWkd160kDJzE0hT9M DU6iRjhEV8SOqhTwmiHvYtNn2RXSvQen0nKcaVn+8jGL1R30KBYFNBDzXj4RnQ94Ds FEmWnL4byclXQ== Received: by mail-lj1-f169.google.com with SMTP id s25so4797132lji.2 for ; Fri, 23 Dec 2022 03:55:52 -0800 (PST) X-Gm-Message-State: AFqh2kpAW9ICWjWQS1nQCpzVLY29249Yh76WMDOk5mkYVe03N56YaePx ktYVPwM3H8X1+/4BZsUUtcvgB9WWWjw6ncFP1wk= X-Google-Smtp-Source: AMrXdXu689CVUJP8CLgQ/lEj5CYcj25JTzdJg1RTpMGbcrd7XmzvHdxBIRnPG5vCW9c9eTXouyvG5sVRDNLDAa813vg= X-Received: by 2002:a05:651c:219:b0:277:3a1:e86d with SMTP id y25-20020a05651c021900b0027703a1e86dmr847142ljn.152.1671796550276; Fri, 23 Dec 2022 03:55:50 -0800 (PST) MIME-Version: 1.0 References: <20221209112244.4009233-1-kraxel@redhat.com> In-Reply-To: <20221209112244.4009233-1-kraxel@redhat.com> From: "Ard Biesheuvel" Date: Fri, 23 Dec 2022 12:55:38 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [PATCH 1/1] OvmfPkg: fix PlatformConfig To: devel@edk2.groups.io, kraxel@redhat.com Cc: Oliver Steffen , Jiewen Yao , Pawel Polawski , Jordan Justen , Ard Biesheuvel Content-Type: text/plain; charset="UTF-8" On Fri, 9 Dec 2022 at 12:22, Gerd Hoffmann wrote: > > 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 Merged as #3828 > --- > 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 > > > > > >