From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 C3162803FB for ; Wed, 15 Mar 2017 22:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489640889; x=1521176889; h=mime-version:content-transfer-encoding:to:message-id: from:in-reply-to:cc:references:subject:date; bh=iz+N9y6tvZ3rZrYJRetwUZZwH10IGUb0L8ec9oaeizw=; b=bYcY1byfkVJY1lJjHY3c5gjETi19hC3tt2YzAvaFZ2vYGo0nWYPGIGQM BjJjL+wfpTgy78NC+uZPkZ2ru5kUww==; Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2017 22:08:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,170,1486454400"; d="scan'208";a="67855950" Received: from perumand-mobl1.amr.corp.intel.com (HELO localhost) ([10.254.5.112]) by orsmga004.jf.intel.com with ESMTP; 15 Mar 2017 22:08:08 -0700 MIME-Version: 1.0 To: Dandan Bi , edk2-devel@lists.01.org Message-ID: <148964088814.2777.13322004892889890935@jljusten-skl> From: Jordan Justen In-Reply-To: <1489627552-10288-1-git-send-email-dandan.bi@intel.com> Cc: Laszlo Ersek References: <1489627552-10288-1-git-send-email-dandan.bi@intel.com> User-Agent: alot/0.5.1 Date: Wed, 15 Mar 2017 22:08:08 -0700 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 05:08:10 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/L= ibrary/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 function= s. > **/ > -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 function= s. > **/ > -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 function= s. > **/ > -EFIAPI > RETURN_STATUS > +EFIAPI > QemuFwCfgS3ScriptSkipBytes ( > IN INT32 FirmwareConfigItem, > IN UINTN NumberOfBytes > ); > = > @@ -347,12 +347,12 @@ QemuFwCfgS3ScriptSkipBytes ( > wholly contained in the ScratchBuffe= rSize > bytes at ScratchBuffer. > = > @return Error codes from underlying function= s. > **/ > -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/L= ibrary/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/OvmfPk= g/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 function= s. > **/ > -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 function= s. > **/ > -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 function= s. > **/ > -EFIAPI > RETURN_STATUS > +EFIAPI > QemuFwCfgS3ScriptSkipBytes ( > IN INT32 FirmwareConfigItem, > IN UINTN NumberOfBytes > ) > { > @@ -211,12 +211,12 @@ QemuFwCfgS3ScriptSkipBytes ( > wholly contained in the ScratchBuffe= rSize > bytes at ScratchBuffer. > = > @return Error codes from underlying function= s. > **/ > -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/Li= brary/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 function= s. > **/ > -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 function= s. > **/ > -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 function= s. > **/ > -EFIAPI > RETURN_STATUS > +EFIAPI > QemuFwCfgS3ScriptSkipBytes ( > IN INT32 FirmwareConfigItem, > IN UINTN NumberOfBytes > ) > { > @@ -714,12 +714,12 @@ QemuFwCfgS3ScriptSkipBytes ( > wholly contained in the ScratchBuffe= rSize > bytes at ScratchBuffer. > = > @return Error codes from underlying function= s. > **/ > -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/Li= brary/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 >=20