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 <[email protected]> > Cc: Jordan Justen <[email protected]> > Cc: Laszlo Ersek <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Brijesh Singh <[email protected]> > Reviewed-by: Laszlo Ersek <[email protected]> > --- > OvmfPkg/OvmfPkgIa32.dsc | 3 > ++- > OvmfPkg/OvmfPkgIa32X64.dsc | 3 > ++- > OvmfPkg/OvmfPkgX64.dsc | 3 > ++- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf => QemuFwCfgDxeLib.inf} | 8 > ++++---- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf => QemuFwCfgPeiLib.inf} | 8 > ++++---- > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c => QemuFwCfgDxe.c} | 0 > OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c => 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/SerializeVariablesLib.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/BaseMemEncryptSevLib.inf > @@ -260,6 +260,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf > 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/SerializeVariablesLib.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/BaseMemEncryptSevLib.inf > @@ -265,6 +265,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf > 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/SerializeVariablesLib.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/BaseMemEncryptSevLib.inf > @@ -265,6 +265,7 @@ [LibraryClasses.common.PEIM] > MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf > 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/Library/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 = 0x00010005 > - BASE_NAME = QemuFwCfgLib > - FILE_GUID = fdd53716-31e1-4acc-9007-8bd5d877c96f > + BASE_NAME = QemuFwCfgDxeLib > + FILE_GUID = 80474090-55e7-4c28-b25c-9f236ba41f28 > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = QemuFwCfgLib|PEIM DXE_DRIVER > DXE_RUNTIME_DRIVER DXE_SMM_DRIVER > + LIBRARY_CLASS = QemuFwCfgLib|DXE_DRIVER > DXE_RUNTIME_DRIVER DXE_SMM_DRIVER > > CONSTRUCTOR = 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/Library/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 = 0x00010005 > - BASE_NAME = QemuFwCfgLib > - FILE_GUID = fdd53716-31e1-4acc-9007-8bd5d877c96f > + BASE_NAME = QemuFwCfgPeiLib > + FILE_GUID = ddd4f5f0-5304-42a8-9efa-d14bf11a3533 > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = QemuFwCfgLib|PEIM DXE_DRIVER > DXE_RUNTIME_DRIVER DXE_SMM_DRIVER > + LIBRARY_CLASS = QemuFwCfgLib|PEIM > > CONSTRUCTOR = 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/Library/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/Library/QemuFwCfgLib/QemuFwCfgPei.c > similarity index 100% > rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c > rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c > -- > 2.7.4 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
