add a rebooting state so that it can be reported and/or acted on.

diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index 99cf255a0f72b3c4b249ac189e87d54c0523f912..30a30572ed9dbe4f32fcd406e9ddcfa143e607e8 100644 (file)
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -394,7 +394,13 @@ let shutdown_vm xc xs xal state force reason =
                              reason_str xalreason_str;
                        raise (Vm_shutdown_wrong_reason (reason, xalreason))
                );
-               change_vmstate state (if reason = Domain.Suspend then VmSuspended else VmShutdown);
+               let newstatus =
+                       match reason with
+                       | Domain.Suspend -> VmSuspended
+                       | Domain.Reboot  -> VmRebooting
+                       | _              -> VmShutdown
+                       in
+               change_vmstate state newstatus;
                info "vm has shutdowned";
        ) (fun () -> state.vm_expect_shutdown <- false)
 

diff --git a/xenvm/vmstate.ml b/xenvm/vmstate.ml
index 94aef385b3314da1282ee70e7c990f00e1c4e18f..9af2ca71f2dd9573ccd8326bdff3eec622d11ea9 100644 (file)
--- a/xenvm/vmstate.ml
+++ b/xenvm/vmstate.ml
@@ -20,6 +20,7 @@ open Vmconfig
 type vmlifestate =
        | VmCreated
        | VmShutdown | VmShutdowning
+       | VmRebooting
        | VmPaused | VmSuspending | VmSuspended | VmRestoring
        | VmRunning
 
@@ -28,6 +29,7 @@ let string_of_vmlifestate state =
        | VmCreated -> "created"
        | VmShutdown -> "shutdown"
        | VmShutdowning -> "shutdowning"
+       | VmRebooting -> "rebooting"
        | VmPaused -> "paused"
        | VmSuspending -> "suspending" | VmSuspended -> "suspended"
        | VmRestoring -> "restoring"