提交 6ea25cd9 编写于 作者: D Daniel P. Berrange

Move the virHostPMCapability enum helpers into capabilities.c

The virHostPMCapability enum helper was declared in util.h
but implemented in capabilities.c, which is in a completely
separate library at link time. Move the declaration into the
capabilities.c file and rename it to match normal conventions

* src/util/util.h: Remove virHostPMCapability enum decl
* src/conf/capabilities.c: Add virCapsHostPMTarget enum
上级 ae5e5528
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
#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_DECL(virCapsHostPMTarget)
VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST,
"suspend_mem", "suspend_disk", "suspend_hybrid"); "suspend_mem", "suspend_disk", "suspend_hybrid");
/** /**
...@@ -704,7 +705,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) ...@@ -704,7 +705,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
while (pm) { while (pm) {
int bit = ffs(pm) - 1; int bit = ffs(pm) - 1;
virBufferAsprintf(&xml, " <%s/>\n", virBufferAsprintf(&xml, " <%s/>\n",
virHostPMCapabilityTypeToString(bit)); virCapsHostPMTargetTypeToString(bit));
pm &= ~(1U << bit); pm &= ~(1U << bit);
} }
virBufferAddLit(&xml, " </power_management>\n"); virBufferAddLit(&xml, " </power_management>\n");
......
...@@ -263,8 +263,6 @@ void virTypedParameterArrayClear(virTypedParameterPtr params, int nparams); ...@@ -263,8 +263,6 @@ void virTypedParameterArrayClear(virTypedParameterPtr params, int nparams);
/* Power Management Capabilities of the host system */ /* Power Management Capabilities of the host system */
VIR_ENUM_DECL(virHostPMCapability)
int virDiscoverHostPMFeature(unsigned int *bitmask, unsigned int feature); int virDiscoverHostPMFeature(unsigned int *bitmask, unsigned int feature);
int virGetPMCapabilities(unsigned int *bitmask); int virGetPMCapabilities(unsigned int *bitmask);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册