From fdf3056a936c680bc2fbe78c1610855926fb863e Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 10 Apr 2024 11:17:28 +0200 Subject: [PATCH] board/common: add fallback to tcg acceleration in make run Align both qemu targets for 'make run' to use kvm with tcg as fallback and -cpu max instead of guessing. This allows running Infix on systems that do not have, or do not allow, kvm acceleration. This is a temporary fix before we refactor 'make run', see issue #388 Signed-off-by: Joachim Wiberg --- board/common/qemu/Config.in.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/common/qemu/Config.in.in b/board/common/qemu/Config.in.in index 272a1037..03002433 100644 --- a/board/common/qemu/Config.in.in +++ b/board/common/qemu/Config.in.in @@ -63,8 +63,8 @@ endchoice config QEMU_MACHINE string "Select emulated machine" - default "qemu-system-aarch64 -M virt -cpu cortex-a72" if QEMU_aarch64 - default "qemu-system-x86_64 -M q35,accel=kvm -cpu host" if QEMU_x86_64 + default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu max" if QEMU_aarch64 + default "qemu-system-x86_64 -M pc,accel=kvm:tcg -cpu max" if QEMU_x86_64 help You should not have to change this setting, although you may want to tweak it, or change the acceleration.