From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 86FE380343 for ; Thu, 16 Mar 2017 04:40:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F18FFC04BD37; Thu, 16 Mar 2017 11:40:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F18FFC04BD37 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com F18FFC04BD37 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-73.phx2.redhat.com [10.3.116.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFC7917D56; Thu, 16 Mar 2017 11:40:22 +0000 (UTC) To: Jordan Justen , Dandan Bi , edk2-devel@lists.01.org References: <1489627552-10288-1-git-send-email-dandan.bi@intel.com> <148964088814.2777.13322004892889890935@jljusten-skl> From: Laszlo Ersek Message-ID: Date: Thu, 16 Mar 2017 12:40:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <148964088814.2777.13322004892889890935@jljusten-skl> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 16 Mar 2017 11:40:24 +0000 (UTC) Subject: Re: [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2017 11:40:23 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 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 >>