mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-01-21 08:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

build_library/qemu_template.sh: enable accel=hvf on Macs

Browse Source 
Macs don't support KVM but have the equivalent HVF machine.  Also switch
to the more modern q35 machine. The arm64 branch hasn't been tested.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2022-02-11 16:44:36 +01:00
parent 06b2ad30d1
commit 018034d223
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build_library/qemu_template.sh
View File

@ -160,14 +160,23 @@ if [ "${SAFE_ARGS}" -eq 1 ]; then
# Disable KVM, for testing things like UEFI which don't like it
set -- -machine accel=tcg "$@"
else
accel=""
case "$(uname)" in
Linux)
accel=kvm ;;
Darwin)
accel=hvf ;;
*)
die "Unsupported OS" ;;
esac
case "${VM_BOARD}+$(uname -m)" in
amd64-usr+x86_64)
# Emulate the host CPU closely in both features and cores.
set -- -machine accel=kvm -cpu host -smp "${VM_NCPUS}" "$@" ;;
set -- -machine q35,accel=$accel -cpu host -smp "${VM_NCPUS}" "$@" ;;
amd64-usr+*)
set -- -machine pc-q35-2.8 -cpu kvm64 -smp 1 -nographic "$@" ;;
arm64-usr+aarch64)
set -- -machine virt,accel=kvm,gic-version=3 -cpu host -smp "${VM_NCPUS}" -nographic "$@" ;;
arm64-usr+aarch64|arm64-usr+arm64)
set -- -machine virt,accel=$accel,gic-version=3 -cpu host -smp "${VM_NCPUS}" -nographic "$@" ;;
arm64-usr+*)
if test "${VM_NCPUS}" -gt 4 ; then
VM_NCPUS=4