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

virDomainVirtioOptionsParseXML: 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 f30c1b9e5d..87384c52b5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1603,45 +1603,22 @@ static int
 virDomainVirtioOptionsParseXML(xmlNodePtr driver,
                                virDomainVirtioOptions **virtio)
 {
-    int val;
-    virDomainVirtioOptions *res;
-    g_autofree char *str = NULL;
-
     if (*virtio || !driver)
         return 0;
 
     *virtio = g_new0(virDomainVirtioOptions, 1);
 
-    res = *virtio;
-
-    if ((str = virXMLPropString(driver, "iommu"))) {
-        if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("invalid iommu value"));
-            return -1;
-        }
-        res->iommu = val;
-    }
-    VIR_FREE(str);
+    if (virXMLPropTristateSwitch(driver, "iommu", VIR_XML_PROP_NONE,
+                                 &(*virtio)->iommu) < 0)
+        return -1;
 
-    if ((str = virXMLPropString(driver, "ats"))) {
-        if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("invalid ats value"));
-            return -1;
-        }
-        res->ats = val;
-    }
-    VIR_FREE(str);
+    if (virXMLPropTristateSwitch(driver, "ats", VIR_XML_PROP_NONE,
+                                 &(*virtio)->ats) < 0)
+        return -1;
 
-    if ((str = virXMLPropString(driver, "packed"))) {
-        if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("invalid packed value"));
-            return -1;
-        }
-        res->packed = val;
-    }
+    if (virXMLPropTristateSwitch(driver, "packed", VIR_XML_PROP_NONE,
+                                 &(*virtio)->packed) < 0)
+        return -1;
 
     return 0;
 }