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 niteshkonkar@in.ibm.com

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)