19/24: services: hurd-vm: ‘image’ field has to be an <image> record.

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit 096a208b45100f3c4705f18128ef462c07d23090
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 22 14:54:09 2023 +0200

    services: hurd-vm: ‘image’ field has to be an <image> record.
    
    * gnu/services/virtualization.scm (<hurd-vm-configuration>)[image]:
    Document as being an <image> record.
    (hurd-vm-disk-image): Remove call to ‘system-image’.
    (hurd-vm-shepherd-service): Add call to ‘system-image’.
    * gnu/tests/virtualization.scm (hurd-vm-disk-image-raw): Remove call to
    ‘system-image’.
    * doc/guix.texi (Virtualization Services): Adjust accordingly.
---
 doc/guix.texi                   |  4 ++--
 gnu/services/virtualization.scm |  9 ++++-----
 gnu/tests/virtualization.scm    | 11 +++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 103f6b4c64..1869b59ef6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35770,8 +35770,8 @@ permissive OpenSSH secure shell daemon listening on 
port 2222
 The QEMU package to use.
 
 @item @code{image} (default: @var{hurd-vm-disk-image})
-The procedure used to build the disk-image built from this
-configuration.
+The image object representing the disk image of this virtual machine
+(@pxref{System Images}).
 
 @item @code{disk-size} (default: @code{'guess})
 The size of the disk image.
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index ca000f5d28..258b503461 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -1101,7 +1101,7 @@ that will be listening to receive secret keys on port 
1004, TCP."
                (default %hurd-vm-operating-system))
   (qemu        hurd-vm-configuration-qemu               ;file-like
                (default qemu-minimal))
-  (image       hurd-vm-configuration-image              ;string
+  (image       hurd-vm-configuration-image              ;<image>
                (thunked)
                (default (hurd-vm-disk-image this-record)))
   (disk-size   hurd-vm-configuration-disk-size          ;number or 'guess
@@ -1126,9 +1126,8 @@ is added to the OS specified in CONFIG."
          (disk-size (hurd-vm-configuration-disk-size config))
          (type      (lookup-image-type-by-name 'hurd-qcow2))
          (os->image (image-type-constructor type)))
-    (system-image
-     (image (inherit (os->image os))
-            (size disk-size)))))
+    (image (inherit (os->image os))
+           (size disk-size))))
 
 (define (hurd-vm-port config base)
   "Return the forwarded vm port for this childhurd config."
@@ -1170,7 +1169,7 @@ is added to the OS specified in CONFIG."
                       "-m" (number->string #$memory-size)
                       #$@net-options
                       #$@options
-                      "--hda" #+image
+                      "--hda" #+(system-image image)
 
                       ;; Cause the service to be respawned if the guest
                       ;; reboots (it can reboot for instance if it did not
diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm
index 73c8099b79..41253968e9 100644
--- a/gnu/tests/virtualization.scm
+++ b/gnu/tests/virtualization.scm
@@ -230,12 +230,11 @@
   (let ((os ((@@ (gnu services virtualization) secret-service-operating-system)
              (hurd-vm-configuration-os config)))
         (disk-size (hurd-vm-configuration-disk-size config)))
-    (system-image
-     (image
-      (inherit hurd-disk-image)
-      (format 'disk-image)
-      (size disk-size)
-      (operating-system os)))))
+    (image
+     (inherit hurd-disk-image)
+     (format 'disk-image)
+     (size disk-size)
+     (operating-system os))))
 
 (define %childhurd-os
   (simple-operating-system