[Xen-changelog] [xen-unstable] [IA64] fix noreboot option

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID f74c9368f6ff7ac95fba5798411a844b297585db
# Parent  8c4c5e1bf58a0440441df522accae24cf4d52795
[IA64] fix noreboot option

fix machine_hlt to support noreboot option.

Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>
[modified to use existing cpu_halt() function in linux-xen files]
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/linux-xen/process-linux-xen.c |    2 ++
 xen/arch/ia64/xen/domain.c                  |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff -r 8c4c5e1bf58a -r f74c9368f6ff xen/arch/ia64/linux-xen/process-linux-xen.c
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c       Mon Aug 28 13:31:35 
2006 -0600
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c       Mon Aug 28 14:09:31 
2006 -0600
@@ -810,6 +810,7 @@ get_wchan (struct task_struct *p)
        } while (count++ < 16);
        return 0;
 }
+#endif // !XEN
 
 void
 cpu_halt (void)
@@ -834,6 +835,7 @@ cpu_halt (void)
                ia64_pal_halt(min_power_state);
 }
 
+#ifndef XEN
 void
 machine_restart (char *restart_cmd)
 {
diff -r 8c4c5e1bf58a -r f74c9368f6ff xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Mon Aug 28 13:31:35 2006 -0600
+++ b/xen/arch/ia64/xen/domain.c        Mon Aug 28 14:09:31 2006 -0600
@@ -1123,13 +1123,15 @@ void machine_restart(char * __unused)
        while(1);
 }
 
+extern void cpu_halt(void);
+
 void machine_halt(void)
 {
        console_start_sync();
        if (running_on_sim)
                printf ("machine_halt called.  spinning...\n");
        else
-               (*efi.reset_system)(EFI_RESET_SHUTDOWN,0,0,NULL);
+               cpu_halt();
        while(1);
 }
 

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