From: Tim Wiederhake <twiederh@redhat.com>
Date: Fri, 16 Apr 2021 09:41:50 +0000 (+0200)
Subject: virNetworkForwardNatDefParseXML: Use virXMLProp*
X-Git-Tag: v7.3.0-rc1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593140dabd66f01aa0d606984ff684f7cb9c1eb1;p=thirdparty%2Flibvirt.git

virNetworkForwardNatDefParseXML: Use virXMLProp*

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

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index f0f5ef6f42..17835ac8d3 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -1321,7 +1321,6 @@ virNetworkForwardNatDefParseXML(const char *networkName,
     g_autofree xmlNodePtr *natPortNodes = NULL;
     g_autofree char *addrStart = NULL;
     g_autofree char *addrEnd = NULL;
-    g_autofree char *ipv6 = NULL;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
 
     ctxt->node = node;
@@ -1333,18 +1332,9 @@ virNetworkForwardNatDefParseXML(const char *networkName,
         return -1;
     }
 
-    ipv6 = virXMLPropString(node, "ipv6");
-    if (ipv6) {
-        int natIPv6;
-        if ((natIPv6 = virTristateBoolTypeFromString(ipv6)) <= 0) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("Invalid ipv6 setting '%s' "
-                             "in network '%s' NAT"),
-                           ipv6, networkName);
-            return -1;
-        }
-        def->natIPv6 = natIPv6;
-    }
+    if (virXMLPropTristateBool(node, "ipv6", VIR_XML_PROP_OPTIONAL,
+                               &def->natIPv6) < 0)
+        return -1;
 
     /* addresses for SNAT */
     nNatAddrs = virXPathNodeSet("./address", ctxt, &natAddrNodes);