Re: [edk2] [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure

2017-03-16 Thread Laszlo Ersek 
On 03/16/17 06:08, Jordan Justen wrote:
> Reviewed-by: Jordan Justen 
> 
> Pushed as 08bed3fbac. Thanks!

Thank you both. This was also reported by
, in
.

I think gcc should have yelled at me for this, especially because EFIAPI
doesn't expand to  with gcc...

Sorry about breaking the build.
Laszlo

> On 2017-03-15 18:25:52, Dandan Bi wrote:
>> Cc: Jordan Justen 
>> Cc: Laszlo Ersek 
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Dandan Bi 
>> ---
>>  OvmfPkg/Include/Library/QemuFwCfgS3Lib.h| 10 +-
>>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c|  3 ++-
>>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c |  8 
>>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 10 +-
>>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c |  2 +-
>>  5 files changed, 17 insertions(+), 16 deletions(-)
>>
>> diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h 
>> b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
>> index 76c8554..432e3c9 100644
>> --- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
>> +++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
>> @@ -153,12 +153,12 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
>> QemuFwCfgS3CallWhenBootScriptReady() 
>> cannot
>> be rolled back.
>>  
>>@return  Error codes from underlying functions.
>>  **/
>> -EFIAPI
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3CallWhenBootScriptReady (
>>IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
>>IN OUT VOID *Context,  OPTIONAL
>>IN UINTNScratchBufferSize
>>);
>> @@ -202,12 +202,12 @@ QemuFwCfgS3CallWhenBootScriptReady (
>>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>>  ScratchBufferSize.
>>  
>>@return   Error codes from underlying functions.
>>  **/
>> -EFIAPI
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3ScriptWriteBytes (
>>IN INT32 FirmwareConfigItem,
>>IN UINTN NumberOfBytes
>>);
>>  
>> @@ -249,12 +249,12 @@ QemuFwCfgS3ScriptWriteBytes (
>>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>>  ScratchBufferSize.
>>  
>>@return   Error codes from underlying functions.
>>  **/
>> -EFIAPI
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3ScriptReadBytes (
>>IN INT32 FirmwareConfigItem,
>>IN UINTN NumberOfBytes
>>);
>>  
>> @@ -289,12 +289,12 @@ QemuFwCfgS3ScriptReadBytes (
>>  
>>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is too large.
>>  
>>@return   Error codes from underlying functions.
>>  **/
>> -EFIAPI
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3ScriptSkipBytes (
>>IN INT32 FirmwareConfigItem,
>>IN UINTN NumberOfBytes
>>);
>>  
>> @@ -347,12 +347,12 @@ QemuFwCfgS3ScriptSkipBytes (
>>  wholly contained in the 
>> ScratchBufferSize
>>  bytes at ScratchBuffer.
>>  
>>@return   Error codes from underlying functions.
>>  **/
>> -EFIAPI
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3ScriptCheckValue (
>>IN VOID   *ScratchData,
>>IN UINT8  ValueSize,
>>IN UINT64 ValueMask,
>>IN UINT64 Value
>> diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c 
>> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
>> index 7b71305..7fa1200 100644
>> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
>> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
>> @@ -95,12 +95,13 @@ QemuFwCfgS3Enabled (
>> QemuFwCfgS3CallWhenBootScriptReady() 
>> cannot
>> be rolled back.
>>  
>>@return  Error codes from underlying functions.
>>  **/
>> -EFIAPI
>> +
>>  RETURN_STATUS
>> +EFIAPI
>>  QemuFwCfgS3CallWhenBootScriptReady (
>>IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
>>IN OUT VOID *Context,  OPTIONAL
>>IN UINTNScratchBufferSize
>>)
>> diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c 
>> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
>> index 674929e..bdad448 100644
>> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
>> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
>> @@ -54,12 +54,12 @@
>>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>>  ScratchBufferSize.
>>  
>>@return   Error

Re: [edk2] [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure

2017-03-15 Thread Jordan Justen 
Reviewed-by: Jordan Justen 

Pushed as 08bed3fbac. Thanks!

On 2017-03-15 18:25:52, Dandan Bi wrote:
> Cc: Jordan Justen 
> Cc: Laszlo Ersek 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi 
> ---
>  OvmfPkg/Include/Library/QemuFwCfgS3Lib.h| 10 +-
>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c|  3 ++-
>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c |  8 
>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 10 +-
>  OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c |  2 +-
>  5 files changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h 
> b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
> index 76c8554..432e3c9 100644
> --- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
> +++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
> @@ -153,12 +153,12 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
> QemuFwCfgS3CallWhenBootScriptReady() 
> cannot
> be rolled back.
>  
>@return  Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3CallWhenBootScriptReady (
>IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
>IN OUT VOID *Context,  OPTIONAL
>IN UINTNScratchBufferSize
>);
> @@ -202,12 +202,12 @@ QemuFwCfgS3CallWhenBootScriptReady (
>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>  ScratchBufferSize.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3ScriptWriteBytes (
>IN INT32 FirmwareConfigItem,
>IN UINTN NumberOfBytes
>);
>  
> @@ -249,12 +249,12 @@ QemuFwCfgS3ScriptWriteBytes (
>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>  ScratchBufferSize.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3ScriptReadBytes (
>IN INT32 FirmwareConfigItem,
>IN UINTN NumberOfBytes
>);
>  
> @@ -289,12 +289,12 @@ QemuFwCfgS3ScriptReadBytes (
>  
>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is too large.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3ScriptSkipBytes (
>IN INT32 FirmwareConfigItem,
>IN UINTN NumberOfBytes
>);
>  
> @@ -347,12 +347,12 @@ QemuFwCfgS3ScriptSkipBytes (
>  wholly contained in the ScratchBufferSize
>  bytes at ScratchBuffer.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3ScriptCheckValue (
>IN VOID   *ScratchData,
>IN UINT8  ValueSize,
>IN UINT64 ValueMask,
>IN UINT64 Value
> diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c 
> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
> index 7b71305..7fa1200 100644
> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
> @@ -95,12 +95,13 @@ QemuFwCfgS3Enabled (
> QemuFwCfgS3CallWhenBootScriptReady() 
> cannot
> be rolled back.
>  
>@return  Error codes from underlying functions.
>  **/
> -EFIAPI
> +
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3CallWhenBootScriptReady (
>IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
>IN OUT VOID *Context,  OPTIONAL
>IN UINTNScratchBufferSize
>)
> diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c 
> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
> index 674929e..bdad448 100644
> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
> @@ -54,12 +54,12 @@
>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>  ScratchBufferSize.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>  QemuFwCfgS3ScriptWriteBytes (
>IN INT32 FirmwareConfigItem,
>IN UINTN NumberOfBytes
>)
>  {
> @@ -105,12 +105,12 @@ QemuFwCfgS3ScriptWriteBytes (
>@retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
>  ScratchBufferSize.
>  
>@return   Error codes from underlying functions.
>  **/
> -EFIAPI
>  RETURN_STATUS
> +EFIAPI
>

[edk2] [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure

2017-03-15 Thread Dandan Bi 
Cc: Jordan Justen 
Cc: Laszlo Ersek 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi 
---
 OvmfPkg/Include/Library/QemuFwCfgS3Lib.h| 10 +-
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c|  3 ++-
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c |  8 
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 10 +-
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h 
b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
index 76c8554..432e3c9 100644
--- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
@@ -153,12 +153,12 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
QemuFwCfgS3CallWhenBootScriptReady() cannot
be rolled back.
 
   @return  Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID *Context,  OPTIONAL
   IN UINTNScratchBufferSize
   );
@@ -202,12 +202,12 @@ QemuFwCfgS3CallWhenBootScriptReady (
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
 ScratchBufferSize.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptWriteBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -249,12 +249,12 @@ QemuFwCfgS3ScriptWriteBytes (
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
 ScratchBufferSize.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptReadBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -289,12 +289,12 @@ QemuFwCfgS3ScriptReadBytes (
 
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is too large.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptSkipBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -347,12 +347,12 @@ QemuFwCfgS3ScriptSkipBytes (
 wholly contained in the ScratchBufferSize
 bytes at ScratchBuffer.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptCheckValue (
   IN VOID   *ScratchData,
   IN UINT8  ValueSize,
   IN UINT64 ValueMask,
   IN UINT64 Value
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c 
b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
index 7b71305..7fa1200 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
@@ -95,12 +95,13 @@ QemuFwCfgS3Enabled (
QemuFwCfgS3CallWhenBootScriptReady() cannot
be rolled back.
 
   @return  Error codes from underlying functions.
 **/
-EFIAPI
+
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID *Context,  OPTIONAL
   IN UINTNScratchBufferSize
   )
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c 
b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
index 674929e..bdad448 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
@@ -54,12 +54,12 @@
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
 ScratchBufferSize.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptWriteBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -105,12 +105,12 @@ QemuFwCfgS3ScriptWriteBytes (
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is larger than
 ScratchBufferSize.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptReadBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -149,12 +149,12 @@ QemuFwCfgS3ScriptReadBytes (
 
   @retval RETURN_BAD_BUFFER_SIZENumberOfBytes is too large.
 
   @return   Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptSkipBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes