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 8D2E21A1F33 for ; Wed, 26 Oct 2016 12:06:13 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 22DE361BB6; Wed, 26 Oct 2016 19:06:13 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-27.phx2.redhat.com [10.3.116.27]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9QJ570D025834; Wed, 26 Oct 2016 15:06:12 -0400 From: Laszlo Ersek To: edk2-devel-01 Cc: Jordan Justen Date: Wed, 26 Oct 2016 21:04:54 +0200 Message-Id: <20161026190504.9888-38-lersek@redhat.com> In-Reply-To: <20161026190504.9888-1-lersek@redhat.com> References: <20161026190504.9888-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 26 Oct 2016 19:06:13 +0000 (UTC) Subject: [PATCH 37/47] OvmfPkg/QemuBootOrderLib: rebase to ARRAY_SIZE() 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: Wed, 26 Oct 2016 19:06:13 -0000 Cc: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c index 8cbbdb0568fa..567f6f92f452 100644 --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c @@ -707,7 +707,7 @@ TranslatePciOfwNodes ( // Parse the OFW nodes starting with the first non-bridge node. // PciDevFun[1] = 0; - NumEntries = sizeof (PciDevFun) / sizeof (PciDevFun[0]); + NumEntries = ARRAY_SIZE (PciDevFun); if (ParseUnitAddressHexList ( OfwNode[FirstNonBridge].UnitAddress, PciDevFun, @@ -910,7 +910,7 @@ TranslatePciOfwNodes ( UINT64 TargetLun[2]; TargetLun[1] = 0; - NumEntries = sizeof (TargetLun) / sizeof (TargetLun[0]); + NumEntries = ARRAY_SIZE (TargetLun); if (ParseUnitAddressHexList ( OfwNode[FirstNonBridge + 2].UnitAddress, TargetLun, @@ -958,7 +958,7 @@ TranslatePciOfwNodes ( UINTN RequiredEntries; UINT8 *Eui64; - RequiredEntries = sizeof (Namespace) / sizeof (Namespace[0]); + RequiredEntries = ARRAY_SIZE (Namespace); NumEntries = RequiredEntries; if (ParseUnitAddressHexList ( OfwNode[FirstNonBridge + 1].UnitAddress, @@ -1145,7 +1145,7 @@ TranslateMmioOfwNodes ( UINT64 TargetLun[2]; TargetLun[1] = 0; - NumEntries = sizeof (TargetLun) / sizeof (TargetLun[0]); + NumEntries = ARRAY_SIZE (TargetLun); if (ParseUnitAddressHexList ( OfwNode[2].UnitAddress, TargetLun, @@ -1803,7 +1803,7 @@ SetBootOrderFromQemu ( // // translate each OpenFirmware path // - TranslatedSize = sizeof (Translated) / sizeof (Translated[0]); + TranslatedSize = ARRAY_SIZE (Translated); Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated, &TranslatedSize); while (Status == RETURN_SUCCESS || @@ -1835,7 +1835,7 @@ SetBootOrderFromQemu ( } // scanned all active boot options } // translation successful - TranslatedSize = sizeof (Translated) / sizeof (Translated[0]); + TranslatedSize = ARRAY_SIZE (Translated); Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated, &TranslatedSize); } // scanning of OpenFirmware paths done -- 2.9.2