diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2017-06-15 19:22:00 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2017-06-16 13:22:49 +0200 |
| commit | ebfb71d45615698040818a68b7dc34996ff4c046 (patch) | |
| tree | 5b634c7ac972c1d45f49c493c6e723a545d391ae | |
| parent | 0f4c37b9cf69c9149539202d736429fae8c29f1c (diff) | |
| download | guix-ebfb71d45615698040818a68b7dc34996ff4c046.tar.gz | |
tests: Allow setting of qemu memory-size for system tests.
* gnu/system/vm.scm (common-qemu-options): Remove hardcoded "-m 256". (system-qemu-image/shared-store-script): New keyword argument: #:memory-size.
| -rw-r--r-- | gnu/system/vm.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ad5e6b75bb..392737d078 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -489,20 +489,21 @@ with '-virtfs' options for the host file systems listed in SHARED-FS." #$@(map virtfs-option shared-fs) "-vga std" (format #f "-drive file=~a,if=virtio,cache=writeback,werror=report,readonly" - #$image) - "-m 256")) + #$image))) (define* (system-qemu-image/shared-store-script os #:key (qemu qemu) (graphic? #t) + (memory-size 256) (mappings '()) full-boot? (disk-image-size (* (if full-boot? 500 70) (expt 2 20)))) "Return a derivation that builds a script to run a virtual machine image of -OS that shares its store with the host. +OS that shares its store with the host. The virtual machine runs with +MEMORY-SIZE MiB of memory. MAPPINGS is a list of <file-system-mapping> specifying mapping of host file systems into the guest. @@ -531,7 +532,8 @@ it is mostly useful when FULL-BOOT? is true." (string-join #$kernel-arguments " ")))) #$@(common-qemu-options image (map file-system-mapping-source - (cons %store-mapping mappings))))) + (cons %store-mapping mappings))) + "-m " (number->string #$memory-size))) (define builder #~(call-with-output-file #$output |