[Xen-changelog] [xen master] x86: don't apply reboot quirks if reboot set by user

[patchbot@xxxxxxx]

commit 9832f5e8e3575f8affceb2751f7422704bf7b446
Author:     Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
AuthorDate: Fri Mar 13 12:41:51 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Mar 13 12:41:51 2015 +0100

    x86: don't apply reboot quirks if reboot set by user
    
    If reboot= is specified on the command-line, don't apply reboot quirks
    to allow the command-line option to take precedence.
    
    This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI
    checks if reboot set by user").
    
    Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
    
    Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow
    reboot= overrides when running under EFI").
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/shutdown.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index d2bb24b..9ec8f97 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] 
= {
 
 static int __init reboot_init(void)
 {
+    /*
+     * Only do the DMI check if reboot_type hasn't been overridden
+     * on the command line
+     */
+    if ( reboot_type != BOOT_INVALID )
+        return 0;
+
     default_reboot_type();
     dmi_check_system(reboot_dmi_table);
     return 0;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog