aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-08-03 18:12:24 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-08-03 18:12:24 +0200
commit6bfd4f09db1079ee95e0ee10f770e34499e9eeee (patch)
treedcad32286f42c6cb8533ec4b7f5ddfab4ba3c8b0 /tools
parent5ff1f9faece0ff7318d05c21a3efd0b44a009ac8 (diff)
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.
Diffstat (limited to 'tools')
-rw-r--r--tools/syz-execprog/execprog.go3
-rw-r--r--tools/syz-stress/stress.go3
2 files changed, 4 insertions, 2 deletions
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)
}