From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C5E3F21A6F106 for ; Fri, 26 May 2017 14:49:52 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 May 2017 14:49:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,399,1491289200"; d="scan'208";a="861776746" Received: from mvakil-mobl1.amr.corp.intel.com (HELO localhost) ([10.254.191.209]) by FMSMGA003.fm.intel.com with ESMTP; 26 May 2017 14:49:52 -0700 MIME-Version: 1.0 To: Brijesh Singh , edk2-devel@lists.01.org Message-ID: <149583539166.26571.4458976942684033306@jljusten-skl> From: Jordan Justen In-Reply-To: <1495809845-32472-11-git-send-email-brijesh.singh@amd.com> Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Brijesh Singh , Laszlo Ersek References: <1495809845-32472-1-git-send-email-brijesh.singh@amd.com> <1495809845-32472-11-git-send-email-brijesh.singh@amd.com> User-Agent: alot/0.5.1 Date: Fri, 26 May 2017 14:49:51 -0700 Subject: Re: [PATCH v6 10/17] OvmfPkg/QemuFwCfgLib: Provide Pei and Dxe specific library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 21:49:53 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2017-05-26 07:43:58, Brijesh Singh wrote: > Current QemuFwCfgLib.inf is used in both Pei and Dxe phases. Add Pei > and Dxe inf file to provide a seperate QemuFwCfgLib instances for Pei > and Dxe phases. > = > = We usually have 1 rather than 2 blank lines before the signature block. 10-16 Reviewed-by: Jordan Justen > Cc: Jordan Justen > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Brijesh Singh > Reviewed-by: Laszlo Ersek > --- > OvmfPkg/OvmfPkgIa32.dsc |= 3 ++- > OvmfPkg/OvmfPkgIa32X64.dsc |= 3 ++- > OvmfPkg/OvmfPkgX64.dsc |= 3 ++- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf =3D> QemuFwCfgDxeLib.inf}= | 8 ++++---- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf =3D> QemuFwCfgPeiLib.inf}= | 8 ++++---- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c =3D> QemuFwCfgDxe.c} = | 0 > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c =3D> QemuFwCfgPei.c} = | 0 > 7 files changed, 14 insertions(+), 11 deletions(-) > = > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 18544d7cfd73..fffee6b0610b 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -142,7 +142,7 @@ [LibraryClasses] > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeV= ariablesLib.inf > - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf > VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf > LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSe= vLib.inf > @@ -260,6 +260,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.i= nf > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > = > [LibraryClasses.common.DXE_CORE] > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 1b3bf3517a9f..a7a6c4694bca 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -147,7 +147,7 @@ [LibraryClasses] > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeV= ariablesLib.inf > - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf > VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf > LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSe= vLib.inf > @@ -265,6 +265,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.i= nf > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > = > [LibraryClasses.common.DXE_CORE] > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 9fdabaf0eac4..31145b4bcfad 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -147,7 +147,7 @@ [LibraryClasses] > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeV= ariablesLib.inf > - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf > VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf > LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSe= vLib.inf > @@ -265,6 +265,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.i= nf > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > = > [LibraryClasses.common.DXE_CORE] > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Libr= ary/QemuFwCfgLib/QemuFwCfgDxeLib.inf > similarity index 80% > copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf > index 689476032d39..d7e368e5435d 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf > @@ -18,11 +18,11 @@ > = > [Defines] > INF_VERSION =3D 0x00010005 > - BASE_NAME =3D QemuFwCfgLib > - FILE_GUID =3D fdd53716-31e1-4acc-9007-8bd5d877c96f > + BASE_NAME =3D QemuFwCfgDxeLib > + FILE_GUID =3D 80474090-55e7-4c28-b25c-9f236ba41f28 > MODULE_TYPE =3D BASE > VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D QemuFwCfgLib|PEIM DXE_DRIVER DXE_RU= NTIME_DRIVER DXE_SMM_DRIVER > + LIBRARY_CLASS =3D QemuFwCfgLib|DXE_DRIVER DXE_RUNTIME= _DRIVER DXE_SMM_DRIVER > = > CONSTRUCTOR =3D QemuFwCfgInitialize > = > @@ -35,7 +35,7 @@ [Defines] > [Sources] > QemuFwCfgLibInternal.h > QemuFwCfgLib.c > - QemuFwCfgPeiDxe.c > + QemuFwCfgDxe.c > = > [Packages] > MdePkg/MdePkg.dec > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Libr= ary/QemuFwCfgLib/QemuFwCfgPeiLib.inf > similarity index 80% > rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > index 689476032d39..47e23b97eccf 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > @@ -18,11 +18,11 @@ > = > [Defines] > INF_VERSION =3D 0x00010005 > - BASE_NAME =3D QemuFwCfgLib > - FILE_GUID =3D fdd53716-31e1-4acc-9007-8bd5d877c96f > + BASE_NAME =3D QemuFwCfgPeiLib > + FILE_GUID =3D ddd4f5f0-5304-42a8-9efa-d14bf11a3533 > MODULE_TYPE =3D BASE > VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D QemuFwCfgLib|PEIM DXE_DRIVER DXE_RU= NTIME_DRIVER DXE_SMM_DRIVER > + LIBRARY_CLASS =3D QemuFwCfgLib|PEIM > = > CONSTRUCTOR =3D QemuFwCfgInitialize > = > @@ -35,7 +35,7 @@ [Defines] > [Sources] > QemuFwCfgLibInternal.h > QemuFwCfgLib.c > - QemuFwCfgPeiDxe.c > + QemuFwCfgPei.c > = > [Packages] > MdePkg/MdePkg.dec > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgDxe.c > similarity index 100% > copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c > copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgPei.c > similarity index 100% > rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c > rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c > -- = > 2.7.4 >=20