diff options
| -rw-r--r-- | pkg/cover/report.go | 9 | ||||
| -rw-r--r-- | pkg/cover/report_test.go | 4 | ||||
| -rw-r--r-- | pkg/manager/report_generator.go | 2 | ||||
| -rw-r--r-- | tools/syz-cover/syz-cover.go | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/pkg/cover/report.go b/pkg/cover/report.go index 6d4eab0c1..f147eedd0 100644 --- a/pkg/cover/report.go +++ b/pkg/cover/report.go @@ -33,14 +33,13 @@ func GetPCBase(cfg *mgrconfig.Config) (uint64, error) { return backend.GetPCBase(cfg) } -func MakeReportGenerator(cfg *mgrconfig.Config, subsystem []mgrconfig.Subsystem, - modules []*vminfo.KernelModule, rawCover bool) (*ReportGenerator, error) { +func MakeReportGenerator(cfg *mgrconfig.Config, modules []*vminfo.KernelModule) (*ReportGenerator, error) { impl, err := backend.Make(cfg.SysTarget, cfg.Type, cfg.KernelObj, cfg.KernelSrc, cfg.KernelBuildSrc, cfg.AndroidSplitBuild, cfg.ModuleObj, modules) if err != nil { return nil, err } - subsystem = append(subsystem, mgrconfig.Subsystem{ + cfg.KernelSubsystem = append(cfg.KernelSubsystem, mgrconfig.Subsystem{ Name: "all", Paths: []string{""}, }) @@ -48,8 +47,8 @@ func MakeReportGenerator(cfg *mgrconfig.Config, subsystem []mgrconfig.Subsystem, target: cfg.SysTarget, srcDir: cfg.KernelSrc, buildDir: cfg.KernelBuildSrc, - subsystem: subsystem, - rawCoverEnabled: rawCover, + subsystem: cfg.KernelSubsystem, + rawCoverEnabled: cfg.RawCover, Impl: impl, } return rg, nil diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index 8c86049f1..002ff1958 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -309,7 +309,7 @@ func generateReport(t *testing.T, target *targets.Target, test *Test) (*reports, KernelBuildSrc: dir, Type: "", } - subsystem := []mgrconfig.Subsystem{ + cfg.KernelSubsystem = []mgrconfig.Subsystem{ { Name: "sound", Paths: []string{ @@ -330,7 +330,7 @@ func generateReport(t *testing.T, target *targets.Target, test *Test) (*reports, progs = append(progs, Prog{Sig: p.Sig, Data: p.Data, PCs: append([]uint64{}, p.PCs...)}) } - rg, err := MakeReportGenerator(cfg, subsystem, modules, false) + rg, err := MakeReportGenerator(cfg, modules) if err != nil { return nil, err } diff --git a/pkg/manager/report_generator.go b/pkg/manager/report_generator.go index b3d293ef1..a589558a6 100644 --- a/pkg/manager/report_generator.go +++ b/pkg/manager/report_generator.go @@ -35,7 +35,7 @@ func (w *ReportGeneratorWrapper) Get() (*cover.ReportGenerator, error) { } if w.cached == nil { log.Logf(0, "initializing coverage information...") - rg, err := cover.MakeReportGenerator(w.cfg, w.cfg.KernelSubsystem, w.modules, w.cfg.RawCover) + rg, err := cover.MakeReportGenerator(w.cfg, w.modules) if err != nil { return nil, err } diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go index 4a72b9bf6..4f78ad29b 100644 --- a/tools/syz-cover/syz-cover.go +++ b/tools/syz-cover/syz-cover.go @@ -129,7 +129,7 @@ func main() { tool.Fail(err) } modules := initModules(cfg) - rg, err := cover.MakeReportGenerator(cfg, cfg.KernelSubsystem, modules, false) + rg, err := cover.MakeReportGenerator(cfg, modules) if err != nil { tool.Fail(err) } |
