diff mbox

[v11,03/13] x86: allow EFI reboot method neither on EFI platforms...

Message ID 1480976718-12198-4-git-send-email-daniel.kiper@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Kiper Dec. 5, 2016, 10:25 p.m. UTC 
..nor EFI platforms with runtime services enabled.

Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
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(+)

Comments

Jan Beulich Dec. 7, 2016, 1:18 p.m. UTC | #1 
>>> On 05.12.16 at 23:25, <daniel.kiper@oracle.com> wrote:
> ..nor EFI platforms with runtime services enabled.

Btw, was the title meant to read "... neither on non-EFI platforms ..."?

Jan
Daniel Kiper Dec. 7, 2016, 5:25 p.m. UTC | #2 
On Wed, Dec 07, 2016 at 06:18:19AM -0700, Jan Beulich wrote:
> >>> On 05.12.16 at 23:25, <daniel.kiper@oracle.com> wrote:
> > ..nor EFI platforms with runtime services enabled.
>
> Btw, was the title meant to read "... neither on non-EFI platforms ..."?

Right, thanks for pointing this out.

Daniel
Douglas Goldstein Jan. 10, 2017, 1:24 a.m. UTC | #3 
On 12/7/16 7:18 AM, Jan Beulich wrote:
>>>> On 05.12.16 at 23:25, <daniel.kiper@oracle.com> wrote:
>> ..nor EFI platforms with runtime services enabled.
> 
> Btw, was the title meant to read "... neither on non-EFI platforms ..."?
> 
> Jan
> 

Could we reduce the amount of negatives?

"disallow EFI reboot method on EFI platforms without runtime services"
Jan Beulich Jan. 10, 2017, 8:21 a.m. UTC | #4 
>>> On 10.01.17 at 02:24, <cardoe@cardoe.com> wrote:
> On 12/7/16 7:18 AM, Jan Beulich wrote:
>>>>> On 05.12.16 at 23:25, <daniel.kiper@oracle.com> wrote:
>>> ..nor EFI platforms with runtime services enabled.
>> 
>> Btw, was the title meant to read "... neither on non-EFI platforms ..."?
> 
> Could we reduce the amount of negatives?
> 
> "disallow EFI reboot method on EFI platforms without runtime services"

Well, you're a little late to the party - the patch did go in a month ago.

Jan
diff mbox

Patch

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);