kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

virt is still the machine type, duh

pull/14182/head
Sharif Elgamal 2022-05-16 23:21:11 -07:00
parent 823ea12bc2
commit 4115024320
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/drivers/qemu/qemu.go
View File

@ -337,10 +337,6 @@ func (d *Driver) Start() error {
if d.MachineType != "" { if d.MachineType != "" {
machineType := d.MachineType machineType := d.MachineType
if runtime.GOOS == "darwin" {
// highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details
machineType += ",highmem=off"
}
startCmd = append(startCmd, startCmd = append(startCmd,
"-M", machineType, "-M", machineType,
) )

5
pkg/minikube/registry/drvs/qemu2/qemu2.go
View File

@ -114,11 +114,12 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
qemuMachine = "" // default qemuMachine = "" // default
qemuCPU = "" // default qemuCPU = "" // default
case "arm64": case "arm64":
// highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
qemuMachine = "virt" qemuMachine = "virt,highmem=off"
qemuCPU = "cortex-a72" qemuCPU = "cortex-a72"
} else if runtime.GOOS == "linux" { } else if runtime.GOOS == "linux" {
qemuMachine = "gic-version=3" qemuMachine = "virt,gic-version=3"
qemuCPU = "host" qemuCPU = "host"
} }
default: default: