From 24e0160a4a319a849a9d48da52883a1979df76f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 30 Jun 2014 06:49:38 +0200
Subject: [PATCH] linux-initrd: Make the virtio kernel modules optional.
* gnu/system/linux-initrd.scm (qemu-initrd): Add #:virtio? parameter.
Use it.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass
'qemu-initrd' #:virtio?.
(virtualized-operating-system): Likewise.
---
gnu/system/linux-initrd.scm | 18 +++++++++++++-----
gnu/system/vm.scm | 5 ++++-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 17fec4f7f46..5e3263e37c2 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -203,16 +203,18 @@ (define (file-system->spec fs)
(define* (qemu-initrd file-systems
#:key
- guile-modules-in-chroot?
(qemu-networking? #t)
- volatile-root?)
+ virtio?
+ volatile-root?
+ guile-modules-in-chroot?)
"Return a monadic derivation that builds an initrd for use in a QEMU guest
where the store is shared with the host. FILE-SYSTEMS is a list of
file-systems to be mounted by the initrd, possibly in addition to the root
file system specified on the kernel command line via '--root'.
When QEMU-NETWORKING? is true, set up networking with the standard QEMU
-parameters.
+parameters. When VIRTIO? is true, load additional modules so the initrd can
+be used as a QEMU guest with para-virtualized I/O drivers.
When VOLATILE-ROOT? is true, the root file system is writable but any changes
to it are lost.
@@ -221,6 +223,11 @@ (define* (qemu-initrd file-systems
the new root. This is necessary is the file specified as '--load' needs
access to these modules (which is the case if it wants to even just print an
exception and backtrace!)."
+ (define virtio-modules
+ ;; Modules for Linux para-virtualized devices, for use in QEMU guests.
+ '("virtio.ko" "virtio_ring.ko" "virtio_pci.ko"
+ "virtio_balloon.ko" "virtio_blk.ko" "virtio_net.ko"))
+
(define cifs-modules
;; Modules needed to mount CIFS file systems.
'("md4.ko" "ecb.ko" "cifs.ko"))
@@ -235,8 +242,9 @@ (define (file-system-type-predicate type)
(define linux-modules
;; Modules added to the initrd and loaded from the initrd.
- `("virtio.ko" "virtio_ring.ko" "virtio_pci.ko"
- "virtio_balloon.ko" "virtio_blk.ko" "virtio_net.ko"
+ `(,@(if (or virtio? qemu-networking?)
+ virtio-modules
+ '())
,@(if (find (file-system-type-predicate "cifs") file-systems)
cifs-modules
'())
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3c9c9c83e1d..61b10f18dfc 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -154,6 +154,7 @@ (define* (expression->derivation-in-linux-vm name exp
(initrd (if initrd ; use the default initrd?
(return initrd)
(qemu-initrd %linux-vm-file-systems
+ #:virtio? #t
#:guile-modules-in-chroot? #t))))
(define builder
@@ -349,7 +350,9 @@ (define (virtualized-operating-system os)
"Return an operating system based on OS suitable for use in a virtualized
environment with the store shared with the host."
(operating-system (inherit os)
- (initrd (cut qemu-initrd <> #:volatile-root? #t))
+ (initrd (cut qemu-initrd <>
+ #:volatile-root? #t
+ #:virtio? #t))
(file-systems (cons* (file-system
(mount-point "/")
(device "/dev/vda1")
--
GitLab