git.iko.soy/typeable/nixpkgs
on master help sign in
qemu, runInLinuxVM: change default cpu to qemu64

The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596

commitaf180d554b5a81878cd030f65a470f56116c7566 authorMartin Schwaighofer <mschwaig@users.noreply.github.com> dateMon 22 Nov 2021, 16:38 (5 years ago) parent08bbd12
1 file changed+1−1
nixos/lib/qemu-common.nix+1−1
nixos/lib/qemu-common.nix+1−1
@@ -22,7 +22,7 @@ rec {
2222 else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
2323
2424 qemuBinary = qemuPkg: {
25− x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
25+ x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64";
2626 armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
2727 aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
2828 powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";