diff --git a/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml b/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml index b55a881..b4abbd5 100644 --- a/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml @@ -67,4 +67,8 @@ - "type": "ide-cd" "bootindex": (undefined) "file": (undefined) + + # "spice": + # "port": 5900 + # "usbRedirects": 2 \ No newline at end of file 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 index 7d22565..06d4e42 100644 --- 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 @@ -72,6 +72,7 @@ class Configuration implements Dto { public String rtcBase = "utc"; public String rtcClock = "rt"; public Drive[] drives; + public Spice spice; } /** @@ -83,6 +84,14 @@ class Configuration implements Dto { public String file; } + /** + * Subsection "spice". + */ + public static class Spice implements Dto { + public int port = 5900; + public int usbRedirects = 2; + } + /** * Check configuration. * 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 index e729ed7..0ca6563 100644 --- a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml @@ -139,7 +139,8 @@ # SPICE (display, channels ...) # https://www.linux-kvm.org/page/SPICE - - [ "-spice", "port=5900,disable-ticketing=on,seamless-migration=on" ] + - [ "-spice", "port=${ vm.spice.port?c },disable-ticketing=on\ + ,seamless-migration=on" ] - [ "-chardev", "spicevmc,id=vdagentdev,name=vdagent" ] - [ "-device", "virtserialport,name=com.redhat.spice.0,\ chardev=vdagentdev" ] @@ -147,10 +148,10 @@ - [ "-audiodev", "driver=spice,id=audio1" ] - [ "-device", "hda-duplex,audiodev=audio1" ] # * USB redirection - - [ "-chardev", "spicevmc,id=charredir0,name=usbredir" ] - - [ "-device", "usb-redir,chardev=charredir0,id=redir0" ] - - [ "-chardev", "spicevmc,id=charredir1,name=usbredir" ] - - [ "-device", "usb-redir,chardev=charredir1,id=redir1" ] + <#list 0.. + - [ "-chardev", "spicevmc,id=charredir${ index },name=usbredir" ] + - [ "-device", "usb-redir,id=redir${ index },chardev=charredir${ index }" ] +