pkg/mgrconfig: move Subsystem from pkg/cover

mgrconfig used to be "leaf" package that can be imported by anything.
Recently it started importing pkg/cover for Subsystem definition.
It leads to the following import cycle if I try to import
pkg/host from pkg/cover:

package github.com/google/syzkaller/pkg/bisect
	imports github.com/google/syzkaller/pkg/build
	imports github.com/google/syzkaller/pkg/mgrconfig
	imports github.com/google/syzkaller/pkg/cover
	imports github.com/google/syzkaller/pkg/host
	imports github.com/google/syzkaller/pkg/csource
	imports github.com/google/syzkaller/pkg/mgrconfig:
import cycle not allowed

Move Subsystem into pkg/mgrconfig itself.

1 files changed, 5 insertions, 4 deletions

diff --git a/pkg/cover/report.go b/pkg/cover/report.go
index 94540b6c8..b838d5f5f 100644
--- a/pkg/cover/report.go
+++ b/pkg/cover/report.go
@@ -8,6 +8,7 @@ import (
 	"sort"
 
 	"github.com/google/syzkaller/pkg/cover/backend"
+	"github.com/google/syzkaller/pkg/mgrconfig"
 	"github.com/google/syzkaller/sys/targets"
 )
 
@@ -16,7 +17,7 @@ type ReportGenerator struct {
 	srcDir    string
 	objDir    string
 	buildDir  string
-	subsystem []Subsystem
+	subsystem []mgrconfig.Subsystem
 	*backend.Impl
 }
 
@@ -27,13 +28,13 @@ type Prog struct {
 
 var RestorePC = backend.RestorePC
 
-func MakeReportGenerator(target *targets.Target, vm, objDir, srcDir, buildDir string,
-	subsystem []Subsystem, moduleObj []string, modules map[string]backend.KernelModule) (*ReportGenerator, error) {
+func MakeReportGenerator(target *targets.Target, vm, objDir, srcDir, buildDir string, subsystem []mgrconfig.Subsystem,
+	moduleObj []string, modules map[string]backend.KernelModule) (*ReportGenerator, error) {
 	impl, err := backend.Make(target, vm, objDir, srcDir, buildDir, moduleObj, modules)
 	if err != nil {
 		return nil, err
 	}
-	subsystem = append(subsystem, Subsystem{
+	subsystem = append(subsystem, mgrconfig.Subsystem{
 		Name:  "all",
 		Paths: []string{""},
 	})