bug#22633: Provide a kvm-less qemu / guix system vm

[Leo Famulari <leo@famulari.name>]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

On Fri, Feb 12, 2016 at 09:50:09AM +1100, Jookia wrote:
> On Thu, Feb 11, 2016 at 09:26:12AM -0800, Christopher Allan Webber wrote:
> > So on my Libreboot-enabled machine, KVM does not work.  In fact, even
> > starting qemu with KVM enabled on it appears to crash my whole system.
> > Not only does "guix system vm" not work, even "guix system vm-image" can
> > take the whole machine down!
> 
> Currently the 'solution' I've found is to edit Guix to remove the two instances
> of '--enable-kvm' which works somewhat, though it's slower as there's absolutely
> no acceleration.
> 
> > It would be nice to have a --no-kvm switch, because I'd really like to
> > make use of Guix's nice VM features!

It's not a proper fix, but this patch achieves that on my non-Libreboot
machine. Can you see if it works for you?

[...]

[-- Attachment #2: disable-kvm.patch --]
[-- Type: text/x-diff, Size: 940 bytes --]

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index a095f9d..e4abcb2 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -97,7 +97,7 @@ the #:references-graphs parameter of 'derivation'."
     (_ #f))
 
   (unless (zero?
-           (apply system* qemu "-enable-kvm" "-nographic" "-no-reboot"
+           (apply system* qemu "-nographic" "-no-reboot"
                   "-m" (number->string memory-size)
                   "-net" "nic,model=virtio"
                   "-virtfs"
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index a7c03bd..aa9c421 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -457,7 +457,7 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
                      "\" "))
 
   #~(string-append
-     " -enable-kvm -no-reboot -net nic,model=virtio \
+     " -no-reboot -net nic,model=virtio \
   " #$@(map virtfs-option shared-fs) " \
   -net user \
   -serial stdio -vga std \