From 27a9e3872eb3a229cced88c14a2011188fa968df Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 29 Dec 2020 11:02:43 +0100 Subject: vm/qemu: scale ssh timeout Increase ssh wait timeout according to the target slowdown. --- vm/vmimpl/vmimpl.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'vm/vmimpl') diff --git a/vm/vmimpl/vmimpl.go b/vm/vmimpl/vmimpl.go index 0ef8636ee..5a8fed098 100644 --- a/vm/vmimpl/vmimpl.go +++ b/vm/vmimpl/vmimpl.go @@ -19,6 +19,7 @@ import ( "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" + "github.com/google/syzkaller/sys/targets" ) // Pool represents a set of test machines (VMs, physical devices, etc) of particular type. @@ -62,15 +63,16 @@ type Instance interface { type Env struct { // Unique name // Can be used for VM name collision resolution if several pools share global name space. - Name string - OS string // target OS - Arch string // target arch - Workdir string - Image string - SSHKey string - SSHUser string - Debug bool - Config []byte // json-serialized VM-type-specific config + Name string + OS string // target OS + Arch string // target arch + Workdir string + Image string + SSHKey string + SSHUser string + Timeouts targets.Timeouts + Debug bool + Config []byte // json-serialized VM-type-specific config } // BootError is returned by Pool.Create when VM does not boot. -- cgit mrf-deployment