diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-04-11 15:06:11 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-04-11 14:27:17 +0000 |
| commit | 3f7932d24f9b230ac0e3592093a15a5a8c0a3770 (patch) | |
| tree | 904de8641bddcba7d52263dfb361cdba5faeaa03 /syz-verifier | |
| parent | da2de8407550b81caeab72cf2fe645d1705f409e (diff) | |
vm: combine Run and MonitorExecution
All callers of Run always call MonitorExecution right after it.
Combine these 2 methods. This allows to hide some implementation
details and simplify users of vm package.
Diffstat (limited to 'syz-verifier')
| -rw-r--r-- | syz-verifier/verifier.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/syz-verifier/verifier.go b/syz-verifier/verifier.go index d173b81bd..295a9da93 100644 --- a/syz-verifier/verifier.go +++ b/syz-verifier/verifier.go @@ -266,13 +266,10 @@ func (vrf *Verifier) createAndManageInstance(pi *poolInfo, poolID, vmID int) { } cmd := instance.RunnerCmd(runnerBin, fwdAddr, vrf.target.OS, vrf.target.Arch, poolID, 0, false, vrf.newEnv) - outc, errc, err := inst.Run(pi.cfg.Timeouts.VMRunningTime, vrf.vmStop, cmd) + _, _, err = inst.Run(pi.cfg.Timeouts.VMRunningTime, pi.Reporter, cmd, vm.ExitTimeout, vm.StopChan(vrf.vmStop)) if err != nil { log.Fatalf("failed to start runner: %v", err) } - - inst.MonitorExecution(outc, errc, pi.Reporter, vm.ExitTimeout) - log.Logf(0, "reboot the VM in pool %d", poolID) } |