Add outputs property.

mnlipp · Aug 4, 2024 · b93dba4 · b93dba4
1 parent d029dcb
commit b93dba4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/deploy/crds/vms-crd.yaml b/deploy/crds/vms-crd.yaml
@@ -1410,6 +1410,9 @@ spec:
                     display:
                       type: object
                       properties:
+                        outputs:
+                          type: integer
+                          default: 1
                         spice:
                           type: object
                           properties:

diff --git a/...jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml b/...jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
@@ -201,6 +201,9 @@ data:
         </#list>
         
         display:
+          <#if cr.spec.vm.display.outputs?? >
+          outputs: ${ cr.spec.vm.display.outputs.asInt?c }
+          </#if>
           <#if cr.spec.vm.display.spice??>
           spice:
             port: ${ cr.spec.vm.display.spice.port.asInt?c }

diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
@@ -245,6 +245,9 @@ public static class Drive implements Dto {
      */
     public static class Display implements Dto {
 
+        /** The number of outputs. */
+        public int outputs = 1;
+
         /** The spice. */
         public Spice spice;
     }

diff --git a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml
@@ -137,7 +137,8 @@
     - [ "-device", "virtio-rng-pci,rng=objrng0,id=rng0" ]
     # * Graphics and Audio Card
     #   This is the only video "card" without a flickering cursor.
-    - [ "-device", "virtio-vga,id=video0,max_outputs=1" ]
+    - [ "-device", "virtio-vga,id=video0,max_outputs=${ vm.display.outputs },\
+        max_hostmem=${ (vm.display.outputs * 256 * 1024 * 1024)?c }" ]
     - [ "-device", "ich9-intel-hda,id=sound0" ]
     # Network
     <#assign nwCounter = 0/>