containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25155 from baude/movedetect 

Move detection of libkrun and intel
This commit is contained in:
openshift-merge-bot[bot] 2025-01-30 15:37:07 +00:00 committed by GitHub
parent 357fd2546e 398377fd97
commit 48f8742278
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/machine/machine.go
View File

@ -8,7 +8,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"runtime"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -16,7 +15,6 @@ import (
"github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/libpod/events"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/env"
provider2 "github.com/containers/podman/v5/pkg/machine/provider" provider2 "github.com/containers/podman/v5/pkg/machine/provider"
"github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/pkg/machine/vmconfigs"
@ -59,9 +57,6 @@ func machinePreRunE(c *cobra.Command, args []string) error {
if err != nil { if err != nil {
return err 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) return rootlessOnly(c, args)
} }

4
pkg/machine/provider/platform_darwin.go
View File

@ -2,6 +2,7 @@ package provider
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
@ -36,6 +37,9 @@ func Get() (vmconfigs.VMProvider, error) {
case define.AppleHvVirt: case define.AppleHvVirt:
return new(applehv.AppleHVStubber), nil return new(applehv.AppleHVStubber), nil
case define.LibKrun: 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 return new(libkrun.LibKrunStubber), nil
default: default:
return nil, fmt.Errorf("unsupported virtualization provider: `%s`", resolvedVMType.String()) return nil, fmt.Errorf("unsupported virtualization provider: `%s`", resolvedVMType.String())