qemu: add macvlan delete to qemuDomainAttachNetDevice cleanup

If an error occurs during qemuDomainAttachNetDevice after the macvtap
was created in qemuPhysIfaceConnect, the macvtap device gets left behind.
This patch adds code to the cleanup routine to delete the macvtap.

Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 1925fe4d1a59e59445787ab57e8dfb371db3dab0..ac9350b0cf1a60e1141d36b7f36f586cb373691f 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -947,6 +947,16 @@ cleanup:
         if (iface_connected) {
             virDomainConfNWFilterTeardown(net);
 
+            if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
+                ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
+                                 net->ifname, &net->mac,
+                                 virDomainNetGetActualDirectDev(net),
+                                 virDomainNetGetActualDirectMode(net),
+                                 virDomainNetGetActualVirtPortProfile(net),
+                                 cfg->stateDir));
+                VIR_FREE(net->ifname);
+            }
+
             vport = virDomainNetGetActualVirtPortProfile(net);
             if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
                ignore_value(virNetDevOpenvswitchRemovePort(