Merge pull request #504 from laijs/small-fix

gnawux · web-flow · commit 82ddcaed6768 · 2017-05-16T23:03:23.000+08:00
hypervisor.GetVm() returns nil when error
diff --git a/hypervisor/vm.go b/hypervisor/vm.go
@@ -751,6 +751,7 @@ func GetVm(vmId string, b *BootConfig, waitStarted bool) (*Vm, error) {
 			return nil, false
 		}, -1); err != nil {
 			vm.Kill()
+			return nil, err
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -751,6 +751,7 @@ func GetVm(vmId string, b BootConfig, waitStarted bool) (Vm, error) {`
`751`	`751`	`return nil, false`
`752`	`752`	`}, -1); err != nil {`
`753`	`753`	`vm.Kill()`
	`754`	`+ return nil, err`
`754`	`755`	`}`
`755`	`756`	`}`
`756`	`757`