From ae5e55289dc3adb793eeede2bd407aeeb1877563 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 29 Nov 2011 14:14:03 +0000 Subject: [PATCH] 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 --- 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 c1bc2f58e1..dc9693eb37 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -29,9 +29,9 @@ BIOS you will see

... </cpu> <power_management> - <S3/> - <S4/> - <Hybrid-Suspend/> + <suspend_mem/> + <suspend_disk/> + <suspend_hybrid/> <power_management/> </host> diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 6cf21885ae..3af95e92b1 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -112,17 +112,17 @@ - + - + - + diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a2ca46b33e..ecb1dcd8fe 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: