diff options
| author | Martin Schwaighofer <mschwaig@users.noreply.github.com> | 2021-11-22 16:38:20 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-11-30 13:56:12 +0000 |
| commit | aaecb3b239df058363d3dcdcf3f92f7b8d4e2b9f (patch) | |
| tree | 2be37e0a16a17ffd8174f5c1fe2b44302cb66934 | |
| parent | qemu: emit warnings when KVM acceleration is not usable (diff) | |
| download | nixpkgs-origin/backport-125948-to-release-21.11.tar.gz | |
qemu, runInLinuxVM: change default cpu to qemu64origin/backport-125948-to-release-21.11
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
(cherry picked from commit abbe8cbc4843c213947abef70eb11f10ebea96f1)
| -rw-r--r-- | nixos/lib/qemu-common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 1a1f7531feb0..f3af85040bd6 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; |