[PATCH] domain_nwfilter: Return early if net has no name in virDomainConfNWFilterTeardownImpl

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

This function is called from various clean up paths (e.g.
from qemuBuildInterfaceCommandLine). However, depending on the
stage the interface creation process failed at, net->ifname might
still be not filled in when control jumps to cleanup label. If
that is the case return early (avoiding useless error message
produced in virNWFilterBindingLookupByPortDev) as there is no
NWFilter to tear down anyway.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 src/conf/domain_nwfilter.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
index 24b5f42ddd..f39c8a1f9b 100644
--- a/src/conf/domain_nwfilter.c
+++ b/src/conf/domain_nwfilter.c
@@ -133,6 +133,9 @@ virDomainConfNWFilterTeardownImpl(virConnectPtr conn,
 {
     virNWFilterBindingPtr binding;
 
+    if (!net->ifname)
+        return;
+
     binding = virNWFilterBindingLookupByPortDev(conn, net->ifname);
     if (!binding)
         return;
-- 
2.16.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list