From 3c1f0e3b996ff80aa6fffd572cdee6a95c2b97a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Nov 2014 22:58:12 +0100
Subject: [PATCH] vm: Factorize common QEMU options.

* gnu/system/vm.scm (common-qemu-options): New procedure.
  (system-qemu-image/shared-store-script): Use it.
---
 gnu/system/vm.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index a962e41555..dc5b1bafd4 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -391,6 +391,17 @@ with the host."
                 #:register-closures? #f
                 #:copy-inputs? #f)))
 
+(define* (common-qemu-options image)
+  "Return the a string-value gexp with the common QEMU options to boot IMAGE."
+#~(string-append
+     " -enable-kvm -no-reboot -net nic,model=virtio \
+  -virtfs local,path=" #$(%store-prefix) ",security_model=none,mount_tag=store \
+  -net user \
+  -serial stdio \
+  -drive file=" #$image
+  ",if=virtio,cache=writeback,werror=report,readonly \
+  -m 256\n"))
+
 (define* (system-qemu-image/shared-store-script
           os
           #:key
@@ -408,18 +419,11 @@ OS that shares its store with the host."
             (display
              (string-append "#!" #$bash "/bin/sh
 exec " #$qemu "/bin/" #$(qemu-command (%current-system))
-" -enable-kvm -no-reboot -net nic,model=virtio \
-  -virtfs local,path=" #$(%store-prefix) ",security_model=none,mount_tag=store \
-  -net user \
-  -kernel " #$(operating-system-kernel os) "/bzImage \
+" -kernel " #$(operating-system-kernel os) "/bzImage \
   -initrd " #$os-drv "/initrd \
--append \"" #$(if graphic? "" "console=ttyS0 ")
-  "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" \
-  -serial stdio \
-  -drive file=" #$image
-  ",if=virtio,cache=writeback,werror=report,readonly \
-  -m 256
-\n")
+  -append \"" #$(if graphic? "" "console=ttyS0 ")
+  "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" "
+  #$(common-qemu-options image))
              port)
             (chmod port #o555))))