From 5832c73a8253ea86d3a985c868e586a4dc9936a2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 15 Sep 2022 17:23:23 +0200 Subject: [PATCH] virDomainNetDefParseXML: Use virXMLPropEnumDefault for parsing 'def->type' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replace ad-hoc logic that fills the default by use of the proper helper function. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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; -- 2.47.2