aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-11-15 11:42:18 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-11-16 09:58:54 +0100
commit587cec15e23ecafc9b00f8ae775a98d0e4803997 (patch)
treec4911f94c12a1cce7c02ab3769fce8ae6b497bb9
parenta129861adb55f3c438eaee27302e76c099aa363d (diff)
pkg/host: add Features.Supported
To reduce diff in future changes. Currently no-op.
-rw-r--r--pkg/host/features.go4
-rw-r--r--pkg/host/host_test.go2
-rw-r--r--syz-fuzzer/fuzzer.go2
-rw-r--r--syz-manager/manager.go2
-rw-r--r--tools/syz-execprog/execprog.go2
-rw-r--r--tools/syz-runtest/runtest.go2
6 files changed, 9 insertions, 5 deletions
diff --git a/pkg/host/features.go b/pkg/host/features.go
index 9c02defbd..3bc0127b6 100644
--- a/pkg/host/features.go
+++ b/pkg/host/features.go
@@ -36,6 +36,10 @@ type Feature struct {
type Features [numFeatures]Feature
+func (features *Features) Supported() *Features {
+ return features
+}
+
var checkFeature [numFeatures]func() string
func unconditionallyEnabled() string { return "" }
diff --git a/pkg/host/host_test.go b/pkg/host/host_test.go
index c8190dac5..dc8565920 100644
--- a/pkg/host/host_test.go
+++ b/pkg/host/host_test.go
@@ -56,7 +56,7 @@ func TestCheck(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- for _, feat := range features {
+ for _, feat := range features.Supported() {
t.Logf("%-24v: %v", feat.Name, feat.Reason)
}
}
diff --git a/syz-fuzzer/fuzzer.go b/syz-fuzzer/fuzzer.go
index a95480a6b..38659aa71 100644
--- a/syz-fuzzer/fuzzer.go
+++ b/syz-fuzzer/fuzzer.go
@@ -199,7 +199,7 @@ func main() {
}
}
log.Logf(0, "syscalls: %v", len(r.CheckResult.EnabledCalls[sandbox]))
- for _, feat := range r.CheckResult.Features {
+ for _, feat := range r.CheckResult.Features.Supported() {
log.Logf(0, "%v: %v", feat.Name, feat.Reason)
}
if r.CheckResult.Features[host.FeatureExtraCoverage].Enabled {
diff --git a/syz-manager/manager.go b/syz-manager/manager.go
index a305e7446..dc1ce4713 100644
--- a/syz-manager/manager.go
+++ b/syz-manager/manager.go
@@ -943,7 +943,7 @@ func (mgr *Manager) machineChecked(a *rpctype.CheckArgs) {
log.Logf(0, "machine check:")
log.Logf(0, "%-24v: %v/%v", "syscalls",
len(a.EnabledCalls[mgr.cfg.Sandbox]), len(mgr.target.Syscalls))
- for _, feat := range a.Features {
+ for _, feat := range a.Features.Supported() {
log.Logf(0, "%-24v: %v", feat.Name, feat.Reason)
}
mgr.checkResult = a
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index 5aaf81d2f..38412edd4 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -69,7 +69,7 @@ func main() {
log.Fatalf("%v", err)
}
if *flagOutput {
- for _, feat := range features {
+ for _, feat := range features.Supported() {
log.Logf(0, "%-24v: %v", feat.Name, feat.Reason)
}
}
diff --git a/tools/syz-runtest/runtest.go b/tools/syz-runtest/runtest.go
index 538646a2b..a45ac915f 100644
--- a/tools/syz-runtest/runtest.go
+++ b/tools/syz-runtest/runtest.go
@@ -110,7 +110,7 @@ func main() {
}
enabledCalls[sandbox] = calls
}
- for _, feat := range mgr.checkResult.Features {
+ for _, feat := range mgr.checkResult.Features.Supported() {
fmt.Printf("%-24v: %v\n", feat.Name, feat.Reason)
}
for sandbox, calls := range enabledCalls {