From 3f7932d24f9b230ac0e3592093a15a5a8c0a3770 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 11 Apr 2024 15:06:11 +0200 Subject: 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. --- syz-verifier/verifier.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'syz-verifier') 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) } -- cgit mrf-deployment