Merge pull request #14324 from anjannath/qemu-test

[macos: podman-machine] look for firmware (edk2-code-fd) based on the path of qemu binary

1 files changed, 19 insertions, 0 deletions

diff --git a/pkg/machine/qemu/options_darwin_arm64.go b/pkg/machine/qemu/options_darwin_arm64.go
index 8930041b7..d75237938 100644
--- a/pkg/machine/qemu/options_darwin_arm64.go
+++ b/pkg/machine/qemu/options_darwin_arm64.go
@@ -4,6 +4,8 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/containers/common/pkg/config"
 )
 
 var (
@@ -38,6 +40,22 @@ func getOvmfDir(imagePath, vmName string) string {
 }
 
 /*
+ * When QEmu is installed in a non-default location in the system
+ * we can use the qemu-system-* binary path to figure the install
+ * location for Qemu and use it to look for edk2-code-fd
+ */
+func getEdk2CodeFdPathFromQemuBinaryPath() string {
+	cfg, err := config.Default()
+	if err == nil {
+		execPath, err := cfg.FindHelperBinary(QemuCommand, true)
+		if err == nil {
+			return filepath.Clean(filepath.Join(filepath.Dir(execPath), "..", "share", "qemu"))
+		}
+	}
+	return ""
+}
+
+/*
  *  QEmu can be installed in multiple locations on MacOS, especially on
  *  Apple Silicon systems.  A build from source will likely install it in
  *  /usr/local/bin, whereas Homebrew package management standard is to
@@ -45,6 +63,7 @@ func getOvmfDir(imagePath, vmName string) string {
  */
 func getEdk2CodeFd(name string) string {
 	dirs := []string{
+		getEdk2CodeFdPathFromQemuBinaryPath(),
 		"/opt/homebrew/opt/podman/libexec/share/qemu",
 		"/usr/local/share/qemu",
 		"/opt/homebrew/share/qemu",