Merge pull request #391 from YaoZengzeng/remove-vmdir

Remove "vm-XXX" directory when vm exits

Author: laijs

daemon/pod.go

@@ -1049,13 +1049,15 @@ func (p *Pod) Cleanup(daemon *Daemon) {
 	}
 
 	sharedDir := path.Join(hypervisor.BaseDir, p.VM.Id, hypervisor.ShareDirTag)
+	vmDir := path.Join(hypervisor.BaseDir, p.VM.Id)
 	p.VM = nil
 
 	daemon.db.DeleteVMByPod(p.Id)
 
 	p.cleanupVolumes(daemon.Storage, sharedDir)
 	p.cleanupMountsAndFiles(daemon.Storage, sharedDir)
 	p.cleanupEtcHosts()
+	os.RemoveAll(vmDir)
 
 	p.PodStatus.CleanupExec()