From patchwork Fri Nov 1 12:39:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32775 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 14DAA27BBEC; Fri, 1 Nov 2024 12:43:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CE89427BBEA for ; Fri, 1 Nov 2024 12:43:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzZ-0007fc-Uj; Fri, 01 Nov 2024 08:43:05 -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 1t6qzY-0007f8-Ns for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -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 1t6qzY-0000RJ-EE for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=pAofRbnxToVi4RIqw1SV52z93/SrNkep7mbTbmgkTQAEJaOh+DXL67LXxLAqJC5Z9HoCVsCRwBEAS3LT3Gi23tNgh+4HwvrdjAK+5kNrrzZ15d2LYip74dTvcQmFnh9mJbqbfAH9gQAHqd9Oh3qK6PgUPzQjrkW+jJHAyPkMSNZZ58/9lDgT8CCnyEkG8Ws1esFg3QkMdEIIYAkuuVKCmY3NcZcX/mWBoLO17exAnhNu7UdQO3n9nLIZEgQnyArnpk991tKG3UBAbLiyYW59OhKzFO5PJeOqshO+Fuw4C4kZbFb3ooIRVPnsMlYCb9sBaftZVPtz4bfAY+WN2vRIzw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzY-0007vQ-8o; Fri, 01 Nov 2024 08:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 3/9] system/vm: Fix virtual-machine bug. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046494030356 (code B ref 74151); Fri, 01 Nov 2024 12:43:04 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:20 +0000 Received: from localhost ([127.0.0.1]:49211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyn-0007tR-Cf for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:19 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:59757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyh-0007sr-Fi for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:13 -0400 Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7ee020ec76dso1650815a12.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464870; x=1731069670; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=WwOSH/ejflE723gP2hfJQFJuy4OaYIaqdKGZhfKAb+t0UJvyguUVVB97HBMwGKKGPN QA8ZXNVa7aIHSlXsFsuhuvx2D8lKfa0RlEJ1TEt8njcRgmd79w4MsosIYkw+/lRx6Ry4 kifa2ahpI6qR5uoQWlVr7XPJ8OmjxnTSgYmL7CQC3W87QB42fswrzZo0x1tPPsHBZZDR 1nTk2iANDJs2VQr8iIY3ZtGyjg82NH0ZDJid+WfD3UcLFynJO1IPTCs2bjB4xKzo6UOS v2u4A1k18k3dgqS7B0ikOvdSEnWn38WqeQuqJ6OlNh3o9sTKNVq5p7H2agOls/XBzFPn 4YaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464870; x=1731069670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=wAOzDt63W0VpgK/ZXxiBqbp436nn0qJq6DR6xuBzPzREPKiLi/+OOZeY5PihzHMVWH P6AijU5LSOdNI4XwkynmHFsnwviujA9t0THr2PUucnx8oPnROD2EmRn4tK3MtLlZemoL mE9ml9INYcj7nwDgL56zqzyLifu4+lCTRd4hXsCHmJxD73O8xR/J3QCffdNvtK8Oh4XE 8ED5VBi6p80XvqPkYbUCp61dEBrJ3O18aJ/CpnIz4yY+Fqa3aUq45ZMhxH0l+q6m3Gw6 yKeBh6vqTqJhQZoJzaoi/pzVmlfVGtCTfVoB3c0X21zbbDhuZm9k8Y6CphoL91DGj6Vc 8n3A== X-Gm-Message-State: AOJu0Yw3YNYrG2V3qhNc5Y1kFimfWTcH50byMeIAusfsvy/llIg4eL8H pVktxbtSdMKD7VVx2RfE+3x5Oghrq8FJxm2BzNv3M6ankVJDwtCzrcv4Nnvd X-Google-Smtp-Source: AGHT+IGL+kPiMMIaJZ/W8dkVF5rMY/ngcBgH9wBZP8bt9+gAlYlpUQbhOflRfDxLkoJdSvCCtGDhUA== X-Received: by 2002:a17:90a:468c:b0:2e2:dd25:9b00 with SMTP id 98e67ed59e1d1-2e8f10723fbmr24691162a91.22.1730464870371; Fri, 01 Nov 2024 05:41:10 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:09 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:23 +0900 Message-ID: <397067fb8b2b50efef8092d77c93c04e0f28225a.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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 The virtual-machine syntax would not accept a single operating-system field, which was puzzling. * gnu/system/vm.scm (virtual-machine): Add a pattern matching a single literal 'operating-system' field and value. Change-Id: If207fd71df3a3f763b2e63229eafa82f63e80773 --- gnu/system/vm.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a2743453e7..4a400056d7 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -422,10 +422,14 @@ (define-record-type* %virtual-machine (default #f))) (define-syntax virtual-machine - (syntax-rules () + (syntax-rules (operating-system) "Declare a virtual machine running the specified OS, with the given options." - ((_ os) ;shortcut + ((_ (operating-system os)) + ;; Also accept the long form (virtual-machine (operating-system os)), for + ;; correctness. + (%virtual-machine (operating-system os))) + ((_ os) ;shortcut (%virtual-machine (operating-system os))) ((_ fields ...) (%virtual-machine fields ...))))