From patchwork Fri Sep 22 12:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54159 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BB01D27BBEB; Fri, 22 Sep 2023 13:56:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9435F27BBEA for ; Fri, 22 Sep 2023 13:56:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjfhN-0001Pn-Gz; Fri, 22 Sep 2023 08:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjfhJ-0001O9-Sv for guix-patches@gnu.org; Fri, 22 Sep 2023 08:55:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjfhJ-0008BS-Kc for guix-patches@gnu.org; Fri, 22 Sep 2023 08:55:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjfhU-0005jU-6r for guix-patches@gnu.org; Fri, 22 Sep 2023 08:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66156] [PATCH 08/12] services: hurd-vm: =?utf-8?b?4oCYaW1hZ2U=?= =?utf-8?b?4oCZ?= field has to be an record. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 12:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66156 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66156@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66156-submit@debbugs.gnu.org id=B66156.169538733021954 (code B ref 66156); Fri, 22 Sep 2023 12:56:04 +0000 Received: (at 66156) by debbugs.gnu.org; 22 Sep 2023 12:55:30 +0000 Received: from localhost ([127.0.0.1]:35599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjfgv-0005hw-BG for submit@debbugs.gnu.org; Fri, 22 Sep 2023 08:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjfgN-0005ea-3S for 66156@debbugs.gnu.org; Fri, 22 Sep 2023 08:54:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjfg7-0007nW-65; Fri, 22 Sep 2023 08:54:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tyLy0lQfDi/ivo0oyExa9j0PWTGiBCNaTJYJKER3804=; b=q/iw6oOuAUDlMmKrZoO4 sGE2gV+Pm8lmgZTEM0kIT4PsaCAOCPFB24+2zaFk0zBxou1hKkEMJmYvrLJk9d/eDc1X3wARboYNQ sSJc1RysM23KvPL13AsrP5LLZchXl6JO8Y7Qmra5VF40FNHyNEHZHyVMW0/YuEKjtJP32wkPqifxS WQItxJshE8QQtsSR+Pz1hdisD6sPmLT50Gbx0tyjq91KJEsKXhBbfo7aeGaEko1Xgcyzsp1+DcpaI S51mLvM6S0/n2ZISH6ZaAMwQBmVDrmgoGdprS6yHA0CkQWyuGDPIXBy7iMnPor1hx/dh03kvknyTg mqzebjM+4uWz8g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 22 Sep 2023 14:54:09 +0200 Message-ID: <5140f6c61c7b377f97b6ff5d85ae31931c9f9b24.1695386493.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/virtualization.scm ()[image]: Document as being an 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 ca48d6c404..472e2e0958 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35766,8 +35766,8 @@ Virtualization Services 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 @@ (define-record-type* (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 ; (thunked) (default (hurd-vm-disk-image this-record))) (disk-size hurd-vm-configuration-disk-size ;number or 'guess @@ -1126,9 +1126,8 @@ (define (hurd-vm-disk-image 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 @@ (define (hurd-vm-shepherd-service 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 @@ (define (hurd-vm-disk-image-raw config) (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