Message ID | 1470438282-4226-2-git-send-email-daniel.kiper@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
>>> On 06.08.16 at 01:04, <daniel.kiper@oracle.com> wrote: > ..nor EFI platforms with runtime services disabled. DYM non-EFI in the subject part of the sentence? > --- 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; This being patch 1 in the series, but efi_enabled() and EFI_RS getting introduced only later, how is this supposed to build? Jan
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);
..nor EFI platforms with runtime services disabled. Suggested-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> --- xen/arch/x86/shutdown.c | 3 +++ 1 file changed, 3 insertions(+)