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 AFF271A1DF8 for ; Fri, 21 Oct 2016 14:27:57 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41A216264B; Fri, 21 Oct 2016 21:27:57 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-45.phx2.redhat.com [10.3.116.45]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9LLReg7027240; Fri, 21 Oct 2016 17:27:56 -0400 From: Laszlo Ersek To: edk2-devel-01 Cc: Jordan Justen Date: Fri, 21 Oct 2016 23:27:27 +0200 Message-Id: <20161021212737.15974-10-lersek@redhat.com> In-Reply-To: <20161021212737.15974-1-lersek@redhat.com> References: <20161021212737.15974-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 21 Oct 2016 21:27:57 +0000 (UTC) Subject: [PATCH 09/19] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: 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: Fri, 21 Oct 2016 21:27:57 -0000 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). 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 --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index c37aed1c9e7b..ff27c1100c01 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -965,6 +965,7 @@ FvbInitialize ( EFI_PHYSICAL_ADDRESS BaseAddress; UINTN Length; UINTN NumOfBlocks; + RETURN_STATUS PcdStatus; if (EFI_ERROR (QemuFlashInitialize ())) { // @@ -1095,18 +1096,21 @@ FvbInitialize ( // // Set several PCD values to point to flash // - PcdSet64 ( + PcdStatus = PcdSet64S ( PcdFlashNvStorageVariableBase64, (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase) ); - PcdSet32 ( + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet32S ( PcdFlashNvStorageFtwWorkingBase, PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase) ); - PcdSet32 ( + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet32S ( PcdFlashNvStorageFtwSpareBase, PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase) ); + ASSERT_RETURN_ERROR (PcdStatus); FwhInstance = (EFI_FW_VOL_INSTANCE *) ( @@ -1119,6 +1123,7 @@ FvbInitialize ( // InstallVirtualAddressChangeHandler (); - PcdSetBool (PcdOvmfFlashVariablesEnable, TRUE); + PcdStatus = PcdSetBoolS (PcdOvmfFlashVariablesEnable, TRUE); + ASSERT_RETURN_ERROR (PcdStatus); return EFI_SUCCESS; } -- 2.9.2