diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-08-07 15:35:06 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-08-07 15:35:06 +0100 |
| commit | 9ee1bd77bfc225d638c8df106238f875025b5e8f (patch) | |
| tree | 1c3f2a8d2f3358fa195d43390e0d9f6cc41c3bb3 /xen/arch/x86/shutdown.c | |
| parent | 3923c6638e50c51781fb5f6f29729c71336eb95a (diff) | |
| download | xen-9ee1bd77bfc225d638c8df106238f875025b5e8f.tar.gz xen-9ee1bd77bfc225d638c8df106238f875025b5e8f.tar.bz2 xen-9ee1bd77bfc225d638c8df106238f875025b5e8f.zip | |
[XEN] Clean up shutdown handling and ignore opt_noreboot if dom0
shuts down cleanly. The option is intended only to retain information
on the local console in case of a crash.
Based on a patch from Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/shutdown.c')
| -rw-r--r-- | xen/arch/x86/shutdown.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 4f59b2c983..76dbcca5d2 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -11,19 +11,16 @@ #include <xen/smp.h> #include <xen/delay.h> #include <xen/dmi.h> +#include <xen/irq.h> +#include <xen/console.h> +#include <xen/shutdown.h> +#include <asm/msr.h> #include <asm/regs.h> #include <asm/mc146818rtc.h> #include <asm/system.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/mpspec.h> -#include <xen/irq.h> -#include <xen/console.h> -#include <asm/msr.h> - -/* opt_noreboot: If true, machine will need manual reset on error. */ -static int opt_noreboot = 0; -boolean_param("noreboot", opt_noreboot); /* reboot_str: comma-separated list of reboot options. */ static char __initdata reboot_str[10] = ""; @@ -204,12 +201,6 @@ void machine_restart(char * __unused) { int i; - if ( opt_noreboot ) - { - printk("Reboot disabled on cmdline: require manual reset\n"); - machine_halt(); - } - watchdog_disable(); console_start_sync(); |