From e83a694c0ff800820b21e5f6ecd3fa8d944674d4 Mon Sep 17 00:00:00 2001
From: Michael D Kinney <michael.d.kinney@intel.com>
Date: Thu, 22 May 2025 10:22:24 -0700
Subject: [PATCH] UefiCpuPkg/Test/EfiMpServicesPpiProtocol: EFI_AP_PROCEDURE
 must be EFIAPI

Add missing EFIAPI calling convention to all EFI_AP_PROCEDURE functions
in the EfiMpServicesPpiProtocol unit tests.

Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../EfiMpServicesUnitTestCommom.c                      | 10 ++++++++++
 .../EfiMpServicesUnitTestCommom.h                      |  2 ++
 .../EfiPeiMpServices2PpiUnitTest.c                     |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.c b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.c
index 7cd3f48d76..d7fa06c992 100644
--- a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.c
+++ b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.c
@@ -231,6 +231,7 @@ FreeUTContext (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 StoreCpuNumbers (
   IN OUT VOID  *Buffer
   )
@@ -260,6 +261,7 @@ StoreCpuNumbers (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 StoreAPsExecutionOrder (
   IN OUT VOID  *Buffer
   )
@@ -290,6 +292,7 @@ StoreAPsExecutionOrder (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 InfiniteLoopProcedure (
   IN OUT VOID  *Buffer
   )
@@ -308,6 +311,7 @@ InfiniteLoopProcedure (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 EmptyProcedure (
   IN OUT VOID  *Buffer
   )
@@ -320,6 +324,7 @@ EmptyProcedure (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceGetNumberOfProcessorsOnAp (
   IN OUT VOID  *Buffer
   )
@@ -343,6 +348,7 @@ RunMpServiceGetNumberOfProcessorsOnAp (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceGetProcessorInfoOnAp (
   IN OUT VOID  *Buffer
   )
@@ -365,6 +371,7 @@ RunMpServiceGetProcessorInfoOnAp (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceEnableDisableAPOnAp (
   IN OUT VOID  *Buffer
   )
@@ -387,6 +394,7 @@ RunMpServiceEnableDisableAPOnAp (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceStartupThisAPOnAp (
   IN OUT VOID  *Buffer
   )
@@ -410,6 +418,7 @@ RunMpServiceStartupThisAPOnAp (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceStartupAllAPsOnAp (
   IN OUT VOID  *Buffer
   )
@@ -433,6 +442,7 @@ RunMpServiceStartupAllAPsOnAp (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceSwitchBSPOnAp (
   IN OUT VOID  *Buffer
   )
diff --git a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.h b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.h
index f6bb7f904f..0691c81c9d 100644
--- a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.h
+++ b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.h
@@ -191,6 +191,7 @@ MpServicesUnitTestWhoAmI (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 EmptyProcedure (
   IN OUT VOID  *Buffer
   );
@@ -201,6 +202,7 @@ EmptyProcedure (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 StoreCpuNumbers (
   IN OUT VOID  *Buffer
   );
diff --git a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiPeiMpServices2PpiUnitTest.c b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiPeiMpServices2PpiUnitTest.c
index 85f30b44ca..b76ed898f8 100644
--- a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiPeiMpServices2PpiUnitTest.c
+++ b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiPeiMpServices2PpiUnitTest.c
@@ -215,6 +215,7 @@ MpServicesUnitTestStartupAllCPUs (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 ApInfiniteLoopProcedure (
   IN OUT VOID  *Buffer
   )
@@ -245,6 +246,7 @@ ApInfiniteLoopProcedure (
   @param[in,out] Buffer   The pointer to private data buffer.
 **/
 VOID
+EFIAPI
 RunMpServiceStartupAllCPUsOnAp (
   IN OUT VOID  *Buffer
   )