From 13c1006f3bc19d8db3468ffaa257c08cd25e3ace Mon Sep 17 00:00:00 2001
From: Fabio Rapposelli <fabio@vmware.com>
Date: Tue, 5 May 2015 11:24:52 +0200
Subject: [PATCH] CPU count fixes to `vmwarefusion` - Added
 `--vmwarefusion-cpu-count` parameter - Defaults to 1 Virtual CPU

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
---
 drivers/vmwarefusion/fusion_darwin.go | 15 ++++++++++-----
 drivers/vmwarefusion/vmx_darwin.go    |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go
index 99ebffc80a..f485334e7b 100644
--- a/drivers/vmwarefusion/fusion_darwin.go
+++ b/drivers/vmwarefusion/fusion_darwin.go
@@ -40,7 +40,7 @@ type Driver struct {
 	IPAddress      string
 	Memory         int
 	DiskSize       int
-	CPUs           int
+	CPU            int
 	ISO            string
 	Boot2DockerURL string
 	CaCertPath     string
@@ -71,6 +71,12 @@ func GetCreateFlags() []cli.Flag {
 			Name:   "vmwarefusion-boot2docker-url",
 			Usage:  "Fusion URL for boot2docker image",
 		},
+		cli.IntFlag{
+			EnvVar: "FUSION_CPU_COUNT",
+			Name:   "vmwarefusion-cpu-count",
+			Usage:  "number of CPUs for the machine (-1 to use the number of CPUs available)",
+			Value:  1,
+		},
 		cli.IntFlag{
 			EnvVar: "FUSION_MEMORY_SIZE",
 			Name:   "vmwarefusion-memory-size",
@@ -136,21 +142,20 @@ func (d *Driver) DriverName() string {
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.Memory = flags.Int("vmwarefusion-memory-size")
+	d.CPU = flags.Int("vmwarefusion-cpu-count")
 	d.DiskSize = flags.Int("vmwarefusion-disk-size")
 	d.Boot2DockerURL = flags.String("vmwarefusion-boot2docker-url")
 	d.ISO = path.Join(d.storePath, isoFilename)
 	d.SwarmMaster = flags.Bool("swarm-master")
 	d.SwarmHost = flags.String("swarm-host")
 	d.SwarmDiscovery = flags.String("swarm-discovery")
-	d.CPUS = runtime.NumCPU()
 	d.SSHUser = "docker"
 	d.SSHPort = 22
 
 	// We support a maximum of 16 cpu to be consistent with Virtual Hardware 10
 	// specs.
-	d.CPUs = int(runtime.NumCPU())
-	if d.CPUs > 16 {
-		d.CPUs = 16
+	if d.CPU > 16 {
+		d.CPU = 16
 	}
 
 	return nil
diff --git a/drivers/vmwarefusion/vmx_darwin.go b/drivers/vmwarefusion/vmx_darwin.go
index 7a51031e6e..c4e75af526 100644
--- a/drivers/vmwarefusion/vmx_darwin.go
+++ b/drivers/vmwarefusion/vmx_darwin.go
@@ -60,7 +60,7 @@ virtualHW.productCompatibility = "hosted"
 virtualHW.version = "10"
 msg.autoanswer = "TRUE"
 uuid.action = "create"
-numvcpus = "{{.CPUs}}"
+numvcpus = "{{.CPU}}"
 hgfs.mapRootShare = "FALSE"
 hgfs.linkRootShare = "FALSE"
 `