[libvirt] [PATCH 03/14] Fix capabilities XML to use generic terms for suspend targets

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; 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 'syspend_hybrid' * docs/formatcaps.html.in, docs/schemas/capability.rng, src/conf/capabilities.c: Rename suspend constants --- docs/formatcaps.html.in | 6 +++--- docs/schemas/capability.rng | 6 +++--- src/conf/capabilities.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index c1bc2f5..8792533 100644 --- 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 6cf2188..3af95e9 100644 --- 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 a2ca46b..ecb1dcd 100644 --- 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: -- 1.7.6.4