From 350f4ffc211908fed1507b105460d0ce8400ea65 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 6 May 2025 13:58:45 +0200 Subject: Revert "vm/qemu: use -machine virt and -cpu max for arm32" This reverts commit 85a5a23f228f2de970f578bf3b452a23a222c09d. --- vm/qemu/qemu.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index 3253815de..398eb8047 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -161,8 +161,8 @@ var archConfigs = map[string]*archConfig{ }, "linux/arm": { Qemu: "qemu-system-arm", - // The buildroot image we use does not boot with vexpress-a15/cortex-a15. - QemuArgs: "-machine virt -cpu max -accel tcg,thread=multi", + // For some reason, new qemu-system-arm versions complain that "The only valid type is: cortex-a15". + QemuArgs: "-machine vexpress-a15 -cpu cortex-a15 -accel tcg,thread=multi", NetDev: "virtio-net-device", RngDev: "virtio-rng-device", UseNewQemuImageOptions: true, -- cgit mrf-deployment