Merge branch 'feature/multi-monitor' into 'main'
Feature/multi monitor See merge request org/jdrupes/vm-operator!1
This commit is contained in:
commit
82eb6671a3
5 changed files with 12 additions and 2 deletions
|
|
@ -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:
|
||||||
|
|
|
||||||
|
|
@ -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 }
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
+30
|
+1800
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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/>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue