summary refs log tree commit diff
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2022-04-10 18:54:59 +0100
committerGitHub <noreply@github.com>2022-04-10 18:54:59 +0100
commitf0848eeb057f5fe191e8aa569dd3c9e218597af4 (patch)
tree1a4845d1d05128bcdcc315d2e61cdb399d785011
parenta47e82e7856bbe1d43991927b5f019d8cde6d200 (diff)
parenta2465483e89026df3ea939f95f8cf8de6717ea9c (diff)
downloadnixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar.gz
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar.bz2
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar.lz
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar.xz
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.tar.zst
nixpkgs-f0848eeb057f5fe191e8aa569dd3c9e218597af4.zip
Merge pull request #167316 from helsinki-systems/feat/opportunistic-kvm
nixos/lib/qemu-common: Opportunistically use KVM
-rw-r--r--nixos/lib/qemu-common.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix
index 20bbe9ff5d9..250f714be0a 100644
--- a/nixos/lib/qemu-common.nix
+++ b/nixos/lib/qemu-common.nix
@@ -23,8 +23,8 @@ rec {
 
   qemuBinary = qemuPkg: {
     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";
+    armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
+    aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
     powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
     powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
     x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";