From 6bfd4f09db1079ee95e0ee10f770e34499e9eeee Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 3 Aug 2018 18:12:24 +0200 Subject: pkg/ipc: move flags into subpackage Move all ipc flags into pkg/ipc/ipcconfig package so that importing pkg/ipc does pull in the flags. --- tools/syz-execprog/execprog.go | 3 ++- tools/syz-stress/stress.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go index 57bc5692f..38603fec0 100644 --- a/tools/syz-execprog/execprog.go +++ b/tools/syz-execprog/execprog.go @@ -18,6 +18,7 @@ import ( "github.com/google/syzkaller/pkg/cover" "github.com/google/syzkaller/pkg/host" "github.com/google/syzkaller/pkg/ipc" + "github.com/google/syzkaller/pkg/ipc/ipcconfig" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/prog" @@ -231,7 +232,7 @@ func loadPrograms(target *prog.Target, files []string) []*prog.LogEntry { func createConfig(target *prog.Target, entries []*prog.LogEntry, features *host.Features) ( *ipc.Config, *ipc.ExecOpts) { - config, execOpts, err := ipc.DefaultConfig(target) + config, execOpts, err := ipcconfig.Default(target) if err != nil { log.Fatalf("%v", err) } diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go index 235e7302f..9c61e8206 100644 --- a/tools/syz-stress/stress.go +++ b/tools/syz-stress/stress.go @@ -16,6 +16,7 @@ import ( "github.com/google/syzkaller/pkg/db" "github.com/google/syzkaller/pkg/host" "github.com/google/syzkaller/pkg/ipc" + "github.com/google/syzkaller/pkg/ipc/ipcconfig" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/prog" _ "github.com/google/syzkaller/sys" @@ -60,7 +61,7 @@ func main() { prios := target.CalculatePriorities(corpus) ct := target.BuildChoiceTable(prios, calls) - config, execOpts, err := ipc.DefaultConfig(target) + config, execOpts, err := ipcconfig.Default(target) if err != nil { log.Fatalf("%v", err) } -- cgit mrf-deployment