OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
index 76c8554cb70665869d6fb61fb6413ee65a92eb74..432e3c906c5c6cf60a06ddd3f1a6f435afae2860 100644 (file)
--- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
@@ -155,8 +155,8 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
 \r
   @return                          Error codes from underlying functions.\r
 **/\r
 \r
   @return                          Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r


@@ -204,8 +204,8 @@ QemuFwCfgS3CallWhenBootScriptReady (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -251,8 +251,8 @@ QemuFwCfgS3ScriptWriteBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -291,8 +291,8 @@ QemuFwCfgS3ScriptReadBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -349,8 +349,8 @@ QemuFwCfgS3ScriptSkipBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r
 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
index 7b71305d1267484a7f6555217c046900a64bbf3c..7fa1200ee3eabeeba81b1ac1aff690f44b95a27e 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
@@ -97,8 +97,9 @@ QemuFwCfgS3Enabled (
 \r
   @return                          Error codes from underlying functions.\r
 **/\r
 \r
   @return                          Error codes from underlying functions.\r
 **/\r

-EFIAPI\r
+\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
index 674929e9d500c5c6f7c53c0791b4b0b796893637..bdad44801628da36e6df57d9be3ffdb6f67d3d2e 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
@@ -56,8 +56,8 @@
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -107,8 +107,8 @@ QemuFwCfgS3ScriptWriteBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -151,8 +151,8 @@ QemuFwCfgS3ScriptReadBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -213,8 +213,8 @@ QemuFwCfgS3ScriptSkipBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r
 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
index 0bd6cf939904db99388dd382b73ff197dd57d264..3fef2e30176623691f232302f67f44b2439d0708 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
@@ -139,8 +139,8 @@ S3SaveStateInstalledNotify (
 \r
   @return                          Error codes from underlying functions.\r
 **/\r
 \r
   @return                          Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r


@@ -280,8 +280,8 @@ FreeDmaAccess:
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptWriteBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -428,8 +428,8 @@ QemuFwCfgS3ScriptWriteBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptReadBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -566,8 +566,8 @@ QemuFwCfgS3ScriptReadBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r
 QemuFwCfgS3ScriptSkipBytes (\r
   IN INT32 FirmwareConfigItem,\r
   IN UINTN NumberOfBytes\r


@@ -716,8 +716,8 @@ QemuFwCfgS3ScriptSkipBytes (
 \r
   @return                           Error codes from underlying functions.\r
 **/\r
 \r
   @return                           Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r
 QemuFwCfgS3ScriptCheckValue (\r
   IN VOID   *ScratchData,\r
   IN UINT8  ValueSize,\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
index d447e36fc01cc1a9c317e49bf32e2324ba1eb2a0..031e9f2f7089be07ae271ca9d82a96c3b39e3e7f 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
@@ -74,8 +74,8 @@
 \r
   @return                          Error codes from underlying functions.\r
 **/\r
 \r
   @return                          Error codes from underlying functions.\r
 **/\r

-EFIAPI\r

 RETURN_STATUS\r
 RETURN_STATUS\r

+EFIAPI\r

 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
   IN OUT VOID                                 *Context,          OPTIONAL\r