From aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Dec 2016 13:49:15 +0100 Subject: [PATCH] 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) --- nixos/lib/testing.nix | 2 +- nixos/modules/testing/test-instrumentation.nix | 3 --- nixos/modules/virtualisation/qemu-vm.nix | 10 +--------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 2efe7a5b879..0fc3978315c 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 206df50a420..099ead3d846 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -119,9 +119,6 @@ let kernel = config.boot.kernelPackages.kernel; in networking.usePredictableInterfaceNames = false; - # Make sure we use a patched QEMU that ignores file ownership. - virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm"; - # Make it easy to log in as root when running the test interactively. users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 05fe13ba7c7..0bb2e7f3687 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;