[PATCH] Use -cpu max instead of -cpu host

Alyssa Ross
2025-08-14T12:51:37Z

-cpu host doesn't work if KVM isn't available. This should do the
right thing in both cases.

Fixes: 0f2d3c7 ("Makefile: add run target to test with QEMU")
Fixes: 3ebad5c ("run-vm.nix: add for running installer test VMs")
Fixes: eaafee7 ("Makefile: add run target")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
Demi, could you please check whether this solves the problem for you on
Qubes OS? I'd prefer to do it this way if it works, because it lets
QEMU take care of the problem rather than our script.

img/app/Makefile | 2 +-
release/installer/run-vm.nix | 2 +-
vm/sys/net/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/img/app/Makefile b/img/app/Makefile
index 5380ffb..9665a6b 100644
--- a/img/app/Makefile
+++ b/img/app/Makefile
@@ -148,7 +148,7 @@ start-virtiofsd: scripts/start-virtiofsd.elb
.PHONY: start-virtiofsd

run-qemu: $(imgdir)/appvm/blk/root.img start-vhost-user-net start-virtiofsd
- @../../scripts/run-qemu.sh -m 256 -cpu host -kernel $(KERNEL) -vga none \
+ @../../scripts/run-qemu.sh -m 256 -cpu max -kernel $(KERNEL) -vga none \
-drive file=$(imgdir)/appvm/blk/root.img,if=virtio,format=raw,readonly=on \
-append "root=PARTLABEL=root nokaslr" \
-gdb unix:build/gdb.sock,server,nowait \
diff --git a/release/installer/run-vm.nix b/release/installer/run-vm.nix
index dda9127..37b470c 100644
--- a/release/installer/run-vm.nix
+++ b/release/installer/run-vm.nix
@@ -28,7 +28,7 @@ writeShellScript "run-spectrum-installer-vm.sh" ''
truncate -s 20G "$img"
exec 3<>"$img"
rm -f "$img"
- exec ${../../scripts/run-qemu.sh} -cpu host -m 4G \
+ exec ${../../scripts/run-qemu.sh} -cpu max -m 4G \
-device virtio-keyboard \
-device virtio-mouse \
-device virtio-gpu \
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile
index 785bd46..e681940 100644
--- a/vm/sys/net/Makefile
+++ b/vm/sys/net/Makefile
@@ -99,7 +99,7 @@ start-vhost-user-net:
../../../scripts/start-passt.elb

run-qemu: $(vmdir)/netvm/blk/root.img
- @../../../scripts/run-qemu.sh -m 256 -cpu host -kernel $(KERNEL) -vga none \
+ @../../../scripts/run-qemu.sh -m 256 -cpu max -kernel $(KERNEL) -vga none \
-drive file=$(vmdir)/netvm/blk/root.img,if=virtio,format=raw,readonly=on \
-append "root=PARTLABEL=root nokaslr" \
-gdb unix:build/gdb.sock,server,nowait \

base-commit: 586577f3015397afacd83bc185454f4cc3c8028f
--
2.50.0