From ed37a6b465cb75d86ecf2265a8a8869717e05739 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 18:30:26 +0200
Subject: VM builds: Use qemu instead of the obsolete qemu-kvm

---
 pkgs/build-support/vm/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b1eb82ed8303..492c7f3e8187 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -16,7 +16,9 @@ rec {
   # in parallel).  So apply a patch to increase the timeout to 120s.
   kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel;
 
-  kvm = pkgs.qemu_kvm;
+  kvm = pkgs.qemu;
+
+  qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386");
 
 
   modulesClosure = makeModulesClosure {
@@ -195,7 +197,8 @@ rec {
 
 
   qemuCommandLinux = ''
-    ${kvm}/bin/qemu-kvm \
+    ${qemuProg} \
+      -enable-kvm \
       ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
       -net nic,model=virtio \
@@ -393,7 +396,8 @@ rec {
 
   qemuCommandGeneric = ''
     PATH="${samba}/sbin:$PATH" \
-    ${kvm}/bin/qemu-kvm \
+    ${qemuProg} \
+      -enable-kvm \
       -nographic -no-reboot \
       -smb $(pwd) -hda $diskImage \
       $QEMU_OPTS
-- 
cgit 1.4.1