On 11/29/2011 08:44 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
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'
s/syspend/suspend/
* 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> ... </cpu> <power_management> - <S3/> - <S4/> - <Hybrid-Suspend/> + <suspend-mem/> + <suspend-disk/> + <suspend-hybrid/> <power_management/>
3 typos - per the .rng, this should be suspend_mem, not suspend-mem, and so forth for the other '-'.
+++ 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");
ACK with nit fixed. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org