From patchwork Fri Aug 5 23:04:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9265769 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 663F260839 for ; Fri, 5 Aug 2016 23:08:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55D0C28462 for ; Fri, 5 Aug 2016 23:08:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A7CA284A0; Fri, 5 Aug 2016 23:08:08 +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 CC92528462 for ; Fri, 5 Aug 2016 23:08:07 +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 1bVoB7-0002xx-6A; Fri, 05 Aug 2016 23:05:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVoB6-0002xr-Gn for xen-devel@lists.xenproject.org; Fri, 05 Aug 2016 23:05:20 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 8C/C7-01957-FAB15A75; Fri, 05 Aug 2016 23:05:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeJIrShJLcpLzFFi42LpnVTnqrteemm 4wew94hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bNBb1MBe2sFfM3f2duYJzE0sXIxSEk0M4k MfniHCjnM6PEhRdnmLoYOYGcDYwSK4/FQyQmMkr8bp/CCpJgE9CRuPjlITuILSKgJHFv1WQmk CJmgaNMEv8nPwYrEhYIkvg7Zw8biM0ioCrRu/MkcxcjBwevgJvEvH0RIGEJAUWJ7mcTwEo4Bd wl5m18zgax2E3iY/d8VogaY4m+WX0sExj5FjAyrGLUKE4tKkst0jW00EsqykzPKMlNzMzRNTQ w1ctNLS5OTE/NSUwq1kvOz93ECAwVBiDYwdi03fMQoyQHk5Io7/nLS8KF+JLyUyozEosz4otK c1KLDzHKcHAoSfDKSi0NFxIsSk1PrUjLzAEGLUxagoNHSYR3Fkiat7ggMbc4Mx0idYpRl2PBj 9trmYRY8vLzUqXEeV1BigRAijJK8+BGwCLoEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYQhVv Fk5pXAbXoFdAQT0BEfrZaAHFGSiJCSamCcMEn8Gv/JPTPZ/+48LBN69LVPT434q8Uc3z1N/9q wM3Na35Rd73X81qxFhlcnzNk4t+yReZ+4YPsdrlurJYSy1Sokr1ml7e+cvPVK14Htqy2ZcjeH tbUfe/RE88LMg2tPHZ2ulbRw/hPb1/+/fZ9iZK4ke+mdyL5wJinG80uDtxrKlcwxDPh9SomlO CPRUIu5qDgRAPywuIObAgAA X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1470438317!53031026!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62209 invoked from network); 5 Aug 2016 23:05:19 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Aug 2016 23:05:19 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u75N5CIW005230 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Aug 2016 23:05:12 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u75N5Bdw026229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Aug 2016 23:05:11 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u75N5AjF010170; Fri, 5 Aug 2016 23:05:10 GMT Received: from olila.local.net-space.pl (/10.175.255.156) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Aug 2016 16:05:09 -0700 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Sat, 6 Aug 2016 01:04:24 +0200 Message-Id: <1470438282-4226-2-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1470438282-4226-1-git-send-email-daniel.kiper@oracle.com> References: <1470438282-4226-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v4 01/19] 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 disabled. Suggested-by: Jan Beulich Signed-off-by: Daniel Kiper --- 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 0e1499d..3cdd4e8 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);