From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 2 Nov 2022 13:42:51 +0000 (+0100)
Subject: conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL
X-Git-Tag: v8.10.0-rc1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7a33b48f9272c9f5efc0771d1e7b3d862210d6;p=thirdparty%2Flibvirt.git

conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

Trying to parse <driver> node which does not exist makes no sense.

Signed-off-by: Jiri Denemark <jdenemar@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 4cd9ffc194..fda1c6caa6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8831,8 +8831,10 @@ virDomainNetDefParseXMLDriver(virDomainNetDef *def,
 {
     xmlNodePtr driver_node;
 
-    if ((driver_node = virXPathNode("./driver", ctxt)) &&
-        (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0))
+    if (!(driver_node = virXPathNode("./driver", ctxt)))
+        return 0;
+
+    if (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0)
         return -1;
 
     if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&