From f5c3f8e59e266f9fef629fb6a86a133fbc92a537 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 Sep 2023 21:57:33 +0200 Subject: system: vm: Remove unused variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 05a9d1f378e2e13e8f759be926ea368358afc27c, which removed its sole user. * gnu/system/vm.scm (%linux-vm-file-systems): Remove. (mapping->file-system): Add comment about “cache=loose”. --- gnu/system/vm.scm | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b7bccd72a4..70f7b00116 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -87,41 +87,6 @@ ;; conservative default. (define %default-msize-value (* 100 (expt 2 20))) ;100 MiB -(define %linux-vm-file-systems - ;; File systems mounted for 'derivation-in-linux-vm'. These are shared with - ;; the host over 9p. - ;; - ;; The 9p documentation says that cache=loose is "intended for exclusive, - ;; read-only mounts", without additional details. It's much faster than the - ;; default cache=none, especially when copying and registering store items. - ;; Thus, use cache=loose, except for /xchg where we want to ensure - ;; consistency. - (list (file-system - (mount-point (%store-prefix)) - (device "store") - (type "9p") - (needed-for-boot? #t) - (flags '(read-only)) - (options (format #f "trans=virtio,cache=loose,msize=~a" - %default-msize-value)) - (check? #f)) - (file-system - (mount-point "/xchg") - (device "xchg") - (type "9p") - (needed-for-boot? #t) - (options (format #f "trans=virtio,msize=~a" %default-msize-value)) - (check? #f)) - (file-system - (mount-point "/tmp") - (device "tmp") - (type "9p") - (needed-for-boot? #t) - (options (format #f "trans=virtio,cache=loose,msize=~a" - %default-msize-value)) - (check? #f)))) - - ;;; ;;; VMs that share file systems with the host. ;;; @@ -145,6 +110,12 @@ (device (file-system->mount-tag source)) (type "9p") (flags (if writable? '() '(read-only))) + + ;; The 9p documentation says that cache=loose is "intended for + ;; exclusive, read-only mounts", without additional details. It's + ;; faster than the default cache=none, especially when copying and + ;; registering store items. Thus, use cache=loose, except for writable + ;; mounts, to ensure consistency. (options (string-append "trans=virtio" (if writable? "" ",cache=loose") ",msize=" (number->string %default-msize-value))) -- cgit v1.2.3