From 6620a0f6797b4cb244486996aced4b1fd954549d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 13:01:12 +0200
Subject: [PATCH] Fix the installer tests

E.g. http://hydra.nixos.org/build/5561399
---
 doc/manual/man-nixos-rebuild.xml   | 8 ++++----
 lib/test-driver/Machine.pm         | 2 +-
 lib/testing.nix                    | 3 ++-
 modules/virtualisation/qemu-vm.nix | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 4828215977e..0ed9f22ef99 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -128,10 +128,10 @@ $ nixos-rebuild build-vm
 $ ./result/bin/run-*-vm
 </screen></para>
 
-      <para>The VM is implemented using the
-      <literal>qemu-kvm</literal> package.  For best performance, you
-      should load the <literal>kvm-intel</literal> or
-      <literal>kvm-amd</literal> kernel modules.</para>
+      <para>The VM is implemented using the <literal>qemu</literal>
+      package.  For best performance, you should load the
+      <literal>kvm-intel</literal> or <literal>kvm-amd</literal>
+      kernel modules to get hardware virtualisation.</para>
 
       <para>The VM mounts the Nix store of the host through the CIFS
       filesystem.  (<literal>qemu-kvm</literal> automatically starts a
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 615fe09bdfc..f5bf40a1868 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -30,7 +30,7 @@ sub new {
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
-            "qemu-kvm -m 384 " .
+            "$ENV{'qemu'} -enable-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         my $iface = $args->{hdaInterface} || "virtio";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
diff --git a/lib/testing.nix b/lib/testing.nix
index 280cdf579db..653eaf3e9a6 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -28,7 +28,8 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${pkgs.qemu}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" \
+          --set qemu qemu-system-${if pkgs.stdenv.system == "x86_64-linux" then "x86_64" else "i386"}
       '';
   };
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 70487c329a8..6715b494dfb 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -226,7 +226,7 @@ let
             ''
               mkdir $out
               diskImage=$out/disk.img
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
+              ${pkgs.qemu}/bin/qemu-img create -f qcow2 $diskImage "32M"
             '';
           buildInputs = [ pkgs.utillinux ];
         }