From e7213be306a4b6eb76d4c0e34a1a99ebab5639ac Mon Sep 17 00:00:00 2001
From: Joey Jiao <quic_jiangenj@quicinc.com>
Date: Mon, 8 Jul 2024 11:08:29 +0800
Subject: all: move KernelModule into vminfo package

---
 pkg/rpcserver/local.go     | 4 ++--
 pkg/rpcserver/rpcserver.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg/rpcserver')

diff --git a/pkg/rpcserver/local.go b/pkg/rpcserver/local.go
index d30e3acfc..1886703e9 100644
--- a/pkg/rpcserver/local.go
+++ b/pkg/rpcserver/local.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/google/syzkaller/pkg/cover"
 	"github.com/google/syzkaller/pkg/flatrpc"
 	"github.com/google/syzkaller/pkg/fuzzer/queue"
 	"github.com/google/syzkaller/pkg/log"
 	"github.com/google/syzkaller/pkg/osutil"
 	"github.com/google/syzkaller/pkg/signal"
+	"github.com/google/syzkaller/pkg/vminfo"
 	"github.com/google/syzkaller/prog"
 )
 
@@ -121,6 +121,6 @@ func (ctx *local) MaxSignal() signal.Signal {
 	return signal.FromRaw(ctx.cfg.MaxSignal, 0)
 }
 
-func (ctx *local) CoverageFilter(modules []*cover.KernelModule) []uint64 {
+func (ctx *local) CoverageFilter(modules []*vminfo.KernelModule) []uint64 {
 	return ctx.cfg.CoverFilter
 }
diff --git a/pkg/rpcserver/rpcserver.go b/pkg/rpcserver/rpcserver.go
index 81563a077..c50f483b1 100644
--- a/pkg/rpcserver/rpcserver.go
+++ b/pkg/rpcserver/rpcserver.go
@@ -44,14 +44,14 @@ type Config struct {
 	Procs             int
 	Slowdown          int
 	pcBase            uint64
-	localModules      []*cover.KernelModule
+	localModules      []*vminfo.KernelModule
 }
 
 type Manager interface {
 	MaxSignal() signal.Signal
 	BugFrames() (leaks []string, races []string)
 	MachineChecked(features flatrpc.Feature, syscalls map[*prog.Syscall]bool) queue.Source
-	CoverageFilter(modules []*cover.KernelModule) []uint64
+	CoverageFilter(modules []*vminfo.KernelModule) []uint64
 }
 
 type Server struct {
@@ -85,7 +85,7 @@ type Server struct {
 }
 
 func New(cfg *mgrconfig.Config, mgr Manager, debug bool) (*Server, error) {
-	var modules []*cover.KernelModule
+	var modules []*vminfo.KernelModule
 	var pcBase uint64
 	if cfg.KernelObj != "" {
 		var err error
-- 
cgit mrf-deployment