ia64/xen-unstable

changeset 4125:e29a885e4d0b

bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg)

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@scramble.cl.cam.ac.uk
date Sun Mar 13 09:42:55 2005 +0000 (2005-03-13)
parents d4fa637dbd23
children abb49ca4cc51 5badd947172d
files xen/common/domain.c xen/include/public/io/domain_controller.h
line diff
     1.1 --- a/xen/common/domain.c	Sun Mar 13 09:39:14 2005 +0000
     1.2 +++ b/xen/common/domain.c	Sun Mar 13 09:42:55 2005 +0000
     1.3 @@ -172,7 +172,7 @@ void domain_shutdown(u8 reason)
     1.4  
     1.5          debugger_trap_immediate();
     1.6  
     1.7 -        if ( reason == 0 ) 
     1.8 +        if ( reason == SHUTDOWN_poweroff ) 
     1.9          {
    1.10              printk("Domain 0 halted: halting machine.\n");
    1.11              machine_halt();
    1.12 @@ -184,6 +184,12 @@ void domain_shutdown(u8 reason)
    1.13          }
    1.14      }
    1.15  
    1.16 +    if ( reason == SHUTDOWN_crash )
    1.17 +    {
    1.18 +        domain_crash();
    1.19 +        BUG();
    1.20 +    }
    1.21 +
    1.22      d->shutdown_code = reason;
    1.23      set_bit(DF_SHUTDOWN, &d->d_flags);
    1.24  
     2.1 --- a/xen/include/public/io/domain_controller.h	Sun Mar 13 09:39:14 2005 +0000
     2.2 +++ b/xen/include/public/io/domain_controller.h	Sun Mar 13 09:42:55 2005 +0000
     2.3 @@ -13,16 +13,6 @@
     2.4  #include "ring.h"
     2.5  
     2.6  /*
     2.7 - * Reason codes for SCHEDOP_shutdown. These are opaque to Xen but may be
     2.8 - * interpreted by control software to determine the appropriate action. These 
     2.9 - * are only really advisories: the controller can actually do as it likes.
    2.10 - */
    2.11 -#define SHUTDOWN_poweroff   0  /* Domain exited normally. Clean up and kill. */
    2.12 -#define SHUTDOWN_reboot     1  /* Clean up, kill, and then restart.          */
    2.13 -#define SHUTDOWN_suspend    2  /* Clean up, save suspend info, kill.         */
    2.14 -
    2.15 -
    2.16 -/*
    2.17   * CONTROLLER MESSAGING INTERFACE.
    2.18   */
    2.19