Merge pull request #506 from laijs/qemu-quit-goroutimes

force all the go routines quitting when Close() in qemu

Author: laijs

hypervisor/qemu/qemu.go

@@ -191,6 +191,7 @@ func (qc *QemuContext) Stats(ctx *hypervisor.VmContext) (*types.PodStats, error)
 }
 
 func (qc *QemuContext) Close() {
+	qc.qmp <- &QmpQuit{}
 	qc.wdt <- "quit"
 	<-qc.waitQmp
 	qc.qemuLogFile.Close()

hypervisor/qemu/qmp_handler.go

@@ -133,7 +133,7 @@ func qmpFail(err string, respond func(err error)) *QmpFinish {
 	}
 }
 
-func qmpReceiver(qmp chan QmpInteraction, wait chan int, decoder *json.Decoder) {
+func qmpReceiver(qmp chan QmpInteraction, wait chan<- int, decoder *json.Decoder) {
 	glog.V(3).Info("Begin receive QMP message")
 	for {
 		rsp := &QmpResponse{}
@@ -279,7 +279,7 @@ func qmpHandler(ctx *hypervisor.VmContext) {
 
 	go qmpInitializer(ctx)
 
-	qc := ctx.DCtx.(*QemuContext)
+	qc := qemuContext(ctx)
 	timer := time.AfterFunc(10*time.Second, func() {
 		glog.Warning("Initializer Timeout.")
 		qc.qmp <- &QmpTimeout{}
@@ -335,6 +335,7 @@ func qmpHandler(ctx *hypervisor.VmContext) {
 			ctx.Hub <- &hypervisor.Interrupted{Reason: msg.(*QmpInternalError).cause}
 		case QMP_QUIT:
 			handler = nil
+			conn.Close()
 		}
 	}