summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-12-06 17:27:01 +0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-12-06 17:29:09 +0200
commitb2e315f97f645fc70627febd43ddd62dd4de1412 (patch)
treef59bcf4a2a254db32ae1f9acefdbd66b3a55289b /nixos/modules
parent019131c8260d72baa2bafa3d2b97fe14dd63dc5c (diff)
downloadnixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar.gz
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar.bz2
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar.lz
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar.xz
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.tar.zst
nixlib-b2e315f97f645fc70627febd43ddd62dd4de1412.zip
nixos/qemu-vm: Pass gic-version=host for AArch64
This is required on the ThunderX CPUs on the Packet.net Type-2A
machines that have a GICv3. For some reason the default is to create a
GICv2 independent of the host hardware...
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 770e5fb848a9..26f7945a4eda 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -18,7 +18,7 @@ let
     "i686-linux" = "${qemu}/bin/qemu-kvm";
     "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64";
     "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
-    "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host";
+    "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
   }.${pkgs.stdenv.system};
 
   # FIXME: figure out a common place for this instead of copy pasting