--- Begin Message ---
|
Subject: |
[PATCH] tests: Allow setting of qemu memory-size for system tests. |
|
Date: |
Thu, 15 Jun 2017 19:16:54 +0200 |
* gnu/system/vm.scm (common-qemu-options): Remove hardcoded "-m 256".
(system-qemu-image/shared-store-script): New keyword argument: #:memory-size.
Default to 256 (MiB).
---
gnu/system/vm.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index ad5e6b75b..392737d07 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
--
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#27387] [PATCH] tests: Allow setting of qemu memory-size for system tests. |
|
Date: |
Fri, 16 Jun 2017 13:27:49 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) |
Ludovic Courtès writes:
> Jan Nieuwenhuizen <address@hidden> skribis:
>
>> * gnu/system/vm.scm (common-qemu-options): Remove hardcoded "-m 256".
>> (system-qemu-image/shared-store-script): New keyword argument: #:memory-size.
>> Default to 256 (MiB).
>
> Good catch. LGTM, thanks!
Pushed to master as ebfb71d45615698040818a68b7dc34996ff4c046
janneke
--
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
--- End Message ---