bitkeeper revision 1.1083 (40f54b0a40pzYjUMzMokIXYQ7fyBgA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

linux-2.4.26-xen-sparse/arch/xen/kernel/process.c

@@ -125,14 +125,7 @@ void machine_restart(char *__unused)
 
 void machine_halt(void)
 {
-    /* We really want to get pending console data out before we die. */
-    extern void xencons_force_flush(void);
-    xencons_force_flush();
-    for ( ; ; ) /* loop without wasting cpu cycles */
-    {
-        HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_pending = 0;
-        HYPERVISOR_block();
-    }
+    machine_power_off();
 }
 
 void machine_power_off(void)

tools/examples/init.d/xend

@@ -7,7 +7,7 @@
 # chkconfig: 2345 99 00
 # description: Starts and stops the Xen control daemon.
 
-. /etc/init.d/functions || . /etc/init.d/functions.sh
+[ -f /etc/init.d/functions ] && . /etc/init.d/functions || . /etc/init.d/functions.sh
 
 case "$1" in
   start)

xen/arch/x86/domain.c

@@ -199,12 +199,7 @@ void machine_restart(char * __unused)
 
 void machine_halt(void)
 {
-    machine_restart(0);
-}
-
-void machine_power_off(void)
-{
-    machine_restart(0);
+    while(1){ safe_halt(); }
 }
 
 void arch_do_createdomain(struct domain *d)

xen/common/domain.c

@@ -170,8 +170,18 @@ void domain_shutdown(u8 reason)
     if ( current->domain == 0 )
     {
         extern void machine_restart(char *);
-        printk("Domain 0 shutdown: rebooting machine!\n");
-        machine_restart(0);
+        extern void machine_halt(void);
+
+        if ( reason == 0 ) 
+        {
+            printk("Domain 0 halted: Our work here is done.\n");
+            machine_halt();
+        }
+        else
+        {
+            printk("Domain 0 shutdown: rebooting machine!\n");
+            machine_restart(0);
+        }
     }
 
     current->shutdown_code = reason;