From patchwork Wed Oct 22 13:21:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 39294 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1504F2403F for ; Wed, 22 Oct 2014 13:22:36 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf2073919lbv.4 for ; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=NCxFx5vaH5VeHI+p4SFcyVh1b58vCgnGCwWICcg3fPk=; b=NtjQBN0I43aDSiFnZyu5S4xLcxzHL9dyo8Q6igQ0cHrTrnoDPRgF80Y/aegN9/6q5K qK4pTZLGqhio3o3QAM0oPjBaCkUz9WEINLsg4sULcMHiQhG0PkEWInRz2AXS1w6FpNGJ ALKLu5/yMEH6VYz0CpAfZgZeUOMbB8DkbKbisykFD7t9y0BYa+dvzfitOwLUPyeDIZke m2y29ZYGZxf6kyHwWTy2ExR4odQSZAkceMTmGZBpQnxrA8R5+Ve243Z5T1h/jT/H2jHq WxKdkgzc03kQZjwLYMGU0PhaYgU/I3H+zf63NfyjfmlUUs6Ry8fCSQ0ccBEyS7zLni4k jurw== X-Gm-Message-State: ALoCoQnj7cmWBAuadiCsJJCBPDjjc01SaAk7xRlNZ29Tk7e+QNixNDKIFwoqeAmSImJKQ0tH/yxw X-Received: by 10.112.247.74 with SMTP id yc10mr9390lbc.8.1413984155851; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.129 with SMTP id t1ls126732lag.53.gmail; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) X-Received: by 10.112.254.162 with SMTP id aj2mr42220885lbd.70.1413984155636; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id be18si23278255lab.113.2014.10.22.06.22.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Oct 2014 06:22:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id b6so2821870lbj.3 for ; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr33089254lbw.66.1413984155549; Wed, 22 Oct 2014 06:22:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp69757lbz; Wed, 22 Oct 2014 06:22:34 -0700 (PDT) X-Received: by 10.43.79.7 with SMTP id zo7mr4379273icb.5.1413984153108; Wed, 22 Oct 2014 06:22:33 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id q5si21207875ico.48.2014.10.22.06.22.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Oct 2014 06:22:33 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Xgvrq-0001nn-Ii; Wed, 22 Oct 2014 13:22:22 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Xgvro-0001nh-I7 for edk2-devel@lists.sourceforge.net; Wed, 22 Oct 2014 13:22:20 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=lersek@redhat.com; helo=mx1.redhat.com; Received: from mx1.redhat.com ([209.132.183.28]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1Xgvrn-0002Zq-MA for edk2-devel@lists.sourceforge.net; Wed, 22 Oct 2014 13:22:20 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9MDMDv3029847 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Oct 2014 09:22:13 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-81.ams2.redhat.com [10.36.116.81]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9MDM2M7016088 for ; Wed, 22 Oct 2014 09:22:12 -0400 From: Laszlo Ersek To: edk2-devel@lists.sourceforge.net Date: Wed, 22 Oct 2014 15:21:55 +0200 Message-Id: <1413984117-20000-6-git-send-email-lersek@redhat.com> In-Reply-To: <1413984117-20000-1-git-send-email-lersek@redhat.com> References: <1413984117-20000-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Spam-Score: -2.9 (--) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1Xgvrn-0002Zq-MA Subject: [edk2] [PATCH 5/7] OvmfPkg: BDS: drop superfluous "connect first boot option" logic X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This is again obviated by our earlier BdsLibConnectAll() call. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c index 9fa48c9..e974d3f 100644 --- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1063,8 +1063,6 @@ Returns: EFI_STATUS Status; UINT16 Timeout; EFI_EVENT UserInputDurationTime; - LIST_ENTRY *Link; - BDS_COMMON_OPTION *BootOption; UINTN Index; EFI_INPUT_KEY Key; EFI_TPL OldTpl; @@ -1159,27 +1157,6 @@ Returns: // To give the User a chance to enter Setup here, if user set TimeOut is 0. // BDS should still give user a chance to enter Setup // - // Connect first boot option, and then check user input before exit - // - for (Link = BootOptionList->ForwardLink; Link != BootOptionList;Link = Link->ForwardLink) { - BootOption = CR (Link, BDS_COMMON_OPTION, Link, BDS_LOAD_OPTION_SIGNATURE); - if (!IS_LOAD_OPTION_TYPE (BootOption->Attribute, LOAD_OPTION_ACTIVE)) { - // - // skip the header of the link list, becuase it has no boot option - // - continue; - } else { - // - // Make sure the boot option device path connected, but ignore the BBS device path - // - if (DevicePathType (BootOption->DevicePath) != BBS_DEVICE_PATH) { - BdsLibConnectDevicePath (BootOption->DevicePath); - } - break; - } - } - - // // Check whether the user input after the duration time has expired // OldTpl = EfiGetCurrentTpl();