diff mbox series

[bug#68677,4/6] vm: Add ‘cpu-count’ field to <virtual-machine>.

Message ID f4c0dec5e82f0c71034e9196c44a2a0c628b6813.1706027375.git.ludo@gnu.org
State New
Headers show
Series Service for "virtual build machines" | expand

Commit Message

Ludovic Courtès Jan. 23, 2024, 4:48 p.m. UTC 
* gnu/system/vm.scm (<virtual-machine>)[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 mbox series

Patch

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> %virtual-machine
   (operating-system virtual-machine-operating-system) ;<operating-system>
   (qemu             virtual-machine-qemu              ;<package>
                     (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 <virtual-machine>)
                                                 system target)
   (match vm
-    (($ <virtual-machine> os qemu volatile? graphic? memory-size
+    (($ <virtual-machine> 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 <virtual-machine>)
                                    "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