Merge pull request #25155 from baude/movedetect

Move detection of libkrun and intel

Author: openshift-merge-bot[bot]

cmd/podman/machine/machine.go

@@ -8,15 +8,13 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/containers/podman/v5/cmd/podman/registry"
 	"github.com/containers/podman/v5/cmd/podman/validate"
 	"github.com/containers/podman/v5/libpod/events"
-	"github.com/containers/podman/v5/pkg/machine/define"
 	"github.com/containers/podman/v5/pkg/machine/env"
 	provider2 "github.com/containers/podman/v5/pkg/machine/provider"
 	"github.com/containers/podman/v5/pkg/machine/vmconfigs"
@@ -59,9 +57,6 @@ func machinePreRunE(c *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	if provider.VMType() == define.LibKrun && runtime.GOARCH == "amd64" {
-		return errors.New("libkrun is not supported on Intel based machines. Please revert to the applehv provider")
-	}
 	return rootlessOnly(c, args)
 }
 

pkg/machine/provider/platform_darwin.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -36,6 +37,9 @@ func Get() (vmconfigs.VMProvider, error) {
 	case define.AppleHvVirt:
 		return new(applehv.AppleHVStubber), nil
 	case define.LibKrun:
+		if runtime.GOARCH == "amd64" {
+			return nil, errors.New("libkrun is not supported on Intel based machines. Please revert to the applehv provider")
+		}
 		return new(libkrun.LibKrunStubber), nil
 	default:
 		return nil, fmt.Errorf("unsupported virtualization provider: `%s`", resolvedVMType.String())