From 489e2dc8c4e9a891226860afa22804833e5b2cca Mon Sep 17 00:00:00 2001
From: Joey Jiao <quic_jiangenj@quicinc.com>
Date: Wed, 15 May 2024 15:08:47 +0800
Subject: all: reduce params to MakeReportGenerator

---
 pkg/cover/report.go      | 9 ++++-----
 pkg/cover/report_test.go | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkg/cover')

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
 	}
-- 
cgit mrf-deployment