[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/84: services: childhurd: Bump default qemu memory to 2048MB.
From: |
guix-commits |
Subject: |
21/84: services: childhurd: Bump default qemu memory to 2048MB. |
Date: |
Wed, 14 Jun 2023 06:23:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 32003be074676093cd204405d24d7bf3502e8c09
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.
---
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 2e311e3813..886b73f8c7 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-2022 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>
@@ -1100,7 +1100,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>
;;
- 70/84: gnu: cmake-minimal: Skip tests for the Hurd., (continued)
- 70/84: gnu: cmake-minimal: Skip tests for the Hurd., guix-commits, 2023/06/14
- 41/84: gnu: findutils: Move test-strerror_r from XFAIL to skip for the Hurd., guix-commits, 2023/06/14
- 43/84: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/14
- 36/84: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/06/14
- 56/84: gnu: curl: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 71/84: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/14
- 76/84: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/06/14
- 72/84: gnu: graphite2: Skip test for the Hurd., guix-commits, 2023/06/14
- 82/84: DRAFT hurd: Support second boot., guix-commits, 2023/06/14
- 62/84: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/14
- 21/84: services: childhurd: Bump default qemu memory to 2048MB.,
guix-commits <=
- 03/84: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/14
- 23/84: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/14
- 52/84: gnu: c-ares: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 54/84: gnu: libgcrypt: Skip hanging benchmark tests for the Hurd., guix-commits, 2023/06/14
- 60/84: gnu: e2fsprogs: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 83/84: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/14
- 84/84: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/14
- 65/84: gnu: ruby-2.6: Skip test for the Hurd., guix-commits, 2023/06/14
- 81/84: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/14
- 17/84: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/14