External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fix capabilities XML to use generic terms for suspend targets

Browse Source 
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
This commit is contained in:
Daniel P. Berrange 2011-11-29 14:14:03 +00:00
parent 6fb5400fc6
commit ae5e55289d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/formatcaps.html.in
View File

@ -29,9 +29,9 @@ BIOS you will see</p>
... ...
&lt;/cpu&gt; &lt;/cpu&gt;
&lt;power_management&gt; &lt;power_management&gt;
&lt;S3/&gt; &lt;suspend_mem/&gt;
&lt;S4/&gt; &lt;suspend_disk/&gt;
&lt;Hybrid-Suspend/&gt; &lt;suspend_hybrid/&gt;
&lt;power_management/&gt; &lt;power_management/&gt;
&lt;/host&gt;</span> &lt;/host&gt;</span>

6
docs/schemas/capability.rng
View File

@ -112,17 +112,17 @@
<element name='power_management'> <element name='power_management'>
<interleave> <interleave>
<optional> <optional>
<element name='S3'> <element name='suspend_mem'>
<empty/> <empty/>
</element> </element>
</optional> </optional>
<optional> <optional>
<element name='S4'> <element name='suspend_disk'>
<empty/> <empty/>
</element> </element>
</optional> </optional>
<optional> <optional>
<element name='Hybrid-Suspend'> <element name='suspend_hybrid'>
<empty/> <empty/>
</element> </element>
</optional> </optional>

2
src/conf/capabilities.c
View File

@ -37,7 +37,7 @@
#define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define VIR_FROM_THIS VIR_FROM_CAPABILITIES
VIR_ENUM_IMPL(virHostPMCapability, VIR_NODE_SUSPEND_TARGET_LAST, VIR_ENUM_IMPL(virHostPMCapability, VIR_NODE_SUSPEND_TARGET_LAST,
"S3", "S4", "Hybrid-Suspend") "suspend_mem", "suspend_disk", "suspend_hybrid");
/** /**
* virCapabilitiesNew: * virCapabilitiesNew: