pkg/kconfig: store minimization results

Store config options identified using DebugTracer. Also change bisection
and configuration minimization code to use new DebugTracer.

2 files changed, 13 insertions, 6 deletions

diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go
index 2c1b478d5..3241ff469 100644
--- a/tools/syz-bisect/bisect.go
+++ b/tools/syz-bisect/bisect.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/google/syzkaller/pkg/bisect"
 	"github.com/google/syzkaller/pkg/config"
+	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/mgrconfig"
 	"github.com/google/syzkaller/pkg/osutil"
 	"github.com/google/syzkaller/pkg/vcs"
@@ -87,11 +88,13 @@ func main() {
 		defer os.RemoveAll(mgrcfg.Workdir)
 	}
 	cfg := &bisect.Config{
-		Trace:    os.Stdout,
-		Fix:      *flagFix,
-		BinDir:   mycfg.BinDir,
-		Ccache:   mycfg.Ccache,
-		DebugDir: *flagCrash,
+		Trace: &debugtracer.GenericTracer{
+			TraceWriter: os.Stdout,
+			OutDir:      *flagCrash,
+		},
+		Fix:    *flagFix,
+		BinDir: mycfg.BinDir,
+		Ccache: mycfg.Ccache,
 		Kernel: bisect.KernelConfig{
 			Repo:      mycfg.KernelRepo,
 			Branch:    mycfg.KernelBranch,
diff --git a/tools/syz-minconfig/minconfig.go b/tools/syz-minconfig/minconfig.go
index 91a26cdd1..93446b384 100644
--- a/tools/syz-minconfig/minconfig.go
+++ b/tools/syz-minconfig/minconfig.go
@@ -16,6 +16,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/kconfig"
 	"github.com/google/syzkaller/sys/targets"
 )
@@ -49,7 +50,10 @@ func main() {
 		}
 		return true, nil
 	}
-	res, err := kconf.Minimize(base, full, pred, os.Stderr)
+	gt := &debugtracer.GenericTracer{
+		TraceWriter: os.Stdout,
+	}
+	res, err := kconf.Minimize(base, full, pred, gt)
 	if err != nil {
 		failf("%v", err)
 	}