From: Laszlo Ersek <lersek@redhat.com>
To: Jordan Justen <jordan.l.justen@intel.com>,
Dandan Bi <dandan.bi@intel.com>,
edk2-devel@lists.01.org
Subject: Re: [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure
Date: Thu, 16 Mar 2017 12:40:20 +0100 [thread overview]
Message-ID: <beba4e8f-24f3-f863-d752-48f0f906b062@redhat.com> (raw)
In-Reply-To: <148964088814.2777.13322004892889890935@jljusten-skl>
On 03/16/17 06:08, Jordan Justen wrote:
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
>
> 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 <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>
>> ---
>> 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
>>
prev parent reply other threads:[~2017-03-16 11:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 1:25 [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure Dandan Bi
2017-03-16 5:08 ` Jordan Justen
2017-03-16 11:40 ` Laszlo Ersek [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=beba4e8f-24f3-f863-d752-48f0f906b062@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox