[Xen-changelog] [xen-4.0-testing] x86: restore handling of "reboot=no"

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1284535336 -3600
# Node ID 84510e00ebd1e3bc0a5d7b2f0d996d41e49e17ff
# Parent  0ed0ab304bd03164849c9abc75c781e31926ec59
x86: restore handling of "reboot=no"

Somewhere between 3.2 and 3.3 this got dropped (as I noticed on a
[rarely used] box that didn't crash on me since then).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
xen-unstable changeset:   22158:869a0fdf8686
xen-unstable date:        Wed Sep 15 07:48:27 2010 +0100
---
 xen/arch/x86/shutdown.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -r 0ed0ab304bd0 -r 84510e00ebd1 xen/arch/x86/shutdown.c
--- a/xen/arch/x86/shutdown.c   Wed Sep 15 08:21:42 2010 +0100
+++ b/xen/arch/x86/shutdown.c   Wed Sep 15 08:22:16 2010 +0100
@@ -35,7 +35,7 @@ static int reboot_mode;
 static int reboot_mode;
 
 /*
- * reboot=b[ios] | t[riple] | k[bd] | [, [w]arm | [c]old]
+ * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]
  * warm   Don't set the cold reboot flag
  * cold   Set the cold reboot flag
  * bios   Reboot by jumping through the BIOS (only for X86_32)
@@ -50,6 +50,9 @@ static void __init set_reboot_type(char 
     {
         switch ( *str )
         {
+        case 'n': /* no reboot */
+            opt_noreboot = 1;
+            break;
         case 'w': /* "warm" reboot (no memory testing etc) */
             reboot_mode = 0x1234;
             break;

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