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

virDomainDeviceISAAddressParseXML: 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 878f489665..1f68ac4dc5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6509,27 +6509,14 @@ static int
 virDomainDeviceISAAddressParseXML(xmlNodePtr node,
                                   virDomainDeviceISAAddress *addr)
 {
-    g_autofree char *iobase = NULL;
-    g_autofree char *irq = NULL;
-
     memset(addr, 0, sizeof(*addr));
 
-    iobase = virXMLPropString(node, "iobase");
-    irq = virXMLPropString(node, "irq");
-
-    if (iobase &&
-        virStrToLong_uip(iobase, NULL, 16, &addr->iobase) < 0) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("Cannot parse <address> 'iobase' attribute"));
+    if (virXMLPropUInt(node, "iobase", 16, VIR_XML_PROP_NONE,
+                       &addr->iobase) < 0)
         return -1;
-    }
 
-    if (irq &&
-        virStrToLong_uip(irq, NULL, 16, &addr->irq) < 0) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("Cannot parse <address> 'irq' attribute"));
+    if (virXMLPropUInt(node, "irq", 16, VIR_XML_PROP_NONE, &addr->irq) < 0)
         return -1;
-    }
 
     return 0;
 }