From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 21 Apr 2021 13:33:30 +0000 (+0200)
Subject: virDomainVideoResolutionDefParseXML: Use virXMLProp*
X-Git-Tag: v7.3.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16e3e8b79b66575f2c660c4fe570c2e1ee5521f;p=thirdparty%2Flibvirt.git

virDomainVideoResolutionDefParseXML: Use virXMLProp*

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index afb352ce60..7fbb354fe1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14931,31 +14931,14 @@ static virDomainVideoResolutionDef *
 virDomainVideoResolutionDefParseXML(xmlNodePtr node)
 {
     g_autofree virDomainVideoResolutionDef *def = NULL;
-    g_autofree char *x = NULL;
-    g_autofree char *y = NULL;
-
-    x = virXMLPropString(node, "x");
-    y = virXMLPropString(node, "y");
-
-    if (!x || !y) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("missing values for resolution"));
-        return NULL;
-    }
 
     def = g_new0(virDomainVideoResolutionDef, 1);
 
-    if (virStrToLong_uip(x, NULL, 10, &def->x) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("cannot parse video x-resolution '%s'"), x);
+    if (virXMLPropUInt(node, "x", 10, VIR_XML_PROP_REQUIRED, &def->x) < 0)
         return NULL;
-    }
 
-    if (virStrToLong_uip(y, NULL, 10, &def->y) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("cannot parse video y-resolution '%s'"), y);
+    if (virXMLPropUInt(node, "y", 10, VIR_XML_PROP_REQUIRED, &def->y) < 0)
         return NULL;
-    }
 
     return g_steal_pointer(&def);
 }