[v3] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib

[edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.

Posted by Zhiguang Liu 3 years, 3 months ago

There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
failure, add CpuLib dependency to all modules that depend on UefiCpuLib.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
 OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c
index ab01ec9ab1..eef47f17e4 100644
--- a/OvmfPkg/IntelTdx/Sec/SecMain.c
+++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
@@ -17,6 +17,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
 #include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeCoffLib.h>
diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
index 74cb55611f..0e2515ca38 100644
--- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
+++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
@@ -11,6 +11,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
 #include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/SynchronizationLib.h>
 #include <Uefi/UefiBaseType.h>
 #include <Library/TdxLib.h>
-- 
2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95805): https://edk2.groups.io/g/devel/message/95805
Mute This Topic: https://groups.io/mt/94704514/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.

Posted by Zhiguang Liu 3 years, 3 months ago

Hi OvmfPkg Maintainers,
Could you help review this patch, and also the patch "[PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from module INFs." ?

Thanks
Zhiguang

> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, November 1, 2022 3:59 PM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen,
> Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend
> on UefiCpuLib.
> 
> There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
> UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
> failure, add CpuLib dependency to all modules that depend on UefiCpuLib.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
>  OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c
> b/OvmfPkg/IntelTdx/Sec/SecMain.c index ab01ec9ab1..eef47f17e4 100644
> --- a/OvmfPkg/IntelTdx/Sec/SecMain.c
> +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
> @@ -17,6 +17,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/PeCoffLib.h>
> diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> index 74cb55611f..0e2515ca38 100644
> --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> @@ -11,6 +11,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/SynchronizationLib.h>  #include <Uefi/UefiBaseType.h>
> #include <Library/TdxLib.h>
> --
> 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95950): https://edk2.groups.io/g/devel/message/95950
Mute This Topic: https://groups.io/mt/94704514/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.

Posted by Ni, Ray 3 years, 3 months ago

Reviewed-by: Ray Ni <ray.ni@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: Liu, Zhiguang <zhiguang.liu@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen,
> Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs
> that depend on UefiCpuLib.
> 
> There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
> UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
> failure, add CpuLib dependency to all modules that depend on UefiCpuLib.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
>  OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c
> b/OvmfPkg/IntelTdx/Sec/SecMain.c
> index ab01ec9ab1..eef47f17e4 100644
> --- a/OvmfPkg/IntelTdx/Sec/SecMain.c
> +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
> @@ -17,6 +17,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/PeCoffLib.h>
> diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> index 74cb55611f..0e2515ca38 100644
> --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> @@ -11,6 +11,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/SynchronizationLib.h>
>  #include <Uefi/UefiBaseType.h>
>  #include <Library/TdxLib.h>
> --
> 2.31.1.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95948): https://edk2.groups.io/g/devel/message/95948
Mute This Topic: https://groups.io/mt/94704514/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-