From patchwork Wed Nov 30 13:04:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9454321 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 A889D60756 for ; Wed, 30 Nov 2016 13:08:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EF4528409 for ; Wed, 30 Nov 2016 13:08:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93D8928416; Wed, 30 Nov 2016 13:08:22 +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 4B95C28417 for ; Wed, 30 Nov 2016 13:08:22 +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 1cC4aL-0003qG-SC; Wed, 30 Nov 2016 13:06:05 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cC4aK-0003pP-Ev for xen-devel@lists.xenproject.org; Wed, 30 Nov 2016 13:06:04 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 4D/C6-28971-BBECE385; Wed, 30 Nov 2016 13:06:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeJIrShJLcpLzFFi42LpnVTnqrv7nF2 EwaxGCYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPBnR3sBTPZK1at/s3SwPiGtYuRi0NIYCKT xLHOwywQzl9GiRcv3jFCOBsZJY4uvABUxglSxiix6psYiM0moCNx8ctDdhBbREBJ4t6qyUwgD cwCM5kkTt85yQKSEBYIlnh45hxYM4uAqsTiG3MZQWxeAXeJ5uMNbCC2hICiRPezCWA2p4CHxN MJd9khlrlLfFt6iRmixlDi9MNtjBMY+RYwMqxi1ChOLSpLLdI1MtdLKspMzyjJTczM0TU0MNP LTS0uTkxPzUlMKtZLzs/dxAgMFgYg2MG4eG3gIUZJDiYlUV6+TrsIIb6k/JTKjMTijPii0pzU 4kOMMhwcShK8T88C5QSLUtNTK9Iyc4BhC5OW4OBREuEtAEnzFhck5hZnpkOkTjHqcrzb/O4Bk xBLXn5eqpQ4712QIgGQoozSPLgRsBi6xCgrJczLCHSUEE9BalFuZgmq/CtGcQ5GJWHeHpApPJ l5JXCbXgEdwQR0xNvX1iBHlCQipKQaGDOilxx7nKn5JKQ1T1pr2YHVu62YslzlFlboBm3TfCp 6a3HIL47Cc9MO8/5Z/ir+ppQlh/8V6R1/9JQy4o8kczbGTNvip64uc7b3V+vlKW5r0svF31+R bJuX9dCW79yp6OVPZBjfRBd6CM5b+Kn/ZZeeboaT+gp1tRrdwve2YkZLJvv19a/IU2Ipzkg01 GIuKk4EAGMFuWGcAgAA X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1480511161!64585590!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: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43706 invoked from network); 30 Nov 2016 13:06:03 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Nov 2016 13:06:03 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uAUD5CRo022053 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Nov 2016 13:05:13 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id uAUD5C1J026857 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Nov 2016 13:05:12 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uAUD5BE0009989; Wed, 30 Nov 2016 13:05:11 GMT Received: from olila.local.net-space.pl (/10.175.217.205) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Nov 2016 05:05:11 -0800 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Wed, 30 Nov 2016 14:04:09 +0100 Message-Id: <1480511059-14062-4-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1480511059-14062-1-git-send-email-daniel.kiper@oracle.com> References: <1480511059-14062-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] 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, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v10 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 7a1a73a..55f6840 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);