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. --- tools/syz-cover/syz-cover.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go index b277d39c2..325bd4157 100644 --- a/tools/syz-cover/syz-cover.go +++ b/tools/syz-cover/syz-cover.go @@ -31,7 +31,6 @@ import ( "strings" "github.com/google/syzkaller/pkg/cover" - "github.com/google/syzkaller/pkg/host" "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/tool" @@ -53,7 +52,7 @@ func main() { if err != nil { tool.Fail(err) } - var modules []host.KernelModule + var modules []cover.KernelModule if *flagModules != "" { m, err := loadModules(*flagModules) if err != nil { @@ -155,12 +154,12 @@ func readPCs(files []string) ([]uint64, error) { return pcs, nil } -func loadModules(fname string) ([]host.KernelModule, error) { +func loadModules(fname string) ([]cover.KernelModule, error) { data, err := os.ReadFile(fname) if err != nil { return nil, err } - var modules []host.KernelModule + var modules []cover.KernelModule err = json.Unmarshal(data, &modules) if err != nil { return nil, err -- cgit mrf-deployment