diff options
| author | volth <volth@volth.com> | 2019-04-18 19:35:51 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2020-01-15 23:35:00 +0000 |
| commit | 2bd296a7e9551fcc74330460d6bf47810a8f9555 (patch) | |
| tree | cb6c0bdddbda63095eab08b995dec7731a47d186 /nixos/lib | |
| parent | a991de49f2aa3ab8716c73f6bfba722df23a3b50 (diff) | |
| download | nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar.gz nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar.bz2 nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar.lz nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar.xz nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.tar.zst nixlib-2bd296a7e9551fcc74330460d6bf47810a8f9555.zip | |
runInLinuxVM, test-driver: pass host's cpu type to guest vm
'kvm64' is the most generic CPU, which does not support SSE4.2, AVX and other ISA extentions.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/qemu-flags.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 774f66b4804e..859d9e975fec 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -17,9 +17,9 @@ in else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu host"; 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"; - x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu host"; }.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm"; } |