From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GCmDHSPur2UvKQEAe85BDQ:P1 (envelope-from ) for ; Tue, 23 Jan 2024 17:49:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GCmDHSPur2UvKQEAe85BDQ (envelope-from ) for ; Tue, 23 Jan 2024 17:49:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=m1RMvjNa; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706028579; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YYW9L6k4pr50iqQfBFgYB7wR6KR6IcUqwS0F8xifygA=; b=eY/1br8ocoheEj2Wmd2gkL4mR4pOSKzuA8HbN9q9pCz+V7IG3cvl3bvcVPOkh4nFdMOc8f 4R/RQOFVyhS/Y7HHpfA9jj8sjQyCEZo8V61plGkoHAYCF+p/IY8ZjKzF8R3p17AAJdrc2O i8YwXYWMeKzQoYPR+1rSq9v10G2vTfbqazsPUOCS9kaYX4pM6d7VHOgWxc5itKx5lycLQA LrKOux0GhAt1nhPpcbWvXiNeK11AyjrY+izWS7j7TYCHl3PrkldJrRqiuthayacUAbZpd4 r9RHHzBGj8t/X3SK6Kb+jYs2RhSqVPJbZS9YUCsbbgMoJPawVesuZ8urjpuRoA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=m1RMvjNa; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706028579; a=rsa-sha256; cv=none; b=iRzmORurcIEKVWYgr/JYbAYnZIAYtQcwgyUwzM+P4VTVNJJH5Zm+6e2O1bOoE7xXibXuT8 POLr37y9UocmuHRqfq2huHCE5Hs+O7sbyGTyud7DVhiuHejX5B17KjTiNcODNrWdgHWkhC yd8BCNEzEVtnH3qf6XtXoD9tCndzcFDB21H/9nOOIsHc7AyO3tUqNBaxsDdlpiEoRRSp8e UvNLPmdee2i8O/Xt2G4S4BPntsdSo74DwYAQO/+oFNIqiGxepDsY17xKmBrwnM+kH3p7hc WDhwmxb/6rsa2g2KH8C/SYt+AOFRJONaR4A/ZxnP6fDZk4qzUkRlN++uiO46wg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5E45F3FA6F for ; Tue, 23 Jan 2024 17:49:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSJxM-0003vg-Ks; Tue, 23 Jan 2024 11:49:00 -0500 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 1rSJxL-0003uX-0T for guix-patches@gnu.org; Tue, 23 Jan 2024 11:48:59 -0500 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 1rSJxK-0004Nz-OT for guix-patches@gnu.org; Tue, 23 Jan 2024 11:48:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSJxP-000496-F9 for guix-patches@gnu.org; Tue, 23 Jan 2024 11:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68677] [PATCH 4/6] vm: Add =?UTF-8?Q?=E2=80=98cpu-count=E2=80=99?= field to . Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Jan 2024 16:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68677@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 68677-submit@debbugs.gnu.org id=B68677.170602853715881 (code B ref 68677); Tue, 23 Jan 2024 16:49:03 +0000 Received: (at 68677) by debbugs.gnu.org; 23 Jan 2024 16:48:57 +0000 Received: from localhost ([127.0.0.1]:43886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSJxI-00047z-N4 for submit@debbugs.gnu.org; Tue, 23 Jan 2024 11:48:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSJxD-00046a-DP for 68677@debbugs.gnu.org; Tue, 23 Jan 2024 11:48:51 -0500 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 1rSJx2-0004Le-JV; Tue, 23 Jan 2024 11:48:41 -0500 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=YYW9L6k4pr50iqQfBFgYB7wR6KR6IcUqwS0F8xifygA=; b=m1RMvjNaeDGvOC6XhMId CI1D1njt0wnQ5L0/P8mJxxyU8rxk5btNyT1m3R6FXdOokN2ow/EEIjZk1Ce63cafKtdEWHAUwy8YN jnqdi9zwgDjLRCZL2bnZ3E6vBBJoEnQndDXsuguLcwjUWvwhyHDFvwAiMcgPG3IyRjymmIW+ZwH1H Bdorr6Trgf0Ds28MY0Fjql6FPnW23CwUjURVc3rHJVeoTzHNjhLyUw5bBNQWNaKhIWzK01+9dOBTE tieMV1r0aigmfHWHOfy4ACEBQy7wBm3NgjAXGBluGKJ2h/vAcariX8ih/C2uSDJdS6lPhSijczmL5 AswpkYCybaPq3A==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 23 Jan 2024 17:48:19 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.36 X-Migadu-Queue-Id: 5E45F3FA6F X-Spam-Score: -6.36 X-Migadu-Scanner: mx11.migadu.com X-TUID: FaE+/NOorUvP * gnu/system/vm.scm ()[cpu-count]: New field. (virtual-machine-compiler): Honor it. Change-Id: I907a89365f32ac7a9981c4ae5f59cf6eb199c3cc --- gnu/system/vm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a95f615e6b..ef4c180058 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -75,6 +75,7 @@ (define-module (gnu system vm) virtual-machine? virtual-machine-operating-system virtual-machine-qemu + virtual-machine-cpu-count virtual-machine-volatile? virtual-machine-graphic? virtual-machine-memory-size @@ -326,6 +327,8 @@ (define-record-type* %virtual-machine (operating-system virtual-machine-operating-system) ; (qemu virtual-machine-qemu ; (default qemu-minimal)) + (cpu-count virtual-machine-cpu-count ;integer + (default 1)) (volatile? virtual-machine-volatile? ;Boolean (default #t)) (graphic? virtual-machine-graphic? ;Boolean @@ -363,7 +366,7 @@ (define (port-forwardings->qemu-options forwardings) (define-gexp-compiler (virtual-machine-compiler (vm ) system target) (match vm - (($ os qemu volatile? graphic? memory-size + (($ os qemu cpus volatile? graphic? memory-size disk-image-size forwardings date) (let ((options (append (if (null? forwardings) @@ -372,6 +375,10 @@ (define-gexp-compiler (virtual-machine-compiler (vm ) "user,model=virtio-net-pci," (port-forwardings->qemu-options forwardings)))) + (if (> cpus 1) + `("-smp" ,(string-append "cpus=" + (number->string cpus))) + '()) (if date `("-rtc" ,(string-append -- 2.41.0