From 9a7d0a5412c35bdc7d0ec09fc21c1d4277e62d31 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Wed, 20 Jun 2018 15:31:06 +0200
Subject: pkg/report: pass vm type to NewReporter

For the case when VM type affects output.
Will be needed for gvisor. It is kinda linux, but kinda not.
---
 pkg/instance/instance.go  | 4 ++--
 pkg/report/linux_test.go  | 8 ++++----
 pkg/report/report.go      | 4 ++--
 pkg/report/report_test.go | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 2410713ae..b5f44376c 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -118,8 +118,8 @@ func (env *Env) Test(numVMs int, reproSyz, reproOpts, reproC []byte) ([]error, e
 	if err := mgrconfig.Complete(env.cfg); err != nil {
 		return nil, err
 	}
-	reporter, err := report.NewReporter(env.cfg.TargetOS, env.cfg.KernelSrc,
-		filepath.Dir(env.cfg.Vmlinux), nil, env.cfg.ParsedIgnores)
+	reporter, err := report.NewReporter(env.cfg.TargetOS, env.cfg.Type,
+		env.cfg.KernelSrc, filepath.Dir(env.cfg.Vmlinux), nil, env.cfg.ParsedIgnores)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/report/linux_test.go b/pkg/report/linux_test.go
index 8cd66ede8..0543fcbe0 100644
--- a/pkg/report/linux_test.go
+++ b/pkg/report/linux_test.go
@@ -12,14 +12,14 @@ import (
 )
 
 func TestLinuxIgnores(t *testing.T) {
-	reporter, err := NewReporter("linux", "", "", nil, nil)
+	reporter, err := NewReporter("linux", "", "", "", nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	ignores1 := []*regexp.Regexp{
 		regexp.MustCompile("BUG: bug3"),
 	}
-	reporter1, err := NewReporter("linux", "", "", nil, ignores1)
+	reporter1, err := NewReporter("linux", "", "", "", nil, ignores1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -27,7 +27,7 @@ func TestLinuxIgnores(t *testing.T) {
 		regexp.MustCompile("BUG: bug3"),
 		regexp.MustCompile("BUG: bug1"),
 	}
-	reporter2, err := NewReporter("linux", "", "", nil, ignores2)
+	reporter2, err := NewReporter("linux", "", "", "", nil, ignores2)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +36,7 @@ func TestLinuxIgnores(t *testing.T) {
 		regexp.MustCompile("BUG: bug1"),
 		regexp.MustCompile("BUG: bug2"),
 	}
-	reporter3, err := NewReporter("linux", "", "", nil, ignores3)
+	reporter3, err := NewReporter("linux", "", "", "", nil, ignores3)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/report/report.go b/pkg/report/report.go
index 680656f9d..a40fedf95 100644
--- a/pkg/report/report.go
+++ b/pkg/report/report.go
@@ -45,12 +45,12 @@ type Report struct {
 	Maintainers []string
 }
 
-// NewReporter creates reporter for the specified OS:
+// NewReporter creates reporter for the specified OS/vmType:
 // kernelSrc: path to kernel sources directory
 // kernelObj: path to kernel build directory (can be empty for in-tree build)
 // symbols: kernel symbols (result of pkg/symbolizer.ReadSymbols on kernel object file)
 // ignores: optional list of regexps to ignore (must match first line of crash message)
-func NewReporter(os, kernelSrc, kernelObj string, symbols map[string][]symbolizer.Symbol,
+func NewReporter(os, vmType, kernelSrc, kernelObj string, symbols map[string][]symbolizer.Symbol,
 	ignores []*regexp.Regexp) (Reporter, error) {
 	ctor := ctors[os]
 	if ctor == nil {
diff --git a/pkg/report/report_test.go b/pkg/report/report_test.go
index 1459f0694..14d6c45ce 100644
--- a/pkg/report/report_test.go
+++ b/pkg/report/report_test.go
@@ -214,7 +214,7 @@ func forEachFile(t *testing.T, dir string, fn func(t *testing.T, reporter Report
 		if err != nil {
 			t.Fatal(err)
 		}
-		reporter, err := NewReporter(os, "", "", nil, nil)
+		reporter, err := NewReporter(os, "", "", "", nil, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
-- 
cgit mrf-deployment