From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 15 Sep 2022 15:23:23 +0000 (+0200)
Subject: virDomainNetDefParseXML: Use virXMLPropEnumDefault for parsing 'def->type'
X-Git-Tag: v8.9.0-rc1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5832c73a8253ea86d3a985c868e586a4dc9936a2;p=thirdparty%2Flibvirt.git

virDomainNetDefParseXML: Use virXMLPropEnumDefault for parsing 'def->type'

Replace ad-hoc logic that fills the default by use of the proper helper
function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index df0582be47..574d962a55 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9002,13 +9002,10 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
 
     ctxt->node = node;
 
-    if ((rv = virXMLPropEnum(node, "type", virDomainNetTypeFromString,
-                             VIR_XML_PROP_NONE, &def->type)) < 0)
+    if (virXMLPropEnumDefault(node, "type", virDomainNetTypeFromString,
+                              VIR_XML_PROP_NONE, &def->type, VIR_DOMAIN_NET_TYPE_USER) < 0)
         return NULL;
 
-    if (rv == 0)
-        def->type = VIR_DOMAIN_NET_TYPE_USER;
-
     if (virXMLPropTristateBool(node, "trustGuestRxFilters", VIR_XML_PROP_NONE,
                                &def->trustGuestRxFilters) < 0)
         return NULL;