From 464d6108b0c5fefbf881a077823a3fbd1d6d0416 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Dec 2021 18:42:52 +0000 Subject: [PATCH] Revert "qemu, runInLinuxVM: change default cpu to qemu64" This reverts commit af180d554b5a81878cd030f65a470f56116c7566. The bug we were working around with this change has been fixed in QEMU 6.2.0. --- nixos/lib/qemu-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 964814e8c602..20bbe9ff5d99 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 qemu64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; 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";