aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/vminfo
diff options
context:
space:
mode:
authorJoey Jiao <quic_jiangenj@quicinc.com>2024-06-11 10:53:25 +0800
committerAleksandr Nogikh <nogikh@google.com>2024-06-17 08:56:33 +0000
commit1f11cfd7279ff3046e6e7f871eeb195c48ccbfa9 (patch)
tree55aa542603741d637db9be636fa48210f6383c59 /pkg/vminfo
parentc1349e08b8ce2abf7e86375364268d8f696d077c (diff)
all: always use KernelModule ptr to unify usage
Diffstat (limited to 'pkg/vminfo')
-rw-r--r--pkg/vminfo/linux.go6
-rw-r--r--pkg/vminfo/netbsd.go2
-rw-r--r--pkg/vminfo/openbsd.go2
-rw-r--r--pkg/vminfo/vminfo.go6
4 files changed, 8 insertions, 8 deletions
diff --git a/pkg/vminfo/linux.go b/pkg/vminfo/linux.go
index 2735ad0ef..b038778a1 100644
--- a/pkg/vminfo/linux.go
+++ b/pkg/vminfo/linux.go
@@ -43,8 +43,8 @@ func (linux) machineInfos() []machineInfoFunc {
}
}
-func (linux) parseModules(files filesystem) ([]cover.KernelModule, error) {
- var modules []cover.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) ([]cover.KernelModule, error) {
return nil, fmt.Errorf("module %v size parsing error: %w", name, err)
}
offset := modAddr - textAddr
- modules = append(modules, cover.KernelModule{
+ modules = append(modules, &cover.KernelModule{
Name: name,
Addr: textAddr,
Size: modSize - offset,
diff --git a/pkg/vminfo/netbsd.go b/pkg/vminfo/netbsd.go
index cb6c1b33a..d447e33c5 100644
--- a/pkg/vminfo/netbsd.go
+++ b/pkg/vminfo/netbsd.go
@@ -18,7 +18,7 @@ func (netbsd) checkFiles() []string {
return nil
}
-func (netbsd) parseModules(files filesystem) ([]cover.KernelModule, error) {
+func (netbsd) parseModules(files filesystem) ([]*cover.KernelModule, error) {
return nil, nil
}
diff --git a/pkg/vminfo/openbsd.go b/pkg/vminfo/openbsd.go
index 07ada0a98..7ecb96f81 100644
--- a/pkg/vminfo/openbsd.go
+++ b/pkg/vminfo/openbsd.go
@@ -18,7 +18,7 @@ func (openbsd) checkFiles() []string {
return nil
}
-func (openbsd) parseModules(files filesystem) ([]cover.KernelModule, error) {
+func (openbsd) parseModules(files filesystem) ([]*cover.KernelModule, error) {
return nil, nil
}
diff --git a/pkg/vminfo/vminfo.go b/pkg/vminfo/vminfo.go
index 103ee0a18..a880f2f5b 100644
--- a/pkg/vminfo/vminfo.go
+++ b/pkg/vminfo/vminfo.go
@@ -57,7 +57,7 @@ func New(cfg *mgrconfig.Config) *Checker {
}
}
-func (checker *Checker) MachineInfo(fileInfos []*flatrpc.FileInfo) ([]cover.KernelModule, []byte, error) {
+func (checker *Checker) MachineInfo(fileInfos []*flatrpc.FileInfo) ([]*cover.KernelModule, []byte, error) {
files := createVirtualFilesystem(fileInfos)
modules, err := checker.parseModules(files)
if err != nil {
@@ -106,7 +106,7 @@ type machineInfoFunc func(files filesystem, w io.Writer) (string, error)
type checker interface {
RequiredFiles() []string
checkFiles() []string
- parseModules(files filesystem) ([]cover.KernelModule, error)
+ parseModules(files filesystem) ([]*cover.KernelModule, error)
machineInfos() []machineInfoFunc
syscallCheck(*checkContext, *prog.Syscall) string
}
@@ -166,7 +166,7 @@ func (stub) checkFiles() []string {
return nil
}
-func (stub) parseModules(files filesystem) ([]cover.KernelModule, error) {
+func (stub) parseModules(files filesystem) ([]*cover.KernelModule, error) {
return nil, nil
}