qemu: Cleanup Vm paths irrespective of Sandbox stop pass/fail

Sometimes qemu/qmp commands error out and VM files get left behind on the host filesystem. Clen them up irrespective of `stopSandbox` succeeds or fails. Fixes: #1246 Signed-off-by: Nitesh Konkar [email protected]
kata-containers · Feb 20, 2019 · 6daefdb · 6daefdb
1 parent 22cee2d
commit 6daefdb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -642,6 +642,7 @@ func (q *qemu) stopSandbox() error {
 	span, _ := q.trace("stopSandbox")
 	defer span.Finish()
 
+	defer q.cleanupVM()
 	q.Logger().Info("Stopping Sandbox")
 
 	err := q.qmpSetup()
@@ -655,6 +656,11 @@ func (q *qemu) stopSandbox() error {
 		return err
 	}
 
+	return nil
+}
+
+func (q *qemu) cleanupVM() error {
+
 	// cleanup vm path
 	dir := filepath.Join(store.RunVMStoragePath, q.id)