]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL
authorJiri Denemark <jdenemar@redhat.com>
Wed, 2 Nov 2022 13:42:51 +0000 (14:42 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 2 Nov 2022 15:10:38 +0000 (16:10 +0100)
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>
src/conf/domain_conf.c

index 4cd9ffc194123c7ecb5e8be1c26d28874fb0ce77..fda1c6caa615ced89e3dbf5ab1a98dd6f9237fa0 100644 (file)
@@ -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 &&