From bf7ecb7cfe9145d8e169454ff6538a307124f82c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 3 May 2024 14:16:11 +0200 Subject: pkg/cover: move KernelModule from pkg/host In preparation for pkg/host removal. Nothing in pkg/host uses KernelModule, and pkg/cover is effectively the only user of KernelModule. --- pkg/vminfo/linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/vminfo/linux.go') diff --git a/pkg/vminfo/linux.go b/pkg/vminfo/linux.go index d5e84254f..2735ad0ef 100644 --- a/pkg/vminfo/linux.go +++ b/pkg/vminfo/linux.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/google/syzkaller/pkg/host" + "github.com/google/syzkaller/pkg/cover" ) type linux int @@ -43,8 +43,8 @@ func (linux) machineInfos() []machineInfoFunc { } } -func (linux) parseModules(files filesystem) ([]host.KernelModule, error) { - var modules []host.KernelModule +func (linux) parseModules(files filesystem) ([]cover.KernelModule, error) { + var modules []cover.KernelModule re := regexp.MustCompile(`(\w+) ([0-9]+) .*(0[x|X][a-fA-F0-9]+)[^\n]*`) modulesText, _ := files.ReadFile("/proc/modules") for _, match := range re.FindAllSubmatch(modulesText, -1) { @@ -65,7 +65,7 @@ func (linux) parseModules(files filesystem) ([]host.KernelModule, error) { return nil, fmt.Errorf("module %v size parsing error: %w", name, err) } offset := modAddr - textAddr - modules = append(modules, host.KernelModule{ + modules = append(modules, cover.KernelModule{ Name: name, Addr: textAddr, Size: modSize - offset, -- cgit mrf-deployment