From 43cb964e1773db2b8f01ccaeaaada3a641365e91 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:35:03 +0200 Subject: [PATCH] nixos/qemu-vm: Set QEMU command line depending on architecture --- nixos/modules/virtualisation/qemu-vm.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3c89ca68113b..22fa35964503 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -14,6 +14,12 @@ with lib; let qemu = config.system.build.qemu or pkgs.qemu_test; + qemuKvm = { + "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"; + }.${pkgs.stdenv.system}; vmName = if config.networking.hostName == "" @@ -72,11 +78,10 @@ let '')} # Start QEMU. - exec ${qemu}/bin/qemu-kvm \ + exec ${qemuKvm} \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ - ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \