diff options
| author | John Ericson <git@JohnEricson.me> | 2020-02-01 22:59:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 22:59:37 -0500 |
| commit | 14fbd4146d05c5a0bc72acf7ae0a6d43189d7893 (patch) | |
| tree | 93ff6176cbb46638a8c489b4dbbd95cf81c6b0ab /nixos/lib | |
| parent | 95c350736d9e420febc6861bd6237a3a2a8e4925 (diff) | |
| parent | 2bd296a7e9551fcc74330460d6bf47810a8f9555 (diff) | |
Merge pull request #59855 from volth/qemu-cpu-passthru
runInLinuxVM, test-driver: pass host's cpu type to guest vm
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 774f66b4804e0..859d9e975fec7 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"; } |