syz-manager/config: rename to syz-manager/mgrconfig

We have 2 packages with the same name: pkg/config and syz-manager/config.
This leads to constant clashes. We either rename one to pkgconfig or
another to mgrconfig. This is not good and will become worse when/if
we have another program-specific config in a separate package.

Rename manager config to mgrconfig.
Other program-specific configs can use the same convention
in future -- fooconfig.

2 files changed, 5 insertions, 5 deletions

diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go
index 38e7eb8d4..17dc87944 100644
--- a/tools/syz-crush/crush.go
+++ b/tools/syz-crush/crush.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	. "github.com/google/syzkaller/pkg/log"
-	"github.com/google/syzkaller/syz-manager/config"
+	"github.com/google/syzkaller/syz-manager/mgrconfig"
 	"github.com/google/syzkaller/vm"
 )
 
@@ -29,7 +29,7 @@ var (
 
 func main() {
 	flag.Parse()
-	cfg, _, err := config.Parse(*flagConfig)
+	cfg, _, err := mgrconfig.Parse(*flagConfig)
 	if err != nil {
 		Fatalf("%v", err)
 	}
@@ -80,7 +80,7 @@ func main() {
 	wg.Wait()
 }
 
-func runInstance(cfg *config.Config, vmPool *vm.Pool, index int) {
+func runInstance(cfg *mgrconfig.Config, vmPool *vm.Pool, index int) {
 	inst, err := vmPool.Create(index)
 	if err != nil {
 		Logf(0, "failed to create instance: %v", err)
diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go
index 6f26f695f..317d42fc0 100644
--- a/tools/syz-repro/repro.go
+++ b/tools/syz-repro/repro.go
@@ -14,7 +14,7 @@ import (
 	"github.com/google/syzkaller/csource"
 	. "github.com/google/syzkaller/pkg/log"
 	"github.com/google/syzkaller/repro"
-	"github.com/google/syzkaller/syz-manager/config"
+	"github.com/google/syzkaller/syz-manager/mgrconfig"
 	"github.com/google/syzkaller/vm"
 )
 
@@ -26,7 +26,7 @@ var (
 func main() {
 	os.Args = append(append([]string{}, os.Args[0], "-v=10"), os.Args[1:]...)
 	flag.Parse()
-	cfg, _, err := config.Parse(*flagConfig)
+	cfg, _, err := mgrconfig.Parse(*flagConfig)
 	if err != nil {
 		Fatalf("%v", err)
 	}