[Xen-changelog] [xen master] x86/NMI: allow passing just "watchdog" again

[patchbot@xxxxxxx]

commit fd553ae5f0f57baa63d033bedee84f607de57d33
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Sep 3 15:09:59 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Sep 3 15:09:59 2014 +0200

    x86/NMI: allow passing just "watchdog" again
    
    This capability got inadvertently lost in commit 3ea2ba980a ("x86/NMI:
    allow processing unknown NMIs when watchdog is enabled") due to an
    oversight of mine.
    
    Reported-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/nmi.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 055f4ef..f8f5e4a 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -49,6 +49,12 @@ bool_t watchdog_force = 0;
 
 static void __init parse_watchdog(char *s)
 {
+    if ( !*s )
+    {
+        opt_watchdog = 1;
+        return;
+    }
+
     switch ( parse_bool(s) )
     {
     case 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