Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of > Zhiguang Liu > Sent: Tuesday, November 1, 2022 3:59 PM > To: devel@edk2.groups.io > Cc: Yu Pu <yu...@intel.com>; Ard Biesheuvel <ardb+tianoc...@kernel.org>; > Yao, Jiewen <jiewen....@intel.com>; Justen, Jordan L > <jordan.l.jus...@intel.com>; Gerd Hoffmann <kra...@redhat.com>; Liu, > Zhiguang <zhiguang....@intel.com> > Subject: [edk2-devel] [PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from > module INFs. > > From: Yu Pu <yu...@intel.com> > > Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the > dependency of UefiCpuLib. > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Signed-off-by: Yu Pu <yu...@intel.com> > Signed-off-by: Zhiguang Liu <zhiguang....@intel.com> > --- > OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - > OvmfPkg/Bhyve/BhyveX64.dsc | 1 - > OvmfPkg/CloudHv/CloudHvX64.dsc | 1 - > OvmfPkg/IntelTdx/Sec/SecMain.c | 1 - > OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 - > OvmfPkg/Microvm/MicrovmX64.dsc | 1 - > OvmfPkg/OvmfPkgIa32.dsc | 1 - > OvmfPkg/OvmfPkgIa32X64.dsc | 1 - > OvmfPkg/OvmfPkgX64.dsc | 1 - > OvmfPkg/OvmfXen.dsc | 1 - > OvmfPkg/Sec/SecMain.c | 1 - > OvmfPkg/Sec/SecMain.inf | 1 - > 12 files changed, 12 deletions(-) > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc > b/OvmfPkg/AmdSev/AmdSevX64.dsc > index 90e8a213ef..b894d710f7 100644 > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > @@ -154,7 +154,6 @@ > > UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA > pplicationEntryPoint.inf > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index 475b88b21a..9a4b1a3d15 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -160,7 +160,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc > b/OvmfPkg/CloudHv/CloudHvX64.dsc > index 10b16104ac..23aa065606 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > @@ -181,7 +181,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf > diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c > b/OvmfPkg/IntelTdx/Sec/SecMain.c > index eef47f17e4..3f5c8e82f4 100644 > --- a/OvmfPkg/IntelTdx/Sec/SecMain.c > +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c > @@ -16,7 +16,6 @@ > #include <Library/DebugLib.h> > #include <Library/BaseMemoryLib.h> > #include <Library/PcdLib.h> > -#include <Library/UefiCpuLib.h> > #include <Library/CpuLib.h> > #include <Library/DebugAgentLib.h> > #include <Library/IoLib.h> > diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c > b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c > index 0e2515ca38..8bd6202279 100644 > --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c > +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c > @@ -10,7 +10,6 @@ > #include <Library/DebugLib.h> > #include <Library/BaseMemoryLib.h> > #include <Library/PcdLib.h> > -#include <Library/UefiCpuLib.h> > #include <Library/CpuLib.h> > #include <Library/SynchronizationLib.h> > #include <Uefi/UefiBaseType.h> > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc > b/OvmfPkg/Microvm/MicrovmX64.dsc > index 7eff8e2a88..4903712321 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.dsc > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc > @@ -179,7 +179,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index e9ba491237..662a2d9140 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -182,7 +182,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index af566b953f..8ce659300d 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -186,7 +186,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index f39d9cd117..d9223b33d2 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -198,7 +198,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 58a7c97cdd..dcd14ea372 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -161,7 +161,6 @@ > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD > evicePathLibDevicePathProtocol.inf > NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > > SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable > sLib.inf > diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c > index 1167d22a68..af3a2c41e2 100644 > --- a/OvmfPkg/Sec/SecMain.c > +++ b/OvmfPkg/Sec/SecMain.c > @@ -18,7 +18,6 @@ > #include <Library/PeiServicesLib.h> > #include <Library/PcdLib.h> > #include <Library/CpuLib.h> > -#include <Library/UefiCpuLib.h> > #include <Library/DebugAgentLib.h> > #include <Library/IoLib.h> > #include <Library/PeCoffLib.h> > diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf > index 561a840f29..3c47a664a9 100644 > --- a/OvmfPkg/Sec/SecMain.inf > +++ b/OvmfPkg/Sec/SecMain.inf > @@ -45,7 +45,6 @@ > PeiServicesLib > PcdLib > CpuLib > - UefiCpuLib > DebugAgentLib > IoLib > PeCoffLib > -- > 2.31.1.windows.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95949): https://edk2.groups.io/g/devel/message/95949 Mute This Topic: https://groups.io/mt/94704517/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
