On 10/13/15 14:57, Paolo Bonzini wrote: > The next patches will customize the implementation, but let's > start from the common version to better show the changes. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Paolo Bonzini <[email protected]> > --- > .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 0 > .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 6 +++--- > .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni | Bin > OvmfPkg/OvmfPkgIa32.dsc | 2 +- > OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- > OvmfPkg/OvmfPkgX64.dsc | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > copy {UefiCpuPkg => OvmfPkg}/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c > (100%) > copy {UefiCpuPkg => OvmfPkg}/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > (99%) > copy {UefiCpuPkg => OvmfPkg}/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni > (100%) > > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c > b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c > similarity index 100% > copy from UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c > copy to OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > similarity index 99% > copy from UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > copy to OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > index 78bb8b9..0a19c75 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > @@ -6,10 +6,10 @@ > # are licensed and made available under the terms and conditions of the BSD > License > # which accompanies this distribution. The full text of the license may be > found at > # http://opensource.org/licenses/bsd-license.php > -# > +# > # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > -# > +# > ## > > [Defines] > @@ -28,7 +28,7 @@ > [Packages] > MdePkg/MdePkg.dec > UefiCpuPkg/UefiCpuPkg.dec > - > + > [LibraryClasses] > BaseLib > PcdLib > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni > b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni > similarity index 100% > copy from UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni > copy to OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 18740b8..81adb31 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -693,7 +693,7 @@ > <LibraryClasses> > > SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf > SmmLib|MdePkg/Library/SmmLibNull/SmmLibNull.inf > - > SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > + > SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > } > > # > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index f12161a..1a8bfd2 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -700,7 +700,7 @@ > <LibraryClasses> > > SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf > SmmLib|MdePkg/Library/SmmLibNull/SmmLibNull.inf > - > SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > + > SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > } > > # > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 5375869..9bf720a 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -698,7 +698,7 @@ > <LibraryClasses> > > SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf > SmmLib|MdePkg/Library/SmmLibNull/SmmLibNull.inf > - > SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > + > SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > } > > # >
I'll pick up this patch (and find a good place for it) in the next version of my series, thanks a lot. I'll implement the following changes: - I'll drop the UNI file (the more central packages have those for UPT -- UEFI packaging tool -- support, but OvmfPkg is not packaged as part of UDK, so we don't have UNI files) - I'll revert the whitespace changes in "SmmCpuFeaturesLib.inf" - I'll generate a new FILE_GUID with "uuidgen" for the copied "SmmCpuFeaturesLib.inf" Thank you! Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
