aggregate vm params into a single struct (for ease of extension)

2 files changed, 12 insertions, 6 deletions

diff --git a/manager/main.go b/manager/main.go
index 079055b0b..84b8b7af4 100644
--- a/manager/main.go
+++ b/manager/main.go
@@ -39,13 +39,19 @@ type Config struct {
 func main() {
 	flag.Parse()
 	cfg, syscalls := parseConfig()
+	params, err := json.Marshal(cfg.Params)
+	if err != nil {
+		fatalf("failed to marshal config params: %v", err)
+	}
+	vmCfg := &vm.Config{
+		Workdir:     cfg.Workdir,
+		ManagerPort: cfg.Port,
+		Params:      params,
+		Syscalls:    syscalls,
+	}
 	var instances []vm.Instance
 	for i := 0; i < cfg.Count; i++ {
-		params, err := json.Marshal(cfg.Params)
-		if err != nil {
-			fatalf("failed to marshal config params: %v", err)
-		}
-		inst, err := vm.Create(cfg.Type, cfg.Workdir, syscalls, cfg.Port, i, params)
+		inst, err := vm.Create(cfg.Type, vmCfg, i)
 		if err != nil {
 			fatalf("failed to create an instance: %v", err)
 		}
diff --git a/manager/manager.go b/manager/manager.go
index eb1ca8a3b..ab0372eab 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -142,7 +142,7 @@ func (mgr *Manager) pollMaster() {
 }
 
 func (mgr *Manager) minimizeCorpus() {
-	if len(mgr.corpus) != 0 {
+	if !mgr.cfg.Nocover && len(mgr.corpus) != 0 {
 		// First, sort corpus per call.
 		type Call struct {
 			inputs []RpcInput