From patchwork Fri Oct 21 21:27:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 78733 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1504991qge; Fri, 21 Oct 2016 14:27:59 -0700 (PDT) X-Received: by 10.99.113.25 with SMTP id m25mr4263660pgc.173.1477085279254; Fri, 21 Oct 2016 14:27:59 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id w22si4157506pfj.243.2016.10.21.14.27.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Oct 2016 14:27:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E6C211A1ED5; Fri, 21 Oct 2016 14:27:55 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org 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 8EEF71A1EC4 for ; Fri, 21 Oct 2016 14:27:53 -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 25C43B7CF2; Fri, 21 Oct 2016 21:27:53 +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 u9LLReg4027240; Fri, 21 Oct 2016 17:27:51 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Fri, 21 Oct 2016 23:27:24 +0200 Message-Id: <20161021212737.15974-7-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.25]); Fri, 21 Oct 2016 21:27:53 +0000 (UTC) Subject: [edk2] [PATCH 06/19] OvmfPkg/SmbiosVersionLib: 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: , Cc: Jordan Justen , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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: Ard Biesheuvel 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: tested with OVMF (smbios v2) and ArmVirtQemu (smbios v3) OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c index 950c3f7e0a31..58180412bd1a 100644 --- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c +++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c @@ -40,6 +40,7 @@ DetectSmbiosVersion ( UINTN AnchorSize, TablesSize; QEMU_SMBIOS_ANCHOR QemuAnchor; UINT16 SmbiosVersion; + RETURN_STATUS PcdStatus; if (PcdGetBool (PcdQemuSmbiosValidated)) { // @@ -87,7 +88,8 @@ DetectSmbiosVersion ( DEBUG ((EFI_D_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n", __FUNCTION__, QemuAnchor.V3.DocRev)); - PcdSet8 (PcdSmbiosDocRev, QemuAnchor.V3.DocRev); + PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev); + ASSERT_RETURN_ERROR (PcdStatus); break; default: @@ -96,12 +98,14 @@ DetectSmbiosVersion ( DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__, SmbiosVersion)); - PcdSet16 (PcdSmbiosVersion, SmbiosVersion); + PcdStatus = PcdSet16S (PcdSmbiosVersion, SmbiosVersion); + ASSERT_RETURN_ERROR (PcdStatus); // // SMBIOS platform drivers can now fetch and install // "etc/smbios/smbios-tables" from QEMU. // - PcdSetBool (PcdQemuSmbiosValidated, TRUE); + PcdStatus = PcdSetBoolS (PcdQemuSmbiosValidated, TRUE); + ASSERT_RETURN_ERROR (PcdStatus); return RETURN_SUCCESS; }