[libvirt PATCH 06/10] virDomainSchedulerParseCommonAttrs: Use virXMLProp*
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d7cef00246..8f4fd0e3bc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18054,37 +18054,15 @@ virDomainSchedulerParseCommonAttrs(xmlNodePtr node,
virProcessSchedPolicy *policy,
int *priority)
{
- int pol = 0;
- g_autofree char *tmp = NULL;
-
- if (!(tmp = virXMLPropString(node, "scheduler"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Missing scheduler attribute"));
- return -1;
- }
-
- if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Invalid scheduler attribute: '%s'"), tmp);
+ if (virXMLPropEnum(node, "scheduler", virProcessSchedPolicyTypeFromString,
+ VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+ policy) < 0)
return -1;
- }
- *policy = pol;
- VIR_FREE(tmp);
-
- if (pol == VIR_PROC_POLICY_FIFO ||
- pol == VIR_PROC_POLICY_RR) {
- if (!(tmp = virXMLPropString(node, "priority"))) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("Missing scheduler priority"));
- return -1;
- }
-
- if (virStrToLong_i(tmp, NULL, 10, priority) < 0) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("Invalid value for element priority"));
+ if (*policy == VIR_PROC_POLICY_FIFO || *policy == VIR_PROC_POLICY_RR) {
+ if (virXMLPropInt(node, "priority", 10, VIR_XML_PROP_REQUIRED,
+ priority) < 0)
return -1;
- }
}
return 0;
--
2.26.3