On 03/16/17 06:08, Jordan Justen wrote: > Reviewed-by: Jordan Justen <[email protected]> > > Pushed as 08bed3fbac. Thanks!
Thank you both. This was also reported by <https://github.com/cecekpawon>, in <https://github.com/tianocore/edk2/commit/06a265b948da7271e6d0cd527a8b54a5213e7bea#commitcomment-21330772>. I think gcc should have yelled at me for this, especially because EFIAPI doesn't expand to <empty> with gcc... Sorry about breaking the build. Laszlo > On 2017-03-15 18:25:52, Dandan Bi wrote: >> Cc: Jordan Justen <[email protected]> >> Cc: Laszlo Ersek <[email protected]> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Dandan Bi <[email protected]> >> --- >> 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 UINTN ScratchBufferSize >> ); >> @@ -202,12 +202,12 @@ QemuFwCfgS3CallWhenBootScriptReady ( >> @retval RETURN_BAD_BUFFER_SIZE NumberOfBytes 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_SIZE NumberOfBytes 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_SIZE NumberOfBytes 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 UINTN ScratchBufferSize >> ) >> 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_SIZE NumberOfBytes 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_SIZE NumberOfBytes 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_SIZE NumberOfBytes is too large. >> >> @return Error codes from underlying functions. >> **/ >> -EFIAPI >> RETURN_STATUS >> +EFIAPI >> QemuFwCfgS3ScriptSkipBytes ( >> IN INT32 FirmwareConfigItem, >> IN UINTN NumberOfBytes >> ) >> { >> @@ -211,12 +211,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/QemuFwCfgS3Dxe.c >> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c >> index 0bd6cf9..3fef2e3 100644 >> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c >> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c >> @@ -137,12 +137,12 @@ S3SaveStateInstalledNotify ( >> 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 UINTN ScratchBufferSize >> ) >> @@ -278,12 +278,12 @@ FreeDmaAccess: >> @retval RETURN_BAD_BUFFER_SIZE NumberOfBytes is larger than >> ScratchBufferSize. >> >> @return Error codes from underlying functions. >> **/ >> -EFIAPI >> RETURN_STATUS >> +EFIAPI >> QemuFwCfgS3ScriptWriteBytes ( >> IN INT32 FirmwareConfigItem, >> IN UINTN NumberOfBytes >> ) >> { >> @@ -426,12 +426,12 @@ QemuFwCfgS3ScriptWriteBytes ( >> @retval RETURN_BAD_BUFFER_SIZE NumberOfBytes is larger than >> ScratchBufferSize. >> >> @return Error codes from underlying functions. >> **/ >> -EFIAPI >> RETURN_STATUS >> +EFIAPI >> QemuFwCfgS3ScriptReadBytes ( >> IN INT32 FirmwareConfigItem, >> IN UINTN NumberOfBytes >> ) >> { >> @@ -564,12 +564,12 @@ QemuFwCfgS3ScriptReadBytes ( >> >> @retval RETURN_BAD_BUFFER_SIZE NumberOfBytes is too large. >> >> @return Error codes from underlying functions. >> **/ >> -EFIAPI >> RETURN_STATUS >> +EFIAPI >> QemuFwCfgS3ScriptSkipBytes ( >> IN INT32 FirmwareConfigItem, >> IN UINTN NumberOfBytes >> ) >> { >> @@ -714,12 +714,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/QemuFwCfgS3Pei.c >> b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c >> index d447e36..031e9f2 100644 >> --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c >> +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c >> @@ -72,12 +72,12 @@ >> 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 UINTN ScratchBufferSize >> ) >> -- >> 1.9.5.msysgit.1 >> _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
