Remove VM_power_state value ShuttingDown. This should be indicated with

an in-progress task, when known.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/docs/xen-api/xenapi-datamodel.tex b/docs/xen-api/xenapi-datamodel.tex
index 3868c1fecd090dcc11edd4741d98274b4021ff3d..739d270244d01ec2adf001a47fc1053c82b75890 100644 (file)
--- a/docs/xen-api/xenapi-datamodel.tex
+++ b/docs/xen-api/xenapi-datamodel.tex
@@ -142,7 +142,6 @@ The following enumeration types are used:
 \hspace{0.5cm}{\tt Paused} & Paused \\
 \hspace{0.5cm}{\tt Running} & Running \\
 \hspace{0.5cm}{\tt Suspended} & Suspended \\
-\hspace{0.5cm}{\tt ShuttingDown} & Shutting Down \\
 \hspace{0.5cm}{\tt Unknown} & Some other unknown state \\
 \hline
 \end{longtable}

diff --git a/tools/libxen/include/xen_vm_power_state.h b/tools/libxen/include/xen_vm_power_state.h
index 3e805ed67152f45339e99c2cf97828db9cde67bd..c5404b89cfec691b651fb16efb398a76ad6aa27f 100644 (file)
--- a/tools/libxen/include/xen_vm_power_state.h
+++ b/tools/libxen/include/xen_vm_power_state.h
@@ -45,11 +45,6 @@ enum xen_vm_power_state
      */
     XEN_VM_POWER_STATE_SUSPENDED,
 
-    /**
-     * Shutting Down
-     */
-    XEN_VM_POWER_STATE_SHUTTINGDOWN,
-
     /**
      * Some other unknown state
      */

diff --git a/tools/libxen/src/xen_vm_power_state.c b/tools/libxen/src/xen_vm_power_state.c
index a9e2545c47c4949ea9ca4a92dbb1c57b269aab39..9f96f34f9b66810648c9f0b0edf9e6ca8b0385a9 100644 (file)
--- a/tools/libxen/src/xen_vm_power_state.c
+++ b/tools/libxen/src/xen_vm_power_state.c
@@ -32,7 +32,6 @@ static const char *lookup_table[] =
     "Paused",
     "Running",
     "Suspended",
-    "ShuttingDown",
     "Unknown"
 };
 

diff --git a/tools/python/xen/xend/XendAPIConstants.py b/tools/python/xen/xend/XendAPIConstants.py
index 68a29bb1071739a3513517fb980033ecd5bf2955..41e212d495ecc52d3074a733cb6b67142918953b 100644 (file)
--- a/tools/python/xen/xend/XendAPIConstants.py
+++ b/tools/python/xen/xend/XendAPIConstants.py
@@ -24,7 +24,7 @@ XEN_API_VM_POWER_STATE = [
     'Paused',
     'Running',
     'Suspended',
-    'ShuttingDown',
+    'Halted',
     'Unknown'
 ]