]> xenbits.xensource.com Git - libvirt.git/commitdiff
bhyve: do not cleanup unallocated networks on fail
authorRoman Bogorodskiy <bogorodskiy@gmail.com>
Fri, 13 Jun 2014 14:56:59 +0000 (18:56 +0400)
committerRoman Bogorodskiy <bogorodskiy@gmail.com>
Fri, 13 Jun 2014 16:44:36 +0000 (20:44 +0400)
virBhyveProcessStart() calls bhyveNetCleanup() if it fails. However,
it might fail earlier than networks are allocated, so modify
bhyveNetCleanup() to check if net->ifname is not NULL before
going further with the cleanup.

src/bhyve/bhyve_process.c

index a5ad68d33e08877477d459e7fe071aa9785ed74e..b8db0763667c5b1c06c4b6dc6cc45e21ecc380ae 100644 (file)
@@ -78,10 +78,12 @@ bhyveNetCleanup(virDomainObjPtr vm)
         int actualType = virDomainNetGetActualType(net);
 
         if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) {
-            ignore_value(virNetDevBridgeRemovePort(
-                            virDomainNetGetActualBridgeName(net),
-                            net->ifname));
-            ignore_value(virNetDevTapDelete(net->ifname));
+            if (net->ifname) {
+                ignore_value(virNetDevBridgeRemovePort(
+                                virDomainNetGetActualBridgeName(net),
+                                net->ifname));
+                ignore_value(virNetDevTapDelete(net->ifname));
+            }
         }
     }
 }