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)

+2 -13
+1 -1
nixos/lib/testing.nix
··· 29 29 cp ${./test-driver/Logger.pm} $libDir/Logger.pm 30 30 31 31 wrapProgram $out/bin/nixos-test-driver \ 32 - --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \ 32 + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ 33 33 --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" 34 34 ''; 35 35 };
-3
nixos/modules/testing/test-instrumentation.nix
··· 119 119 120 120 networking.usePredictableInterfaceNames = false; 121 121 122 - # Make sure we use a patched QEMU that ignores file ownership. 123 - virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm"; 124 - 125 122 # Make it easy to log in as root when running the test interactively. 126 123 users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; 127 124
+1 -9
nixos/modules/virtualisation/qemu-vm.nix
··· 70 70 '')} 71 71 72 72 # Start QEMU. 73 - exec ${cfg.qemu.program} \ 73 + exec ${pkgs.qemu_test}/bin/qemu-kvm \ 74 74 -name ${vmName} \ 75 75 -m ${toString config.virtualisation.memorySize} \ 76 76 ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ ··· 299 299 }; 300 300 301 301 virtualisation.qemu = { 302 - program = mkOption { 303 - type = types.path; 304 - default = "${pkgs.qemu_kvm}/bin/qemu-kvm"; 305 - defaultText = "\${pkgs.qemu_kvm}/bin/qemu-kvm"; 306 - example = literalExample "\${pkgs.qemu_test}/bin/qemu-kvm"; 307 - description = "The QEMU variant used to start the VM."; 308 - }; 309 - 310 302 options = 311 303 mkOption { 312 304 type = types.listOf types.unspecified;