pkg/cover: remove unused hostModules

2 files changed, 8 insertions, 16 deletions

diff --git a/pkg/cover/backend/dwarf.go b/pkg/cover/backend/dwarf.go
index c3941a145..ab60cdf26 100644
--- a/pkg/cover/backend/dwarf.go
+++ b/pkg/cover/backend/dwarf.go
@@ -141,10 +141,7 @@ func makeDWARFUnsafe(params *dwarfParams) (*Impl, error) {
 	srcDir := params.srcDir
 	buildDir := params.buildDir
 	splitBuildDelimiters := params.splitBuildDelimiters
-	modules, err := discoverModules(target, objDir, params.moduleObj, params.hostModules)
-	if err != nil {
-		return nil, err
-	}
+	modules := params.hostModules
 
 	// Here and below index 0 refers to coverage callbacks (__sanitizer_cov_trace_pc(_guard))
 	// and index 1 refers to comparison callbacks (__sanitizer_cov_trace_cmp*).
diff --git a/pkg/cover/backend/modules.go b/pkg/cover/backend/modules.go
index 249b87d0d..c9501d34c 100644
--- a/pkg/cover/backend/modules.go
+++ b/pkg/cover/backend/modules.go
@@ -22,8 +22,7 @@ type KernelModule struct {
 	Path string
 }
 
-func discoverModules(target *targets.Target, objDir string, moduleObj []string,
-	hostModules []*KernelModule) (
+func DiscoverModules(target *targets.Target, objDir string, moduleObj []string) (
 	[]*KernelModule, error) {
 	module := &KernelModule{
 		Path: filepath.Join(objDir, target.KernelObject),
@@ -40,34 +39,30 @@ func discoverModules(target *targets.Target, objDir string, moduleObj []string,
 		},
 	}
 	if target.OS == targets.Linux {
-		modules1, err := discoverModulesLinux(append([]string{objDir}, moduleObj...),
-			hostModules)
+		modules1, err := discoverModulesLinux(append([]string{objDir}, moduleObj...))
 		if err != nil {
 			return nil, err
 		}
 		modules = append(modules, modules1...)
-	} else if len(hostModules) != 0 {
+	} else if len(modules) != 1 {
 		return nil, fmt.Errorf("%v coverage does not support modules", target.OS)
 	}
 	return modules, nil
 }
 
-func discoverModulesLinux(dirs []string, hostModules []*KernelModule) ([]*KernelModule, error) {
+func discoverModulesLinux(dirs []string) ([]*KernelModule, error) {
 	paths, err := locateModules(dirs)
 	if err != nil {
 		return nil, err
 	}
 	var modules []*KernelModule
-	for _, mod := range hostModules {
-		path := paths[mod.Name]
+	for name, path := range paths {
 		if path == "" {
-			log.Logf(0, "failed to discover module %v", mod.Name)
 			continue
 		}
-		log.Logf(2, "module %v -> %v", mod.Name, path)
+		log.Logf(2, "module %v -> %v", name, path)
 		module := &KernelModule{
-			Name: mod.Name,
-			Addr: mod.Addr,
+			Name: name,
 			Path: path,
 		}
 		textRange, err := elfReadTextSecRange(module)