qemu: do not try to stop qemu multiple times

We've cleaned it up the first time. Future stop will only fail. Fixes: #1958 Signed-off-by: Peng Tao <[email protected]>
kata-containers · Aug 29, 2019 · 5737f80 · 5737f80
1 parent 0903639
commit 5737f80
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -91,6 +91,8 @@ type qemu struct {
 	ctx context.Context
 
 	nvdimmCount int
+
+	stopped bool
 }
 
 const (
@@ -821,8 +823,16 @@ func (q *qemu) stopSandbox() error {
 	span, _ := q.trace("stopSandbox")
 	defer span.Finish()
 
-	defer q.cleanupVM()
 	q.Logger().Info("Stopping Sandbox")
+	if q.stopped {
+		q.Logger().Info("Already stopped")
+		return nil
+	}
+
+	defer func() {
+		q.cleanupVM()
+		q.stopped = true
+	}()
 
 	err := q.qmpSetup()
 	if err != nil {