shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

Rename suspend capabilities APIs

Browse Source 
Rename virGetPMCapabilities to virNodeSuspendGetTargetMask and
virDiscoverHostPMFeature to virNodeSuspendSupportsTarget.

* src/util/util.c, src/util/util.h: Rename APIs
* src/qemu/qemu_capabilities.c, src/util/virnodesuspend.c: Adjust
  for new names
This commit is contained in:
Daniel P. Berrange 2011-11-29 14:37:42 +00:00
parent 33386276a9
commit 53c2aad88b
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -850,7 +850,7 @@ virCapsPtr qemuCapsInit(virCapsPtr old_caps)
/* Add the power management features of the host */
if (virGetPMCapabilities(&caps->host.powerMgmt) < 0) {
if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) {
VIR_WARN("Failed to get host power management capabilities");
caps->host.powerMgmt_valid = false;
} else

22
src/util/util.c
View File

@ -2623,8 +2623,8 @@ virTypedParameterArrayClear(virTypedParameterPtr params, int nparams)
}
/**
* virDiscoverHostPMFeature:
* @feature: The power management feature to check whether it is supported
* virNodeSuspendSupportsTarget:
* @target: The power management target to check whether it is supported
* by the host. Values could be:
* VIR_NODE_SUSPEND_TARGET_MEM
* VIR_NODE_SUSPEND_TARGET_DISK
@ -2632,12 +2632,12 @@ virTypedParameterArrayClear(virTypedParameterPtr params, int nparams)
* @supported: set to true if supported, false otherwise
*
* Run the script 'pm-is-supported' (from the pm-utils package)
* to find out if @feature is supported by the host.
* to find out if @target is supported by the host.
*
* Returns 0 if the query was successful, -1 on failure.
*/
int
virDiscoverHostPMFeature(unsigned int feature, bool *supported)
virNodeSuspendSupportsTarget(unsigned int target, bool *supported)
{
virCommandPtr cmd;
int status;
@ -2645,7 +2645,7 @@ virDiscoverHostPMFeature(unsigned int feature, bool *supported)
*supported = false;
switch (feature) {
switch (target) {
case VIR_NODE_SUSPEND_TARGET_MEM:
cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL);
break;
@ -2675,19 +2675,19 @@ cleanup:
}
/**
* virGetPMCapabilities:
* virNodeSuspendGetTargetMask:
*
* Get the Power Management Capabilities that the host system supports,
* such as Suspend-to-RAM (S3), Suspend-to-Disk (S4) and Hybrid-Suspend
* (a combination of S3 and S4).
*
* @bitmask: Pointer to the bitmask which will be set appropriately to
* indicate all the supported host power management features.
* indicate all the supported host power management targets.
*
* Returns 0 if the query was successful, -1 on failure.
*/
int
virGetPMCapabilities(unsigned int *bitmask)
virNodeSuspendGetTargetMask(unsigned int *bitmask)
{
int ret;
bool supported;
@ -2695,21 +2695,21 @@ virGetPMCapabilities(unsigned int *bitmask)
*bitmask = 0;
/* Check support for Suspend-to-RAM (S3) */
ret = virDiscoverHostPMFeature(VIR_NODE_SUSPEND_TARGET_MEM, &supported);
ret = virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_MEM, &supported);
if (ret < 0)
return -1;
if (supported)
*bitmask |= (1 << VIR_NODE_SUSPEND_TARGET_MEM);
/* Check support for Suspend-to-Disk (S4) */
ret = virDiscoverHostPMFeature(VIR_NODE_SUSPEND_TARGET_DISK, &supported);
ret = virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_DISK, &supported);
if (ret < 0)
return -1;
if (supported)
*bitmask |= (1 << VIR_NODE_SUSPEND_TARGET_DISK);
/* Check support for Hybrid-Suspend */
ret = virDiscoverHostPMFeature(VIR_NODE_SUSPEND_TARGET_HYBRID, &supported);
ret = virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_HYBRID, &supported);
if (ret < 0)
return -1;
if (supported)

4
src/util/util.h
View File

@ -263,7 +263,7 @@ void virTypedParameterArrayClear(virTypedParameterPtr params, int nparams);
/* Power Management Capabilities of the host system */
int virDiscoverHostPMFeature(unsigned int feature, bool *supported);
int virGetPMCapabilities(unsigned int *bitmask);
int virNodeSuspendSupportsTarget(unsigned int target, bool *supported);
int virNodeSuspendGetTargetMask(unsigned int *bitmask);
#endif /* __VIR_UTIL_H__ */

2
src/util/virnodesuspend.c
View File

@ -81,7 +81,7 @@ int virNodeSuspendInit(void)
/* Get the power management capabilities supported by the host */
hostPMFeatures = 0;
if (virGetPMCapabilities(&hostPMFeatures) < 0) {
if (virNodeSuspendGetTargetMask(&hostPMFeatures) < 0) {
if (geteuid() == 0)
VIR_ERROR(_("Failed to get host power management features"));
}