From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (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 8DF131A1E05 for ; Sun, 23 Oct 2016 21:45:46 -0700 (PDT) Received: from nwb-ext-pat.microfocus.com ([10.120.13.103]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Mon, 24 Oct 2016 06:45:44 +0200 Received: from GaryWorkstation (nwb-a10-snat.microfocus.com [10.120.13.201]) by nwb-ext-pat.microfocus.com with ESMTP (TLS encrypted); Mon, 24 Oct 2016 05:45:15 +0100 Date: Mon, 24 Oct 2016 12:45:09 +0800 From: Gary Lin To: Laszlo Ersek Cc: edk2-devel-01 , Anthony PERARD , Jordan Justen Message-ID: <20161024044509.6xbqmhchlo3gfnwh@GaryWorkstation> References: <20161021212737.15974-1-lersek@redhat.com> <20161021212737.15974-5-lersek@redhat.com> MIME-Version: 1.0 In-Reply-To: <20161021212737.15974-5-lersek@redhat.com> User-Agent: Mutt/1.6.2 (2016-07-01) Subject: Re: [PATCH 04/19] OvmfPkg/EmuVariableFvbRuntimeDxe: eliminate unchecked PcdSetXX() calls X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2016 04:45:47 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Oct 21, 2016 at 11:27:22PM +0200, Laszlo Ersek wrote: > These are deprecated / disabled under the > DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. > > Introduce a variable called PcdStatus, and use it to assert the success of > these operations (there is no reason for them to fail here). > Reviewed-by: Gary Lin and Tested-by: Gary Lin > Cc: Anthony PERARD > Cc: Gary Lin > Cc: Jordan Justen > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=166 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek > --- > > Notes: > not used in my setup, testing would be appreciated > > OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > index 7a8beb3354b9..dec6d4af50df 100644 > --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > @@ -803,6 +803,7 @@ FvbInitialize ( > BOOLEAN Initialize; > EFI_HANDLE Handle; > EFI_PHYSICAL_ADDRESS Address; > + RETURN_STATUS PcdStatus; > > DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n")); > > @@ -862,19 +863,24 @@ FvbInitialize ( > SetMem (Ptr, EMU_FVB_SIZE, ERASED_UINT8); > InitializeFvAndVariableStoreHeaders (Ptr); > } > - PcdSet64 (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); > + PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Initialize the Fault Tolerant Write data area > // > SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize)); > - PcdSet32 (PcdFlashNvStorageFtwWorkingBase, (UINT32)(UINTN) SubPtr); > + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwWorkingBase, > + (UINT32)(UINTN) SubPtr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Initialize the Fault Tolerant Write spare block > // > SubPtr = (VOID*) ((UINT8*) Ptr + EMU_FVB_BLOCK_SIZE); > - PcdSet32 (PcdFlashNvStorageFtwSpareBase, (UINT32)(UINTN) SubPtr); > + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwSpareBase, > + (UINT32)(UINTN) SubPtr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Setup FVB device path > -- > 2.9.2 > > >