From b50eb251af3b122fb1b2c574dde0c3d16f6a8cfd Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 3 Dec 2024 14:56:42 +0100 Subject: vm: use -cpu cortex-a15 for qemu/arm32 The new qemu versions began to fail with the settings we previously used. It's probably not worth extensive debugging, so let's just do what qemu suggests. qemu-system-arm: Invalid CPU model: max The only valid type is: cortex-a15 --- vm/qemu/qemu.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vm/qemu') diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index a6a61be19..1371a9405 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -162,8 +162,9 @@ var archConfigs = map[string]*archConfig{ }, }, "linux/arm": { - Qemu: "qemu-system-arm", - QemuArgs: "-machine vexpress-a15 -cpu max -accel tcg,thread=multi", + Qemu: "qemu-system-arm", + // 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