From 57e15fa0a012ae9ac1f0ba7d01f6cf00138ad755 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 3 Jan 2020 22:10:13 +0000 Subject: [PATCH] Move shared directory creation out of vm generating function --- appvm.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appvm.go b/appvm.go index 8184d12..63d172b 100644 --- a/appvm.go +++ b/appvm.go @@ -165,8 +165,8 @@ func isRunning(l *libvirt.Libvirt, name string) bool { return err == nil } -func generateAppVM(l *libvirt.Libvirt, appvmPath, name string, verbose, - online bool) (err error) { +func generateAppVM(l *libvirt.Libvirt, name, appvmPath, sharedDir string, + verbose, online bool) (err error) { err = os.Chdir(appvmPath) if err != nil { @@ -178,9 +178,6 @@ func generateAppVM(l *libvirt.Libvirt, appvmPath, name string, verbose, return } - sharedDir := fmt.Sprintf(os.Getenv("HOME") + "/appvm/" + name) - os.MkdirAll(sharedDir, 0700) - xml := generateXML(name, online, realpath, reginfo, qcow2, sharedDir) _, err = l.DomainCreateXML(xml, libvirt.DomainStartValidate) return @@ -255,7 +252,11 @@ func start(l *libvirt.Libvirt, name string, verbose, online bool, if !verbose { go stupidProgressBar() } - err = generateAppVM(l, appvmPath, name, verbose, online) + + sharedDir := fmt.Sprintf(os.Getenv("HOME") + "/appvm/" + name) + os.MkdirAll(sharedDir, 0700) + + err = generateAppVM(l, name, appvmPath, sharedDir, verbose, online) if err != nil { log.Fatal(err) }