Merge branch 'feature/multi-monitor' into 'main'

Feature/multi monitor

See merge request org/jdrupes/vm-operator!1
This commit is contained in:
Michael Lipp 2024-08-05 20:21:36 +00:00
commit 82eb6671a3
5 changed files with 12 additions and 2 deletions

View file

@ -1410,6 +1410,9 @@ spec:
display: display:
type: object type: object
properties: properties:
outputs:
type: integer
default: 1
spice: spice:
type: object type: object
properties: properties:

View file

@ -201,6 +201,9 @@ data:
</#list> </#list>
display: display:
<#if cr.spec.vm.display.outputs?? >
outputs: ${ cr.spec.vm.display.outputs.asInt?c }
</#if>
<#if cr.spec.vm.display.spice??> <#if cr.spec.vm.display.spice??>
spice: spice:
port: ${ cr.spec.vm.display.spice.port.asInt?c } port: ${ cr.spec.vm.display.spice.port.asInt?c }

View file

@ -1 +1 @@
+30 +1800

View file

@ -245,6 +245,9 @@ public class Configuration implements Dto {
*/ */
public static class Display implements Dto { public static class Display implements Dto {
/** The number of outputs. */
public int outputs = 1;
/** The spice. */ /** The spice. */
public Spice spice; public Spice spice;
} }

View file

@ -137,7 +137,8 @@
- [ "-device", "virtio-rng-pci,rng=objrng0,id=rng0" ] - [ "-device", "virtio-rng-pci,rng=objrng0,id=rng0" ]
# * Graphics and Audio Card # * Graphics and Audio Card
# This is the only video "card" without a flickering cursor. # 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" ] - [ "-device", "ich9-intel-hda,id=sound0" ]
# Network # Network
<#assign nwCounter = 0/> <#assign nwCounter = 0/>