bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg)

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/domain.c b/xen/common/domain.c
index d906251b020ff5adbf6715bf2587121e82d94706..f20c2f6b102612a825b32d50ec855f9baa87af60 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -172,7 +172,7 @@ void domain_shutdown(u8 reason)
 
         debugger_trap_immediate();
 
-        if ( reason == 0 ) 
+        if ( reason == SHUTDOWN_poweroff ) 
         {
             printk("Domain 0 halted: halting machine.\n");
             machine_halt();
@@ -184,6 +184,12 @@ void domain_shutdown(u8 reason)
         }
     }
 
+    if ( reason == SHUTDOWN_crash )
+    {
+        domain_crash();
+        BUG();
+    }
+
     d->shutdown_code = reason;
     set_bit(DF_SHUTDOWN, &d->d_flags);
 

diff --git a/xen/include/public/io/domain_controller.h b/xen/include/public/io/domain_controller.h
index b3220eee1c41c374622221a231773e0361beae2c..ec9c1a642da26fb72496021aaa2f94697b876f11 100644 (file)
--- a/xen/include/public/io/domain_controller.h
+++ b/xen/include/public/io/domain_controller.h
@@ -12,16 +12,6 @@
 
 #include "ring.h"
 
-/*
- * Reason codes for SCHEDOP_shutdown. These are opaque to Xen but may be
- * interpreted by control software to determine the appropriate action. These 
- * are only really advisories: the controller can actually do as it likes.
- */
-#define SHUTDOWN_poweroff   0  /* Domain exited normally. Clean up and kill. */
-#define SHUTDOWN_reboot     1  /* Clean up, kill, and then restart.          */
-#define SHUTDOWN_suspend    2  /* Clean up, save suspend info, kill.         */
-
-
 /*
  * CONTROLLER MESSAGING INTERFACE.
  */