pkg/mgrconfig: move derived fields into separate struct

Users should not be concerned with the internal derived fields.
Move all derived fields into a separate struct before adding more.
This leaves config.go as a better documentation for end users.

2 files changed, 24 insertions, 20 deletions

diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go
index 587a095bb..39973664d 100644
--- a/tools/syz-symbolize/symbolize.go
+++ b/tools/syz-symbolize/symbolize.go
@@ -34,11 +34,13 @@ func main() {
 		os.Exit(1)
 	}
 	cfg := &mgrconfig.Config{
-		TargetOS:     *flagOS,
-		TargetArch:   *flagArch,
-		TargetVMArch: *flagArch,
-		KernelObj:    *flagKernelObj,
-		KernelSrc:    *flagKernelSrc,
+		Derived: mgrconfig.Derived{
+			TargetOS:     *flagOS,
+			TargetArch:   *flagArch,
+			TargetVMArch: *flagArch,
+		},
+		KernelObj: *flagKernelObj,
+		KernelSrc: *flagKernelSrc,
 	}
 	cfg.CompleteKernelDirs()
 	reporter, err := report.NewReporter(cfg)
diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go
index f4c108a52..eae70e2ae 100644
--- a/tools/syz-testbuild/testbuild.go
+++ b/tools/syz-testbuild/testbuild.go
@@ -67,21 +67,23 @@ func main() {
 	}
 	defer os.RemoveAll(dir)
 	cfg := &mgrconfig.Config{
-		Target:       *flagOS + "/" + *flagArch,
-		TargetOS:     *flagOS,
-		TargetArch:   *flagArch,
-		TargetVMArch: *flagArch,
-		HTTP:         ":0",
-		Workdir:      dir,
-		KernelSrc:    *flagKernelSrc,
-		KernelObj:    *flagKernelSrc,
-		Syzkaller:    *flagSyzkaller,
-		Sandbox:      *flagSandbox,
-		SSHUser:      "root",
-		Procs:        1,
-		Cover:        false,
-		Type:         vmType,
-		VM:           json.RawMessage([]byte(fmt.Sprintf(`{ "count": %v, "cpu": 2, "mem": 2048 }`, numTests))),
+		Target:    *flagOS + "/" + *flagArch,
+		HTTP:      ":0",
+		Workdir:   dir,
+		KernelSrc: *flagKernelSrc,
+		KernelObj: *flagKernelSrc,
+		Syzkaller: *flagSyzkaller,
+		Sandbox:   *flagSandbox,
+		SSHUser:   "root",
+		Procs:     1,
+		Cover:     false,
+		Type:      vmType,
+		VM:        json.RawMessage([]byte(fmt.Sprintf(`{ "count": %v, "cpu": 2, "mem": 2048 }`, numTests))),
+		Derived: mgrconfig.Derived{
+			TargetOS:     *flagOS,
+			TargetArch:   *flagArch,
+			TargetVMArch: *flagArch,
+		},
 	}
 	if err := mgrconfig.Complete(cfg); err != nil {
 		fail(err)