conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

[libvirt PATCH] conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

Jiri Denemark posted 1 patch 1 year, 5 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/d024f0ff92346c8ba5eea7095de5ccb3c42fba00.1667398219.git.jdenemar@redhat.com

src/conf/domain_conf.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Expand all Fold all

[libvirt PATCH] conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

Posted by Jiri Denemark 1 year, 5 months ago

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/conf/domain_conf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 &&
-- 
2.38.1

Re: [libvirt PATCH] conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

Posted by Ján Tomko 1 year, 5 months ago

On a Wednesday in 2022, Jiri Denemark wrote:
>Trying to parse <driver> node which does not exist makes no sense.
>

Fixes: 9de48359873c8d22e9ebf62d89aa720a6e93fe4d

>Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
>---
> src/conf/domain_conf.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano

Re: [libvirt PATCH] conf: Skip virDomainNetDefParseXMLDriver if driver_node is NULL

Posted by Jiri Denemark 1 year, 5 months ago

On Wed, Nov 02, 2022 at 15:59:51 +0100, Ján Tomko wrote:
> On a Wednesday in 2022, Jiri Denemark wrote:
> >Trying to parse <driver> node which does not exist makes no sense.
> >
> 
> Fixes: 9de48359873c8d22e9ebf62d89aa720a6e93fe4d

Not really, this commit just moved the code from elsewhere so the issue
was there even before.

Jirka