pkg/subsystem: restructure the package

Remove the entity and match subpackages.

Regenerate the linux.go file.

1 files changed, 9 insertions, 10 deletions

diff --git a/tools/syz-query-subsystems/generator.go b/tools/syz-query-subsystems/generator.go
index d35b6e3e4..1eb3305bd 100644
--- a/tools/syz-query-subsystems/generator.go
+++ b/tools/syz-query-subsystems/generator.go
@@ -13,12 +13,12 @@ import (
 	"text/template"
 
 	"github.com/google/syzkaller/pkg/serializer"
-	"github.com/google/syzkaller/pkg/subsystem/entity"
+	"github.com/google/syzkaller/pkg/subsystem"
 )
 
-func generateSubsystemsFile(name string, list []*entity.Subsystem, commitInfo string) ([]byte, error) {
+func generateSubsystemsFile(name string, list []*subsystem.Subsystem, commitInfo string) ([]byte, error) {
 	// Set names first -- we'll need them for filling in the Parents array.
-	objToName := map[*entity.Subsystem]string{}
+	objToName := map[*subsystem.Subsystem]string{}
 	for _, entry := range list {
 		varName := makeVarRegexp.ReplaceAllString(strings.ToLower(entry.Name), "")
 		if varName == "" {
@@ -73,16 +73,16 @@ func generateSubsystemsFile(name string, list []*entity.Subsystem, commitInfo st
 	return format.Source(b.Bytes())
 }
 
-func hierarchyList(list []*entity.Subsystem) []string {
-	children := map[*entity.Subsystem][]*entity.Subsystem{}
+func hierarchyList(list []*subsystem.Subsystem) []string {
+	children := map[*subsystem.Subsystem][]*subsystem.Subsystem{}
 	for _, entry := range list {
 		for _, p := range entry.Parents {
 			children[p] = append(children[p], entry)
 		}
 	}
 	ret := []string{}
-	var dfs func(*entity.Subsystem, string)
-	dfs = func(entry *entity.Subsystem, prefix string) {
+	var dfs func(*subsystem.Subsystem, string)
+	dfs = func(entry *subsystem.Subsystem, prefix string) {
 		ret = append(ret, fmt.Sprintf("%s- %s", prefix, entry.Name))
 		for _, child := range children[entry] {
 			dfs(child, prefix+"  ")
@@ -122,11 +122,10 @@ const fileTemplate = `// Code generated by the syz-query-subsystem tool. DO NOT
 
 package lists
 
-import . "github.com/google/syzkaller/pkg/subsystem/entity"
-import "github.com/google/syzkaller/pkg/subsystem"
+import . "github.com/google/syzkaller/pkg/subsystem"
 
 func init() {
-  subsystem.RegisterList("{{.Name}}", subsystems)
+  RegisterList("{{.Name}}", subsystems)
 }
 
 // The subsystem list: