From ff1693fc52bf20fb123b27fe87212ce216b0ef58 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 18 Apr 2024 09:10:23 +0200
Subject: syz-manager, syz-fuzzer: pass ExecOpts in exec requests

Move all ExecOpts logic from the fuzzer to the manager.
This makes the fuzzer simpler and will allow to vary
options across requests.
---
 pkg/instance/instance.go | 2 --
 pkg/rpctype/rpctype.go   | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'pkg')

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 4c61b1d24..7f1ca4dbb 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -457,7 +457,6 @@ func (inst *inst) testRepro() ([]byte, error) {
 
 type OptionalFuzzerArgs struct {
 	Slowdown       int
-	RawCover       bool
 	SandboxArg     int
 	PprofPort      int
 	ResetAccState  bool
@@ -501,7 +500,6 @@ func FuzzerCmd(args *FuzzerCmdArgs) string {
 	if args.Optional != nil {
 		flags := []tool.Flag{
 			{Name: "slowdown", Value: fmt.Sprint(args.Optional.Slowdown)},
-			{Name: "raw_cover", Value: fmt.Sprint(args.Optional.RawCover)},
 			{Name: "sandbox_arg", Value: fmt.Sprint(args.Optional.SandboxArg)},
 			{Name: "pprof_port", Value: fmt.Sprint(args.Optional.PprofPort)},
 			{Name: "reset_acc_state", Value: fmt.Sprint(args.Optional.ResetAccState)},
diff --git a/pkg/rpctype/rpctype.go b/pkg/rpctype/rpctype.go
index 26765213f..469a614c5 100644
--- a/pkg/rpctype/rpctype.go
+++ b/pkg/rpctype/rpctype.go
@@ -27,10 +27,8 @@ const (
 type ExecutionRequest struct {
 	ID               int64
 	ProgData         []byte
-	NeedCover        bool
-	NeedRawCover     bool
-	NeedHints        bool
-	NeedSignal       SignalType
+	ExecOpts         ipc.ExecOpts
+	NewSignal        bool
 	SignalFilter     signal.Signal
 	SignalFilterCall int
 }
-- 
cgit mrf-deployment