From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 4 May 2021 14:02:35 +0000 (+0200)
Subject: virDomainResctrlMonDefParse: Use virXMLProp*
X-Git-Tag: v7.4.0-rc1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef4476d3abd3d4eeff3a71ad9324df072c8405f;p=thirdparty%2Flibvirt.git

virDomainResctrlMonDefParse: Use virXMLProp*

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5f5d905373..f536630d72 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18580,19 +18580,9 @@ virDomainResctrlMonDefParse(virDomainDef *def,
         }
 
         if (tag == VIR_RESCTRL_MONITOR_TYPE_CACHE) {
-            tmp = virXMLPropString(nodes[i], "level");
-            if (!tmp) {
-                virReportError(VIR_ERR_XML_ERROR, "%s",
-                               _("Missing monitor attribute 'level'"));
+            if (virXMLPropUInt(nodes[i], "level", 10, VIR_XML_PROP_REQUIRED,
+                               &level) < 0)
                 goto cleanup;
-            }
-
-            if (virStrToLong_uip(tmp, NULL, 10, &level) < 0) {
-                virReportError(VIR_ERR_XML_ERROR,
-                               _("Invalid monitor attribute 'level' value '%s'"),
-                               tmp);
-                goto cleanup;
-            }
 
             if (level != VIR_DOMAIN_RESCTRL_MONITOR_CACHELEVEL) {
                 virReportError(VIR_ERR_XML_ERROR,
@@ -18600,8 +18590,6 @@ virDomainResctrlMonDefParse(virDomainDef *def,
                                level);
                 goto cleanup;
             }
-
-            VIR_FREE(tmp);
         }
 
         if (virDomainResctrlParseVcpus(def, nodes[i], &domresmon->vcpus) < 0)