From patchwork Wed Sep 28 22:51:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9355097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 952FA6086A for ; Wed, 28 Sep 2016 22:54:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8833229529 for ; Wed, 28 Sep 2016 22:54:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C566296D8; Wed, 28 Sep 2016 22:54:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4034A29529 for ; Wed, 28 Sep 2016 22:54:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bpNi6-0004IR-Ff; Wed, 28 Sep 2016 22:52:18 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bpNi4-0004HB-N5 for xen-devel@lists.xenproject.org; Wed, 28 Sep 2016 22:52:16 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 7C/4C-13744-0A94CE75; Wed, 28 Sep 2016 22:52:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeJIrShJLcpLzFFi42KZM10+UHe+55t wg3f7VS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxXz8+wFsxkr/jY9Y65gfENaxcjF4eQwGQm iS3rl7JDOF8YJfa2zWeBcDYySixccB6qbAKjxLfP/cxdjJwcbAI6Ehe/PGQHsUUElCTurZrMB FLELLCLSeLU5Y2MIAlhgSCJY4ufgdksAqoSWzZ9YwWxeQXcJSY8hxgkIaAo0f1sAhuIzSngIf Hj4QeweiGgmtuLvjNC1BhLtL+9yDaBkW8BI8MqRo3i1KKy1CJdQ0u9pKLM9IyS3MTMHF1DAzO 93NTi4sT01JzEpGK95PzcTYzAcGEAgh2MP5YFHGKU5GBSEuWdavwmXIgvKT+lMiOxOCO+qDQn tfgQowwHh5IEb4gHUE6wKDU9tSItMwcYuDBpCQ4eJRHeOSBp3uKCxNzizHSI1ClGXY4FP26vZ RJiycvPS5US55UCKRIAKcoozYMbAYuiS4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBKGWMWTmV cCt+kV0BFMQEcsPfEC5IiSRISUVAOjSAT3wqCf8yN+HXmddMWR71CnU/aFJY5cFV6TSh0fcM5 TDVG/sTZPKaDnKmuMy/prP+OzlX7pbtp26/61yW8Sz72L2OujUjXxcsG8v3Lu+/7VXBEX7Ly5 3f+HvYuRbXAgX9eeBSxi2xOti2zP/zj2uXnpKwHHFL/9Eyp7p07TDT0nZ7Tl/8psJZbijERDL eai4kQA70hNbJ0CAAA= X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1475103133!61745567!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63915 invoked from network); 28 Sep 2016 22:52:15 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Sep 2016 22:52:15 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8SMq2km011998 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Sep 2016 22:52:02 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id u8SMq1sS014496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Sep 2016 22:52:02 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8SMpv0Y021183; Wed, 28 Sep 2016 22:51:59 GMT Received: from olila.local.net-space.pl (/10.175.227.27) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 28 Sep 2016 15:51:57 -0700 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Thu, 29 Sep 2016 00:51:22 +0200 Message-Id: <1475103092-27893-4-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1475103092-27893-1-git-send-email-daniel.kiper@oracle.com> References: <1475103092-27893-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v8 03/13] x86: allow EFI reboot method neither on EFI platforms... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP ..nor EFI platforms with runtime services enabled. Suggested-by: Jan Beulich Signed-off-by: Daniel Kiper Acked-by: Jan Beulich --- v6 - suggestions/fixes: - move this commit behind "efi: create efi_enabled()" commit (suggested by Jan Beulich). v5 - suggestions/fixes: - fix build error (suggested by Jan Beulich), - improve commit message. --- xen/arch/x86/shutdown.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 54c2c79..b429fd0 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -80,6 +80,9 @@ static void __init set_reboot_type(char *str) break; str++; } + + if ( reboot_type == BOOT_EFI && !efi_enabled(EFI_RS) ) + reboot_type = BOOT_INVALID; } custom_param("reboot", set_reboot_type);