qemu: close tap fd properly

Still need to pass tap fd around to keep it open until nic is removed.

Signed-off-by: Peng Tao <[email protected]>

hypervisor/events.go

@@ -52,6 +52,7 @@ type InterfaceCreated struct {
 	Id         string //user specified in (ref api.InterfaceDescription: a user identifier of interface, user may use this to specify a nic, normally you can use IPAddr as an Id.)
 	Index      int
 	PCIAddr    int
+	TapFd      int
 	Bridge     string
 	HostDevice string
 	DeviceName string
@@ -73,6 +74,7 @@ type NetDevInsertedEvent struct {
 	Index      int
 	DeviceName string
 	Address    int
+	TapFd      int
 }
 
 func (ne *NetDevInsertedEvent) ResultId() string {

hypervisor/network.go

@@ -173,6 +173,8 @@ func (nc *NetworkContext) addInterface(inf *api.InterfaceDescription, result cha
 			result <- fe
 			return
 		} else if ni, ok := ev.(*NetDevInsertedEvent); ok {
+			created := nc.idMap[inf.Id]
+			created.TapFd = ni.TapFd
 			nc.sandbox.Log(DEBUG, "nic insert success: %s", ni.Id)
 			result <- ni
 			return

hypervisor/qemu/qemu.go

@@ -297,6 +297,7 @@ func (qc *QemuContext) AddNic(ctx *hypervisor.VmContext, host *hypervisor.HostNi
 }
 
 func (qc *QemuContext) RemoveNic(ctx *hypervisor.VmContext, n *hypervisor.InterfaceCreated, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {
+	syscall.Close(n.TapFd)
 	newNetworkDelSession(ctx, qc, n.NewName, callback, result)
 }
 

hypervisor/qemu/qmp_wrapper_amd64.go

@@ -84,6 +84,7 @@ func newNetworkAddSession(ctx *hypervisor.VmContext, qc *QemuContext, fd int, ho
 			Index:      guest.Index,
 			DeviceName: guest.Device,
 			Address:    guest.Busaddr,
+			TapFd:      fd,
 		}),
 	}
 }

hypervisor/qemu/qmp_wrapper_arm64.go

@@ -49,6 +49,7 @@ func newNetworkAddSession(ctx *hypervisor.VmContext, qc *QemuContext, fd int, ho
 			Index:      guest.Index,
 			DeviceName: guest.Device,
 			Address:    guest.Busaddr,
+			TapFd:      fd,
 		}),
 	}
 }

hypervisor/qemu/qmp_wrapper_ppc64le.go

@@ -47,6 +47,7 @@ func newNetworkAddSession(ctx *hypervisor.VmContext, qc *QemuContext, fd int, ho
 			Index:      guest.Index,
 			DeviceName: guest.Device,
 			Address:    guest.Busaddr,
+			TapFd:      fd,
 		}),
 	}
 }

hypervisor/qemu/qmp_wrapper_s390x.go

@@ -43,6 +43,7 @@ func newNetworkAddSession(ctx *hypervisor.VmContext, qc *QemuContext, fd int, ho
 			Index:      guest.Index,
 			DeviceName: guest.Device,
 			Address:    guest.Busaddr,
+			TapFd:      fd,
 		}),
 	}
 }