aboutsummaryrefslogtreecommitdiffstats
path: root/vm/vmm
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-03-14 09:59:43 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-03-17 18:06:44 +0100
commitc298c983028502f90d21b445c2497e46f558c5bb (patch)
treeb09c4e2dcec1928ce314146cfac219d747cf2ae7 /vm/vmm
parentdc89691385e8105f1c9fb3d30297470562aca3c1 (diff)
vm/qemu: detect boot errors faster
Currently we try to ssh into the machine for 10 minutes even if it crashed right away. Make qemu exit on kernel panic and stop ssh'ing when qemu exits. Handling bad kernels fast is actually important for bisection. Update #501
Diffstat (limited to 'vm/vmm')
-rw-r--r--vm/vmm/vmm.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/vmm/vmm.go b/vm/vmm/vmm.go
index 41fa0d53c..f3b5fc457 100644
--- a/vm/vmm/vmm.go
+++ b/vm/vmm/vmm.go
@@ -214,7 +214,7 @@ func (inst *instance) Boot() error {
}
if err := vmimpl.WaitForSSH(inst.debug, 20*time.Minute, inst.sshhost,
- inst.sshkey, inst.sshuser, inst.os, inst.sshport); err != nil {
+ inst.sshkey, inst.sshuser, inst.os, inst.sshport, nil); err != nil {
bootOutputStop <- true
<-bootOutputStop
return vmimpl.BootError{Title: err.Error(), Output: bootOutput}