Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support running x86 QEMU on arm64 #19228

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Support running x86 QEMU on arm64 #19228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b08324a
Support running x86 QEMU on arm64
spowelljr Jul 10, 2024
3f865e4
QEMU: refactor selecting hardware selection into func
spowelljr Jul 15, 2024
250786e
log what hardware acceleration value is used
spowelljr Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions pkg/drivers/qemu/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (

"k8s.io/klog/v2"
pkgdrivers "k8s.io/minikube/pkg/drivers"
"k8s.io/minikube/pkg/minikube/detect"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/firewall"
"k8s.io/minikube/pkg/minikube/out"
Expand Down Expand Up @@ -412,14 +413,11 @@ func (d *Driver) Start() error {
}

// hardware acceleration is important, it increases performance by 10x
if runtime.GOOS == "darwin" {
// On macOS, enable the Hypervisor framework accelerator.
startCmd = append(startCmd,
"-accel", "hvf")
} else if _, err := os.Stat("/dev/kvm"); err == nil && runtime.GOOS == "linux" {
// On Linux, enable the Kernel Virtual Machine accelerator.
accel := hardwareAcceleration()
if accel != "" {
klog.Infof("Using %s for hardware acceleration", accel)
startCmd = append(startCmd,
"-accel", "kvm")
"-accel", accel)
}

spowelljr marked this conversation as resolved.
Show resolved Hide resolved
startCmd = append(startCmd,
Expand Down Expand Up @@ -546,6 +544,21 @@ func (d *Driver) Start() error {
return WaitForTCPWithDelay(fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort), time.Second)
}

func hardwareAcceleration() string {
if detect.IsAmd64M1Emulation() {
return "tcg"
}
if runtime.GOOS == "darwin" {
// On macOS, enable the Hypervisor framework accelerator.
return "hvf"
}
if _, err := os.Stat("/dev/kvm"); err == nil && runtime.GOOS == "linux" {
// On Linux, enable the Kernel Virtual Machine accelerator.
return "kvm"
}
return ""
}

func isBootpdError(err error) bool {
if runtime.GOOS != "darwin" {
return false
Expand Down
4 changes: 4 additions & 0 deletions pkg/minikube/registry/drvs/qemu2/qemu2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"k8s.io/minikube/pkg/drivers/qemu"

"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/detect"
"k8s.io/minikube/pkg/minikube/download"
"k8s.io/minikube/pkg/minikube/driver"
"k8s.io/minikube/pkg/minikube/localpath"
Expand Down Expand Up @@ -76,6 +77,9 @@ func qemuFirmwarePath(customPath string) (string, error) {
if runtime.GOOS == "windows" {
return "C:\\Program Files\\qemu\\share\\edk2-x86_64-code.fd", nil
}
if detect.IsAmd64M1Emulation() {
return "/opt/homebrew/opt/qemu/share/qemu/edk2-x86_64-code.fd", nil
}
arch := runtime.GOARCH
// For macOS, find the correct brew installation path for qemu firmware
if runtime.GOOS == "darwin" {
Expand Down