diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15 13:49:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-20 10:52:46 +0100 |
| commit | aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf (patch) | |
| tree | f0c7eba8df6bfb40b7666c0dbb6272c6a031ddd9 /nixos/modules/virtualisation/qemu-vm.nix | |
| parent | 8a0843c3c4929d38b9a79f61449fc63c6a27e4a0 (diff) | |
| download | nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.gz nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.bz2 nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.lz nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.xz nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.zst nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.zip | |
virtualisation.qemu.program: Remove
This option is defined in qemu-vm.nix, but that module is not always imported. http://hydra.nixos.org/build/44817443 (cherry picked from commit 03c55005dfd6fbcd5cf8e00128a3bb6336b3bc0f)
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 05fe13ba7c71..0bb2e7f36873 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -70,7 +70,7 @@ let '')} # Start QEMU. - exec ${cfg.qemu.program} \ + exec ${pkgs.qemu_test}/bin/qemu-kvm \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ @@ -299,14 +299,6 @@ in }; virtualisation.qemu = { - program = mkOption { - type = types.path; - default = "${pkgs.qemu_kvm}/bin/qemu-kvm"; - defaultText = "\${pkgs.qemu_kvm}/bin/qemu-kvm"; - example = literalExample "\${pkgs.qemu_test}/bin/qemu-kvm"; - description = "The QEMU variant used to start the VM."; - }; - options = mkOption { type = types.listOf types.unspecified; |