kvm: Make CPU model configurable

The previous patch introduced the passthrough mode. This patch makes this option configurable using the `--kvm-cpu-model` flag. The value to be used for nesting is `host-passthrough`. Signed-off-by: Fabian Deutsch <[email protected]>
kubernetes · Feb 16, 2018 · 781101c · 781101c
1 parent e8d3bad
commit 781101c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -61,6 +61,7 @@ const (
 	networkPlugin         = "network-plugin"
 	hypervVirtualSwitch   = "hyperv-virtual-switch"
 	kvmNetwork            = "kvm-network"
+	kvmCPUModel           = "kvm-cpu-model"
 	keepContext           = "keep-context"
 	createMount           = "mount"
 	featureGates          = "feature-gates"
@@ -145,6 +146,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		HostOnlyCIDR:        viper.GetString(hostOnlyCIDR),
 		HypervVirtualSwitch: viper.GetString(hypervVirtualSwitch),
 		KvmNetwork:          viper.GetString(kvmNetwork),
+		KvmCPUModel:         viper.GetString(kvmCPUModel),
 		Downloader:          pkgutil.DefaultDownloader{},
 		DisableDriverMounts: viper.GetBool(disableDriverMounts),
 		UUID:                viper.GetString(uuid),
@@ -379,6 +381,7 @@ func init() {
 	startCmd.Flags().String(hostOnlyCIDR, "192.168.99.1/24", "The CIDR to be used for the minikube VM (only supported with Virtualbox driver)")
 	startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (only supported with HyperV driver)")
 	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (only supported with KVM driver)")
+	startCmd.Flags().String(kvmCPUModel, "custom", "The KVM CPU model name. (only supported with KVM driver)")
 	startCmd.Flags().String(xhyveDiskDriver, "ahci-hd", "The disk driver to use [ahci-hd|virtio-blk] (only supported with xhyve driver)")
 	startCmd.Flags().StringSlice(NFSShare, []string{}, "Local folders to share with Guest via NFS mounts (Only supported on with hyperkit now)")
 	startCmd.Flags().String(NFSSharesRoot, "/nfsshares", "Where to root the NFS Shares (defaults to /nfsshares, only supported with hyperkit now)")

diff --git a/pkg/drivers/kvm/domain.go b/pkg/drivers/kvm/domain.go
@@ -37,7 +37,7 @@ const domainTmpl = `
     <apic/>
     <pae/>
   </features>
-  <cpu mode='host-passthrough'></cpu>
+  <cpu mode='{{.CPUModel}}'/>
   <os>
     <type>hvm</type>
     <boot dev='cdrom'/>

diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go
@@ -44,6 +44,9 @@ type Driver struct {
 	// How many cpus to allocate to the VM
 	CPU int
 
+	// What CPU model to expose
+	CPUModel string
+
 	// The name of the default network
 	Network string
 
@@ -83,6 +86,7 @@ func NewDriver(hostName, storePath string) *Driver {
 		CommonDriver:   &pkgdrivers.CommonDriver{},
 		Boot2DockerURL: constants.DefaultIsoUrl,
 		CPU:            constants.DefaultCPUS,
+		CPUModel:       constants.DefaultCPUModel,
 		DiskSize:       util.CalculateDiskSizeInMB(constants.DefaultDiskSize),
 		Memory:         constants.DefaultMemory,
 		PrivateNetwork: defaultPrivateNetworkName,

diff --git a/pkg/minikube/cluster/types.go b/pkg/minikube/cluster/types.go
@@ -35,6 +35,7 @@ type MachineConfig struct {
 	HostOnlyCIDR        string // Only used by the virtualbox driver
 	HypervVirtualSwitch string
 	KvmNetwork          string             // Only used by the KVM driver
+	KvmCPUModel         string             // Only used by the KVM driver
 	Downloader          util.ISODownloader `json:"-"`
 	DockerOpt           []string           // Each entry is formatted as KEY=VALUE.
 	DisableDriverMounts bool               // Only used by virtualbox and xhyve

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
@@ -89,6 +89,7 @@ const (
 	ShaSuffix           = ".sha256"
 	DefaultMemory       = 2048
 	DefaultCPUS         = 2
+	DefaultCPUModel     = "custom"
 	DefaultDiskSize     = "20g"
 	MinimumDiskSizeMB   = 2000
 	DefaultVMDriver     = "virtualbox"