15/24: services: childhurd: Bump default qemu memory to 2048MB.

[guix-commits]

jpoiret pushed a commit to branch master
in repository guix.

commit 09657f3ee70d232f1c7eb21d0bbef98181138a31
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu May 18 09:30:53 2023 +0200

    services: childhurd: Bump default qemu memory to 2048MB.
    
    When booting with pci-arbiter and rumpdisk and using 1024MB of memory for
    qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot
    messages.  At least 1200MB is required, currently.
    
    * gnu/services/virtualization.scm (<hurd-vm-configuration>)[memory-size]: 
Bump
    to 2048.
    * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too.  Update
    example `guix system image' and "qemu" command lines too.
    
    Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/services/virtualization.scm    | 4 ++--
 gnu/system/examples/bare-hurd.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 506f5a7ab6..eef7ffd1c7 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Ryan Moe <ryan.moe@gmail.com>
 ;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
@@ -1106,7 +1106,7 @@ that will be listening to receive secret keys on port 
1004, TCP."
   (disk-size   hurd-vm-configuration-disk-size          ;number or 'guess
                (default 'guess))
   (memory-size hurd-vm-configuration-memory-size        ;number
-               (default 512))
+               (default 2048))
   (options     hurd-vm-configuration-options            ;list of string
                (default `("--snapshot")))
   (id          hurd-vm-configuration-id                 ;#f or integer [1..]
diff --git a/gnu/system/examples/bare-hurd.tmpl 
b/gnu/system/examples/bare-hurd.tmpl
index f0dd0cf742..463c7ee798 100644
--- a/gnu/system/examples/bare-hurd.tmpl
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -5,12 +5,12 @@
 
 ;; To build a disk image for a virtual machine, do
 ;;
-;;     ./pre-inst-env guix system image --target=i586-pc-gnu \
+;;     ./pre-inst-env guix system image --image-type=hurd-raw \
 ;;         gnu/system/examples/bare-hurd.tmpl
 ;;
 ;; You may run it like so
 ;;
-;;     guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \
+;;     guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \
 ;;      -device rtl8139,netdev=net0 -netdev 
user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \
 ;;      -snapshot -hda <the-image>
 ;;