Fix capabilities XML to use generic terms for suspend targets

The capabilities XML uses the x86 specific terms 'S3', 'S4'
and 'Hybrid-Syspend'. Switch it to use the same terminology
as the API constants and virsh options, eg 'suspend_mem'
'suspend_disk' and 'suspend_hybrid'

* docs/formatcaps.html.in, docs/schemas/capability.rng,
  src/conf/capabilities.c: Rename suspend constants

diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
index c1bc2f58e166d2d6b464dce4fab72d8dad915807..dc9693eb37468dc313c799a343a5ae362cedcdae 100644 (file)
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -29,9 +29,9 @@ BIOS you will see</p>
       ...
     &lt;/cpu&gt;
     &lt;power_management&gt;
-      &lt;S3/&gt;
-      &lt;S4/&gt;
-      &lt;Hybrid-Suspend/&gt;
+      &lt;suspend_mem/&gt;
+      &lt;suspend_disk/&gt;
+      &lt;suspend_hybrid/&gt;
     &lt;power_management/&gt;
   &lt;/host&gt;</span>
 

diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 6cf21885aecbb7c4b5ea46f35e9b927b5f90033b..3af95e92b1877b4111db326b3bdac39b37b82a8e 100644 (file)
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -112,17 +112,17 @@
     <element name='power_management'>
       <interleave>
         <optional>
-          <element name='S3'>
+          <element name='suspend_mem'>
             <empty/>
           </element>
         </optional>
         <optional>
-          <element name='S4'>
+          <element name='suspend_disk'>
             <empty/>
           </element>
         </optional>
         <optional>
-          <element name='Hybrid-Suspend'>
+          <element name='suspend_hybrid'>
             <empty/>
           </element>
         </optional>

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index a2ca46b33e45aef21edb5f18a54c6bcd8cc59012..ecb1dcd8fe78706ab29a5f911d67e8cf49d9c68f 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -37,7 +37,7 @@
 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES
 
 VIR_ENUM_IMPL(virHostPMCapability, VIR_NODE_SUSPEND_TARGET_LAST,
-              "S3", "S4", "Hybrid-Suspend")
+              "suspend_mem", "suspend_disk", "suspend_hybrid");
 
 /**
  * virCapabilitiesNew: