aboutsummaryrefslogtreecommitdiffstats
path: root/tools/syz-execprog
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2024-05-17 18:07:51 +0200
committerDmitry Vyukov <dvyukov@google.com>2024-05-21 09:46:36 +0000
commit780a5444026e461c8be27b8615a81360310582e7 (patch)
tree0a508a764f8a9e0cdc08ceac73f120c0f026e34c /tools/syz-execprog
parent1d3c25e7679384c386e7710ea11e364ce9f9e028 (diff)
pkg/ipc: remove ExecOpts
Switch to flatrpc.ExecOpts.
Diffstat (limited to 'tools/syz-execprog')
-rw-r--r--tools/syz-execprog/execprog.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index 066c1f4ee..cb51244b3 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -157,7 +157,7 @@ type Context struct {
progs []*prog.Prog
choiceTable *prog.ChoiceTable
config *ipc.Config
- execOpts *ipc.ExecOpts
+ execOpts *flatrpc.ExecOpts
gate *ipc.Gate
shutdown chan struct{}
logMu sync.Mutex
@@ -204,7 +204,7 @@ func (ctx *Context) execute(pid int, env *ipc.Env, p *prog.Prog, progIndex int)
callOpts := ctx.execOpts
if *flagOutput {
- ctx.logProgram(pid, p, callOpts)
+ ctx.logProgram(pid, p)
}
progData, err := p.SerializeForExec()
if err != nil {
@@ -244,7 +244,7 @@ func (ctx *Context) execute(pid int, env *ipc.Env, p *prog.Prog, progIndex int)
}
}
-func (ctx *Context) logProgram(pid int, p *prog.Prog, callOpts *ipc.ExecOpts) {
+func (ctx *Context) logProgram(pid int, p *prog.Prog) {
data := p.Serialize()
ctx.logMu.Lock()
log.Logf(0, "executing program %v:\n%s", pid, data)
@@ -394,7 +394,7 @@ func loadPrograms(target *prog.Target, files []string) []*prog.Prog {
}
func createConfig(target *prog.Target, featuresFlags csource.Features, syscalls []int) (
- *ipc.Config, *ipc.ExecOpts, map[*prog.Syscall]bool, flatrpc.Feature) {
+ *ipc.Config, *flatrpc.ExecOpts, map[*prog.Syscall]bool, flatrpc.Feature) {
config, execOpts, err := ipcconfig.Default(target)
if err != nil {
log.Fatalf("%v", err)