From 02c119a104c35ef22540608432d191e5007df236 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2009 11:43:51 +0000
Subject: [PATCH] * Workaround for hangs on x86_64.

svn path=/nixos/branches/modular-nixos/; revision=16590
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 333c14f137f3..d8ab12daa933 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -42,7 +42,10 @@ let
           ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
       fi
       
+      # -no-kvm-irqchip is needed to prevent the CIFS mount from
+      # hanging the VM on x86_64.
       ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+          -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
           -kernel ${config.system.build.system}/kernel \