From 75a4825bf48ef332525f13fe935e410d61c8c6a0 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Mon, 16 Aug 2021 11:10:28 +0200
Subject: Add 'ramfb' option to Libvirt's mediated device representation

---
 .../openslx/libvirt/domain/device/HostdevMdev.java | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java b/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
index d25a6eb..7f6bb81 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
@@ -49,6 +49,26 @@ public class HostdevMdev extends Hostdev implements HostdevAddressableSource<Hos
 		this.setXmlElementAttributeValueOnOff( "display", on );
 	}
 
+	/**
+	 * Checks whether the hostdev mediated device memory framebuffer is on or off.
+	 * 
+	 * @return state whether the hostdev mediated device memory framebuffer is on or off.
+	 */
+	public boolean isMemoryFramebufferOn()
+	{
+		return this.getXmlElementAttributeValueAsBool( "ramfb" );
+	}
+
+	/**
+	 * Sets the state of the hostdev mediated device memory framebuffer.
+	 * 
+	 * @param on state whether the hostdev mediated device memory framebuffer is on or off.
+	 */
+	public void setMemoryFramebufferOn( boolean on )
+	{
+		this.setXmlElementAttributeValueOnOff( "ramfb", on );
+	}
+
 	/**
 	 * Returns the hostdev mediated device model.
 	 * 
@@ -112,7 +132,7 @@ public class HostdevMdev extends Hostdev implements HostdevAddressableSource<Hos
 	 * @author Manuel Bentele
 	 * @version 1.0
 	 */
-	enum Model
+	public enum Model
 	{
 		// @formatter:off
 		VFIO_PCI( "vfio-pci" ),
-- 
cgit v1.2.3-55-g7522


From 0877322403e7a122706abe4a2bcf39653675d352 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Mon, 16 Aug 2021 11:11:37 +0200
Subject: Add Libvirt support for QEMU command line options

---
 .../java/org/openslx/libvirt/domain/Domain.java    |  76 ++++++++++
 .../org/openslx/libvirt/domain/DomainTest.java     |  21 +++
 ...qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml | 168 +++++++++++++++++++++
 3 files changed, 265 insertions(+)
 create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml

diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java
index 7d49f14..d6f9a8f 100644
--- a/src/main/java/org/openslx/libvirt/domain/Domain.java
+++ b/src/main/java/org/openslx/libvirt/domain/Domain.java
@@ -8,6 +8,8 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import javax.xml.XMLConstants;
+
 import org.openslx.libvirt.domain.device.Device;
 import org.openslx.libvirt.domain.device.Controller;
 import org.openslx.libvirt.domain.device.ControllerFloppy;
@@ -42,6 +44,8 @@ import org.openslx.libvirt.xml.LibvirtXmlNode;
 import org.openslx.libvirt.xml.LibvirtXmlResources;
 import org.openslx.libvirt.xml.LibvirtXmlSerializationException;
 import org.openslx.libvirt.xml.LibvirtXmlValidationException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
@@ -56,6 +60,16 @@ import org.xml.sax.InputSource;
  */
 public class Domain extends LibvirtXmlDocument
 {
+	/**
+	 * XML namespace URI for QEMU command line elements in the Libvirt domain XML document.
+	 */
+	private static final String XMLNS_QEMU_NS_URI = "http://libvirt.org/schemas/domain/qemu/1.0";
+
+	/**
+	 * XML namespace prefix for QEMU command line elements in the Libvirt domain XML document.
+	 */
+	private static final String XMLNS_QEMU_NS_PREFIX = "qemu";
+
 	/**
 	 * Creates Libvirt domain XML document from {@link String} providing Libvirt domain XML content.
 	 * 
@@ -1051,6 +1065,35 @@ public class Domain extends LibvirtXmlDocument
 		return Domain.filterDevices( Video.class, this.getDevices() );
 	}
 
+	/**
+	 * Returns the values of QEMU command line arguments from the Libvirt domain XML document.
+	 * 
+	 * @return values of QEMU command line arguments from the Libvirt domain XML document.
+	 */
+	public ArrayList<String> getQemuCmdlnArguments()
+	{
+		final Document xmlDocument = this.getRootXmlNode().getXmlDocument();
+		final ArrayList<String> qemuCmdlnArgs = new ArrayList<String>();
+
+		final NodeList qemuCmdlnNodes = xmlDocument.getElementsByTagNameNS( XMLNS_QEMU_NS_URI, "commandline" );
+		if ( qemuCmdlnNodes.getLength() > 0 ) {
+			final Node qemuCmdlnNode = qemuCmdlnNodes.item( 0 );
+			final NodeList qemuCmdlnArgNodes = qemuCmdlnNode.getChildNodes();
+			for ( int i = 0; i < qemuCmdlnArgNodes.getLength(); i++ ) {
+				final Node qemuCmdlnArgNode = qemuCmdlnArgNodes.item( i );
+				if ( qemuCmdlnArgNode.getNodeType() == Node.ELEMENT_NODE ) {
+					final Element qemuCmdlnArgElement = Element.class.cast( qemuCmdlnArgNode );
+					final String value = qemuCmdlnArgElement.getAttribute( "value" );
+					if ( value != null && !value.isEmpty() ) {
+						qemuCmdlnArgs.add( value );
+					}
+				}
+			}
+		}
+
+		return qemuCmdlnArgs;
+	}
+
 	/**
 	 * Adds a virtual machine device to the Libvirt domain XML document.
 	 *
@@ -1344,6 +1387,39 @@ public class Domain extends LibvirtXmlDocument
 		return Video.class.cast( this.addDevice( new Video() ) );
 	}
 
+	/**
+	 * Adds an given value as QEMU command line argument to the Libvirt domain XML document.
+	 * 
+	 * @param value QEMU command line argument value.
+	 */
+	public void addQemuCmdlnArgument( final String value )
+	{
+		final Element rootElement = Element.class.cast( this.getRootXmlNode().getXmlBaseNode() );
+		final Document xmlDocument = this.getRootXmlNode().getXmlDocument();
+		final Element qemuCmdlnElement;
+
+		final NodeList qemuCmdlnNodes = rootElement.getElementsByTagNameNS( XMLNS_QEMU_NS_URI, "commandline" );
+		if ( qemuCmdlnNodes.getLength() < 1 ) {
+			// add missing <domain xmlns:qemu="..."> namespace attribute
+			rootElement.setAttributeNS( XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
+					XMLConstants.XMLNS_ATTRIBUTE + ":" + XMLNS_QEMU_NS_PREFIX, XMLNS_QEMU_NS_URI );
+			// add missing <qemu:commandline> element
+			qemuCmdlnElement = xmlDocument.createElementNS( XMLNS_QEMU_NS_URI, "commandline" );
+			qemuCmdlnElement.setPrefix( XMLNS_QEMU_NS_PREFIX );
+			rootElement.appendChild( qemuCmdlnElement );
+		} else {
+			// use available <qemu:commandline> element
+			final Node qemuCmdlnNode = qemuCmdlnNodes.item( 0 );
+			assert ( qemuCmdlnNode.getNodeType() == Node.ELEMENT_NODE );
+			qemuCmdlnElement = Element.class.cast( qemuCmdlnNode );
+		}
+
+		// append <qemu:arg value='...'> element with attribute
+		final Element qemuCmdlnArgElement = xmlDocument.createElementNS( XMLNS_QEMU_NS_URI, "arg" );
+		qemuCmdlnArgElement.setAttribute( "value", value );
+		qemuCmdlnElement.appendChild( qemuCmdlnArgElement );
+	}
+
 	/**
 	 * Removes boot oder entries in the Libvirt domain XML document.
 	 */
diff --git a/src/test/java/org/openslx/libvirt/domain/DomainTest.java b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
index e1fb73b..c56759d 100644
--- a/src/test/java/org/openslx/libvirt/domain/DomainTest.java
+++ b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
@@ -392,4 +392,25 @@ public class DomainTest
 		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm.xml" );
 		assertEquals( 1, vm.getVideoDevices().size() );
 	}
+
+	@Test
+	@DisplayName( "Get all QEMU command line arguments from libvirt XML file" )
+	public void testGetQemuCmdlnArguments()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml" );
+		assertEquals( 2, vm.getQemuCmdlnArguments().size() );
+	}
+
+	@Test
+	@DisplayName( "Set QEMU command line arguments in libvirt XML file" )
+	public void testAddQemuCmdlnArguments()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm.xml" );
+		assertEquals( 0, vm.getQemuCmdlnArguments().size() );
+
+		vm.addQemuCmdlnArgument( "-set" );
+		vm.addQemuCmdlnArgument( "device.hostdev0.x-igd-opregion=on" );
+
+		assertEquals( 2, vm.getQemuCmdlnArguments().size() );
+	}
 }
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml
new file mode 100644
index 0000000..2670eac
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_qemu-cmdln.xml
@@ -0,0 +1,168 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>ubuntu-20-04</name>
+  <uuid>8dc5433c-0228-49e4-b019-fa2b606aa544</uuid>
+  <title>Ubuntu 20.04</title>
+  <description>Ubuntu 20.04 desktop installation</description>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://ubuntu.com/ubuntu/20.04"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-5.1'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-model' check='partial'/>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw' cache='none' io='native'/>
+      <source dev='/dev/data/ubuntu-20-04.img'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <target dev='sda' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='floppy'>
+      <driver name='qemu' type='raw'/>
+      <target dev='fda' bus='fdc'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='ich9-ehci1'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='fdc' index='0'/>
+    <interface type='network'>
+      <mac address='52:54:00:0d:90:0c'/>
+      <source network='default'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='unix'>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </memballoon>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </rng>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value='-set'/>
+    <qemu:arg value='device.hostdev0.x-igd-opregion=on'/>
+  </qemu:commandline>
+</domain>
+
-- 
cgit v1.2.3-55-g7522


From bb8b72ab8b4556c9ac85ffdf08a25cbb15867342 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Mon, 16 Aug 2021 11:12:24 +0200
Subject: Fix invalid XML paths and types in Libvirt's mediated devices

---
 src/main/java/org/openslx/libvirt/domain/device/Hostdev.java   |  2 +-
 .../java/org/openslx/libvirt/domain/device/HostdevMdev.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/openslx/libvirt/domain/device/Hostdev.java b/src/main/java/org/openslx/libvirt/domain/device/Hostdev.java
index 11e74c3..dc9cf5e 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/Hostdev.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/Hostdev.java
@@ -78,7 +78,7 @@ public class Hostdev extends Device
 
 		if ( hostdev instanceof HostdevMdev ) {
 			xmlNode.setXmlElementAttributeValue( "type", Type.MDEV.toString() );
-			addedHostdev = HostdevPci.createInstance( xmlNode );
+			addedHostdev = HostdevMdev.createInstance( xmlNode );
 		} else if ( hostdev instanceof HostdevPci ) {
 			xmlNode.setXmlElementAttributeValue( "type", Type.PCI.toString() );
 			addedHostdev = HostdevPci.createInstance( xmlNode );
diff --git a/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java b/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
index 7f6bb81..082ea5b 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/HostdevMdev.java
@@ -100,7 +100,7 @@ public class HostdevMdev extends Hostdev implements HostdevAddressableSource<Hos
 	@Override
 	public void setSource( HostdevMdevDeviceAddress source )
 	{
-		this.setXmlElementAttributeValue( "source/address", "domain", source.getDeviceAddressAsString() );
+		this.setXmlElementAttributeValue( "source/address", "uuid", source.getDeviceAddressAsString() );
 	}
 
 	/**
@@ -109,9 +109,9 @@ public class HostdevMdev extends Hostdev implements HostdevAddressableSource<Hos
 	 * @param xmlNode Libvirt XML node of the Libvirt XML device that is created.
 	 * @return created hostdev mediated device instance.
 	 */
-	public static HostdevPci createInstance( LibvirtXmlNode xmlNode )
+	public static HostdevMdev createInstance( LibvirtXmlNode xmlNode )
 	{
-		return HostdevPci.newInstance( xmlNode );
+		return HostdevMdev.newInstance( xmlNode );
 	}
 
 	/**
@@ -121,9 +121,9 @@ public class HostdevMdev extends Hostdev implements HostdevAddressableSource<Hos
 	 * @param xmlNode existing Libvirt XML hostdev mediated device element.
 	 * @return hostdev mediated device instance.
 	 */
-	public static HostdevPci newInstance( LibvirtXmlNode xmlNode )
+	public static HostdevMdev newInstance( LibvirtXmlNode xmlNode )
 	{
-		return new HostdevPci( xmlNode );
+		return new HostdevMdev( xmlNode );
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522


From 3491eaa9403a35562ba50e6057a8bdc7532eb122 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 24 Aug 2021 12:44:58 +0200
Subject: Print debug output in transformation manager

---
 .../configuration/transformation/TransformationManager.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java b/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java
index 197796d..b28fb32 100644
--- a/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java
+++ b/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java
@@ -2,6 +2,8 @@ package org.openslx.virtualization.configuration.transformation;
 
 import java.util.ArrayList;
 
+import org.apache.log4j.Logger;
+
 /**
  * A transformation manager is a class to manage several transformations and their application.
  * 
@@ -32,6 +34,11 @@ public class TransformationManager<T, R>
 	 */
 	private R args;
 
+	/**
+	 * Logger instance to log messages.
+	 */
+	private static final Logger LOGGER = Logger.getLogger( TransformationManager.class );
+
 	/**
 	 * Create a transformation manager.
 	 * 
@@ -63,6 +70,9 @@ public class TransformationManager<T, R>
 	 */
 	public void register( Transformation<T, R> transformation, boolean enabled )
 	{
+		LOGGER.debug( "Register transformation '" + transformation.getName() + "' and "
+				+ ( enabled ? "enable" : "do not enable" ) + " it" );
+
 		transformation.setEnabled( enabled );
 		this.transformations.add( transformation );
 	}
@@ -107,6 +117,7 @@ public class TransformationManager<T, R>
 	public void transform() throws TransformationException
 	{
 		for ( Transformation<T, R> transformation : this.transformations ) {
+			LOGGER.debug( "Apply transformation '" + transformation.getName() + "'" );
 			try {
 				transformation.apply( this.config, this.args );
 			} catch ( TransformationException e ) {
-- 
cgit v1.2.3-55-g7522


From e33d5e17b789fb180e9d24dce1d36caed2d83e16 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 1 Sep 2021 12:30:25 +0200
Subject: Add getter/setter for listen address and port of Libvirt SPICE
 graphics

---
 .../openslx/libvirt/domain/device/Graphics.java    | 63 ++++++++++++++++++++++
 .../libvirt/domain/device/GraphicsSpice.java       | 12 +++++
 2 files changed, 75 insertions(+)

diff --git a/src/main/java/org/openslx/libvirt/domain/device/Graphics.java b/src/main/java/org/openslx/libvirt/domain/device/Graphics.java
index d10eb3f..3fd2f81 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/Graphics.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/Graphics.java
@@ -1,5 +1,8 @@
 package org.openslx.libvirt.domain.device;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import org.openslx.libvirt.xml.LibvirtXmlNode;
 
 /**
@@ -49,6 +52,66 @@ public class Graphics extends Device
 		this.setXmlElementAttributeValue( "listen", "type", type.toString() );
 	}
 
+	/**
+	 * Returns the listen address of the graphics device.
+	 * 
+	 * @return listen address of the graphics device.
+	 */
+	public InetAddress getListenAddress()
+	{
+		InetAddress parsedListenAddress = null;
+
+		if ( this.getListenType() == ListenType.ADDRESS ) {
+			// only read listen address, if address listen type is set
+			final String rawListenAddress = this.getXmlElementAttributeValue( "listen", "address" );
+
+			try {
+				parsedListenAddress = InetAddress.getByName( rawListenAddress );
+			} catch ( UnknownHostException e ) {
+				parsedListenAddress = null;
+			}
+		}
+
+		return parsedListenAddress;
+	}
+
+	/**
+	 * Sets the listen address for the graphics device.
+	 * 
+	 * @param listenAddress listen address for the graphics device.
+	 */
+	public void setListenAddress( InetAddress listenAddress )
+	{
+		if ( this.getListenType() == ListenType.ADDRESS && listenAddress != null ) {
+			// only set listen address, if address listen type is set
+			this.setXmlElementAttributeValue( "listen", "address", listenAddress.getHostAddress() );
+		}
+	}
+
+	/**
+	 * Returns the listen port of the graphics device.
+	 * 
+	 * @return listen port of the graphics device.
+	 */
+	public int getListenPort()
+	{
+		final String listenPort = this.getXmlElementAttributeValue( "port" );
+		return Integer.valueOf( listenPort );
+	}
+
+	/**
+	 * Sets the listen port for the graphics device.
+	 * 
+	 * @param listenPort listen port for the graphics device.
+	 */
+	public void setListenPort( int listenPort )
+	{
+		if ( this.getListenType() == ListenType.ADDRESS ) {
+			// only set listen port, if address listen type is set
+			this.setXmlElementAttributeValue( "port", Integer.toString( listenPort ) );
+		}
+	}
+
 	/**
 	 * Creates a non-existent graphics device as Libvirt XML device element.
 	 * 
diff --git a/src/main/java/org/openslx/libvirt/domain/device/GraphicsSpice.java b/src/main/java/org/openslx/libvirt/domain/device/GraphicsSpice.java
index fbd115b..2c6068a 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/GraphicsSpice.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/GraphicsSpice.java
@@ -1,5 +1,7 @@
 package org.openslx.libvirt.domain.device;
 
+import java.net.InetAddress;
+
 import org.openslx.libvirt.xml.LibvirtXmlNode;
 
 /**
@@ -10,6 +12,16 @@ import org.openslx.libvirt.xml.LibvirtXmlNode;
  */
 public class GraphicsSpice extends Graphics
 {
+	/**
+	 * Default address of a SPICE graphics listener.
+	 */
+	public static final InetAddress DEFAULT_ADDRESS = InetAddress.getLoopbackAddress();
+
+	/**
+	 * Default port of a SPICE graphics listener.
+	 */
+	public static final int DEFAULT_PORT = 5900;
+
 	/**
 	 * Creates an empty graphics SPICE device.
 	 */
-- 
cgit v1.2.3-55-g7522


From b5f543dfb65f8c47ec67d76aea6f3d0e675ef7da Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 15 Oct 2021 11:07:17 +0200
Subject: Remove empty lines and unused indentations

---
 .../configuration/VirtualizationConfigurationQemu.java     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index bfa385e..3794e2b 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -406,10 +406,9 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 		return isVCpuSet;
 	}
-	
+
 	class QemuGfxType extends VirtOptionValue
 	{
-
 		public QemuGfxType( String id, String displayName )
 		{
 			super( id, displayName );
@@ -497,7 +496,6 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 				return this.id.equals( "false" );
 			}
 		}
-		
 	}
 
 	@Override
@@ -535,7 +533,6 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 	class QemuNicModel extends VirtOptionValue
 	{
-		
 		private final int cardIndex;
 
 		public QemuNicModel( int cardIndex, Interface.Model model, String displayName )
@@ -574,10 +571,9 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 			return networkDeviceModel.toString().equals( this.id ); // XXX: enum would allow simple ==
 		}
 	}
-	
+
 	class QemuSoundCardModel extends VirtOptionValue
 	{
-
 		public QemuSoundCardModel( Sound.Model id, String displayName )
 		{
 			super( id.toString(), displayName );
@@ -614,12 +610,11 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 			Sound.Model soundDeviceModel = soundDevices.get( 0 ).getModel();
 			return soundDeviceModel != null && soundDeviceModel.toString().equals( this.id );
 		}
-		
+
 	}
-	
+
 	class QemuUsbSpeed extends VirtOptionValue
 	{
-
 		public QemuUsbSpeed( ControllerUsb.Model id, String displayName )
 		{
 			super( id.toString(), displayName );
@@ -662,7 +657,6 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 			return false;
 		}
-		
 	}
 
 	@Override
-- 
cgit v1.2.3-55-g7522


From ba4173137f69fb5887d5b2f342af45aab4c36314 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 15 Oct 2021 11:08:18 +0200
Subject: Remove unused variables

---
 .../virtualization/configuration/VirtualizationConfigurationQemu.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index 3794e2b..bae6937 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -642,8 +642,6 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 		public boolean isActive()
 		{
 			ArrayList<ControllerUsb> usbControllerDevices = vmConfig.getUsbControllerDevices();
-			String maxUsbSpeed = null;
-			int maxUsbSpeedNumeric = 0;
 
 			for ( ControllerUsb usbControllerDevice : usbControllerDevices ) {
 				ControllerUsb.Model usbControllerModel = usbControllerDevice.getModel();
-- 
cgit v1.2.3-55-g7522


From bda67b5aa8d03d4960bd4f9e051a8b8a7e4e7cd4 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 15 Oct 2021 14:09:07 +0200
Subject: Add graphic model configuration option for QEMU VMs

---
 .../VirtualizationConfigurationQemu.java           | 58 ++++++++++++++++++++--
 .../hardware/ConfigurationGroups.java              |  1 +
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index bae6937..60122fd 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -407,6 +407,52 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 		return isVCpuSet;
 	}
 
+	class QemuGfxModel extends VirtOptionValue
+	{
+		public QemuGfxModel( Video.Model model, String displayName )
+		{
+			super( model.toString(), displayName );
+		}
+
+		@Override
+		public void apply()
+		{
+			final ArrayList<Video> videoDevices = vmConfig.getVideoDevices();
+
+			if ( videoDevices.isEmpty() ) {
+				// add new video device with disabled acceleration to VM configuration
+				final Video videoDevice = vmConfig.addVideoDevice();
+				videoDevice.setModel( Video.Model.fromString( this.getId() ) );
+				videoDevice.set2DAcceleration( false );
+				videoDevice.set3DAcceleration( false );
+			} else {
+				// change graphics model of existing video devices
+				for ( final Video videoDevice : videoDevices ) {
+					// remove all old model-related XML attributes
+					videoDevice.removeXmlElement( "model" );
+					// set new model
+					videoDevice.setModel( Video.Model.fromString( this.getId() ) );
+				}
+			}
+		}
+
+		@Override
+		public boolean isActive()
+		{
+			final ArrayList<Video> videoDevices = vmConfig.getVideoDevices();
+			boolean isActive = true;
+
+			for ( final Video videoDevice : videoDevices ) {
+				if ( !videoDevice.getModel().toString().equals( this.getId() ) ) {
+					isActive = false;
+					break;
+				}
+			}
+
+			return isActive;
+		}
+	}
+
 	class QemuGfxType extends VirtOptionValue
 	{
 		public QemuGfxType( String id, String displayName )
@@ -766,9 +812,15 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 		configurableOptions.add( new ConfigurableOptionGroup( ConfigurationGroups.SOUND_CARD_MODEL, list ) );
 
 		list = new ArrayList<>();
-		// XXX This would greatly benefit from having more meaningful options for qemu instead of on/off
-		list.add( new QemuGfxType( "false", "langsam" ) );
-		list.add( new QemuGfxType( "true", "3D OpenGL" ) );
+		list.add( new QemuGfxModel( Video.Model.VGA, "VGA" ) );
+		list.add( new QemuGfxModel( Video.Model.QXL, "QXL" ) );
+		list.add( new QemuGfxModel( Video.Model.VMVGA, "VMware VGA" ) );
+		list.add( new QemuGfxModel( Video.Model.VIRTIO, "virtio-gpu" ) );
+		configurableOptions.add( new ConfigurableOptionGroup( ConfigurationGroups.GFX_MODEL, list ) );
+
+		list = new ArrayList<>();
+		list.add( new QemuGfxType( "false", "2D" ) );
+		list.add( new QemuGfxType( "true", "3D" ) );
 		configurableOptions.add( new ConfigurableOptionGroup( ConfigurationGroups.GFX_TYPE, list ) );
 
 		list = new ArrayList<>();
diff --git a/src/main/java/org/openslx/virtualization/hardware/ConfigurationGroups.java b/src/main/java/org/openslx/virtualization/hardware/ConfigurationGroups.java
index ad5b771..8a0ab13 100644
--- a/src/main/java/org/openslx/virtualization/hardware/ConfigurationGroups.java
+++ b/src/main/java/org/openslx/virtualization/hardware/ConfigurationGroups.java
@@ -6,6 +6,7 @@ public enum ConfigurationGroups
 	NIC_MODEL( "E0VirtDev" ), 
 	USB_SPEED( "maxUSBSpeed" ), 
 	SOUND_CARD_MODEL( "sound" ), 
+	GFX_MODEL( "graphics" ), 
 	GFX_TYPE( "3DAcceleration" ), 
 	HW_VERSION( "HWVersion" );
 
-- 
cgit v1.2.3-55-g7522


From e09fc1da385517ccb612f2dc4a4f22164130280a Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 22 Oct 2021 16:12:22 +0200
Subject: Update QEMU hardware versions to available versions from QEMU 6.1

---
 .../org/openslx/virtualization/virtualizer/VirtualizerQemu.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
index d950111..5d933bb 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
@@ -33,7 +33,6 @@ public class VirtualizerQemu extends Virtualizer
 	 */
 	private static final List<Version> VIRTUALIZER_SUPPORTED_VERSIONS = Collections.unmodifiableList(
 			Arrays.asList(
-					new Version( Short.valueOf( "2" ), Short.valueOf( "1" ), "QEMU 2.1" ),
 					new Version( Short.valueOf( "2" ), Short.valueOf( "4" ), "QEMU 2.4" ),
 					new Version( Short.valueOf( "2" ), Short.valueOf( "5" ), "QEMU 2.5" ),
 					new Version( Short.valueOf( "2" ), Short.valueOf( "6" ), "QEMU 2.6" ),
@@ -44,7 +43,12 @@ public class VirtualizerQemu extends Virtualizer
 					new Version( Short.valueOf( "3" ), Short.valueOf( "1" ), "QEMU 3.1" ),
 					new Version( Short.valueOf( "4" ), Short.valueOf( "0" ), "QEMU 4.0" ),
 					new Version( Short.valueOf( "4" ), Short.valueOf( "1" ), "QEMU 4.1" ),
-					new Version( Short.valueOf( "4" ), Short.valueOf( "2" ), "QEMU 4.2" ) ) );
+					new Version( Short.valueOf( "4" ), Short.valueOf( "2" ), "QEMU 4.2" ),
+					new Version( Short.valueOf( "5" ), Short.valueOf( "0" ), "QEMU 5.0" ),
+					new Version( Short.valueOf( "5" ), Short.valueOf( "1" ), "QEMU 5.1" ),
+					new Version( Short.valueOf( "5" ), Short.valueOf( "2" ), "QEMU 5.2" ),
+					new Version( Short.valueOf( "6" ), Short.valueOf( "0" ), "QEMU 6.0" ),
+					new Version( Short.valueOf( "6" ), Short.valueOf( "1" ), "QEMU 6.1" ) ) );
 
 	/**
 	 * Creates a new QEMU virtualizer.
-- 
cgit v1.2.3-55-g7522


From 121aed8c48ae5f05339a2d5d4e36cd94f833b20a Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 22 Oct 2021 16:13:49 +0200
Subject: Extend Libvirt domain XML to get/set OS firmware loader

---
 src/main/java/org/openslx/libvirt/domain/Domain.java | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java
index d6f9a8f..cbbf827 100644
--- a/src/main/java/org/openslx/libvirt/domain/Domain.java
+++ b/src/main/java/org/openslx/libvirt/domain/Domain.java
@@ -504,6 +504,26 @@ public class Domain extends LibvirtXmlDocument
 		this.getRootXmlNode().setXmlElementAttributeValue( "os/type", "machine", machine );
 	}
 
+	/**
+	 * Returns OS loader defined in the Libvirt domain XML document.
+	 * 
+	 * @return OS loader of the virtual machine.
+	 */
+	public String getOsLoader()
+	{
+		return this.getRootXmlNode().getXmlElementValue( "os/loader" );
+	}
+
+	/**
+	 * Set OS loader in the Libvirt domain XML document.
+	 * 
+	 * @param loader OS loader for the virtual machine.
+	 */
+	public void setOsLoader( String loader )
+	{
+		this.getRootXmlNode().setXmlElementValue( "os/loader", loader );
+	}
+
 	/**
 	 * Operating system types specifiable for a virtual machine in the Libvirt domain XML document.
 	 * 
-- 
cgit v1.2.3-55-g7522


From b212f94866eceb5098b86d98f2b9171ad57a62d2 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 9 Nov 2021 13:58:10 +0100
Subject: Add Libvirt non-persistent config for UEFI transformation tests

---
 ...untu-20-04-vm_transform-non-persistent_uefi.xml | 165 +++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent_uefi.xml

diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent_uefi.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent_uefi.xml
new file mode 100644
index 0000000..12f9747
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent_uefi.xml
@@ -0,0 +1,165 @@
+<domain type="kvm">
+  <name>Test</name>
+  <uuid>8dc5433c-0228-49e4-b019-fa2b606aa544</uuid>
+  <title>Ubuntu 20.04</title>
+  <description>Ubuntu 20.04 desktop installation</description>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://ubuntu.com/ubuntu/20.04"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit="KiB">4194304</memory>
+  <currentMemory unit="KiB">4194304</currentMemory>
+  <vcpu placement="static">2</vcpu>
+  <os>
+    <type arch="x86_64" machine="pc-q35-5.1">hvm</type>
+    <loader readonly="yes" type="pflash">/usr/share/edk2-ovmf/x64/OVMF_CODE.fd</loader>
+    <boot dev="hd"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state="off"/>
+  </features>
+  <cpu check="partial" mode="host-model"/>
+  <clock offset="utc">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled="no"/>
+    <suspend-to-disk enabled="no"/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk device="disk" type="block">
+      <driver cache="none" io="native" name="qemu" type="raw"/>
+      <target bus="virtio" dev="vda"/>
+      <address bus="0x03" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </disk>
+    <disk device="cdrom" type="file">
+      <driver name="qemu" type="raw"/>
+      <target bus="sata" dev="sda"/>
+      <readonly/>
+      <address bus="0" controller="0" target="0" type="drive" unit="0"/>
+    </disk>
+    <disk device="floppy" type="file">
+      <driver name="qemu" type="raw"/>
+      <target bus="fdc" dev="fda"/>
+      <address bus="0" controller="0" target="0" type="drive" unit="0"/>
+    </disk>
+    <controller index="0" model="ich9-ehci1" type="usb">
+      <address bus="0x00" domain="0x0000" function="0x7" slot="0x1d" type="pci"/>
+    </controller>
+    <controller index="0" model="ich9-uhci1" type="usb">
+      <master startport="0"/>
+      <address bus="0x00" domain="0x0000" function="0x0" multifunction="on" slot="0x1d" type="pci"/>
+    </controller>
+    <controller index="0" model="ich9-uhci2" type="usb">
+      <master startport="2"/>
+      <address bus="0x00" domain="0x0000" function="0x1" slot="0x1d" type="pci"/>
+    </controller>
+    <controller index="0" model="ich9-uhci3" type="usb">
+      <master startport="4"/>
+      <address bus="0x00" domain="0x0000" function="0x2" slot="0x1d" type="pci"/>
+    </controller>
+    <controller index="0" type="sata">
+      <address bus="0x00" domain="0x0000" function="0x2" slot="0x1f" type="pci"/>
+    </controller>
+    <controller index="0" model="pcie-root" type="pci"/>
+    <controller index="1" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="1" port="0x10"/>
+      <address bus="0x00" domain="0x0000" function="0x0" multifunction="on" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="2" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="2" port="0x11"/>
+      <address bus="0x00" domain="0x0000" function="0x1" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="3" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="3" port="0x12"/>
+      <address bus="0x00" domain="0x0000" function="0x2" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="4" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="4" port="0x13"/>
+      <address bus="0x00" domain="0x0000" function="0x3" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="5" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="5" port="0x14"/>
+      <address bus="0x00" domain="0x0000" function="0x4" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="6" model="pcie-root-port" type="pci">
+      <model name="pcie-root-port"/>
+      <target chassis="6" port="0x15"/>
+      <address bus="0x00" domain="0x0000" function="0x5" slot="0x02" type="pci"/>
+    </controller>
+    <controller index="0" type="virtio-serial">
+      <address bus="0x02" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </controller>
+    <controller index="0" model="virtio-scsi" type="scsi">
+      <address bus="0x06" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </controller>
+    <controller index="0" type="fdc"/>
+    <interface type="bridge">
+      <mac address="52:54:00:0d:90:0c"/>
+      <source bridge="nat1"/>
+      <model type="virtio"/>
+      <address bus="0x01" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </interface>
+    <serial type="pty">
+      <target port="0" type="isa-serial">
+        <model name="isa-serial"/>
+      </target>
+    </serial>
+    <console type="pty">
+      <target port="0" type="serial"/>
+    </console>
+    <channel type="unix">
+      <target name="org.qemu.guest_agent.0" type="virtio"/>
+      <address bus="0" controller="0" port="1" type="virtio-serial"/>
+    </channel>
+    <channel type="spicevmc">
+      <target name="com.redhat.spice.0" type="virtio"/>
+      <address bus="0" controller="0" port="2" type="virtio-serial"/>
+    </channel>
+    <input bus="usb" type="tablet">
+      <address bus="0" port="1" type="usb"/>
+    </input>
+    <input bus="ps2" type="mouse"/>
+    <input bus="ps2" type="keyboard"/>
+    <graphics autoport="yes" type="spice">
+      <listen type="address"/>
+      <image compression="off"/>
+    </graphics>
+    <sound model="ich9">
+      <address bus="0x00" domain="0x0000" function="0x0" slot="0x1b" type="pci"/>
+    </sound>
+    <video>
+      <model heads="1" primary="yes" ram="65536" type="qxl" vgamem="16384" vram="65536"/>
+      <address bus="0x00" domain="0x0000" function="0x0" slot="0x01" type="pci"/>
+    </video>
+    <redirdev bus="usb" type="spicevmc">
+      <address bus="0" port="2" type="usb"/>
+    </redirdev>
+    <redirdev bus="usb" type="spicevmc">
+      <address bus="0" port="3" type="usb"/>
+    </redirdev>
+    <memballoon model="virtio">
+      <address bus="0x04" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </memballoon>
+    <rng model="virtio">
+      <backend model="random">/dev/urandom</backend>
+      <address bus="0x05" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
+    </rng>
+  </devices>
+</domain>
+
+
-- 
cgit v1.2.3-55-g7522


From 8416431dd4aaa1451a998c4d44bc78b7b4140be5 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 9 Nov 2021 14:48:25 +0100
Subject: Remove specified Libvirt OS Nvram file during QEMU VM upload

---
 .../java/org/openslx/libvirt/domain/Domain.java    |  32 ++++
 .../VirtualizationConfigurationQemu.java           |   3 +
 .../org/openslx/libvirt/domain/DomainTest.java     |  34 +++++
 .../xml/qemu-kvm_default-ubuntu-20-04-vm_uefi.xml  | 166 +++++++++++++++++++++
 4 files changed, 235 insertions(+)
 create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_uefi.xml

diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java
index cbbf827..e6049fa 100644
--- a/src/main/java/org/openslx/libvirt/domain/Domain.java
+++ b/src/main/java/org/openslx/libvirt/domain/Domain.java
@@ -524,6 +524,26 @@ public class Domain extends LibvirtXmlDocument
 		this.getRootXmlNode().setXmlElementValue( "os/loader", loader );
 	}
 
+	/**
+	 * Returns OS Nvram defined in the Libvirt domain XML document.
+	 * 
+	 * @return OS Nvram of the virtual machine.
+	 */
+	public String getOsNvram()
+	{
+		return this.getRootXmlNode().getXmlElementValue( "os/nvram" );
+	}
+
+	/**
+	 * Set OS Nvram in the Libvirt domain XML document.
+	 * 
+	 * @param nvram OS Nvram for the virtual machine.
+	 */
+	public void setOsNvram( String nvram )
+	{
+		this.getRootXmlNode().setXmlElementValue( "os/nvram", nvram );
+	}
+
 	/**
 	 * Operating system types specifiable for a virtual machine in the Libvirt domain XML document.
 	 * 
@@ -1476,6 +1496,18 @@ public class Domain extends LibvirtXmlDocument
 		}
 	}
 
+	/**
+	 * Removes specified Nvram file in the Libvirt domain XML document.
+	 */
+	public void removeOsNvram()
+	{
+		final Node nvramElement = this.getRootXmlNode().getXmlElement( "os/nvram" );
+
+		if ( nvramElement != null ) {
+			nvramElement.getParentNode().removeChild( nvramElement );
+		}
+	}
+
 	/**
 	 * Removes network source for all interface devices in the Libvirt domain XML document.
 	 */
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index 60122fd..8c3a95b 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -794,6 +794,9 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 	{
 		// removes all referenced storage files of all specified CDROMs, Floppy drives and HDDs
 		this.vmConfig.removeDiskDevicesStorage();
+
+		// remove specified NVRAM file of OS loader (firmware)
+		this.vmConfig.removeOsNvram();
 	}
 
 	@Override
diff --git a/src/test/java/org/openslx/libvirt/domain/DomainTest.java b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
index c56759d..6b53125 100644
--- a/src/test/java/org/openslx/libvirt/domain/DomainTest.java
+++ b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
@@ -237,6 +237,40 @@ public class DomainTest
 		assertEquals( "pc", vm.getOsMachine() );
 	}
 
+	@Test
+	@DisplayName( "Get VM's OS loader from libvirt XML file" )
+	public void testGetOsLoader()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_uefi.xml" );
+		assertEquals( "/usr/share/edk2-ovmf/x64/OVMF_CODE.fd", vm.getOsLoader() );
+	}
+
+	@Test
+	@DisplayName( "Set VM's OS loader in libvirt XML file" )
+	public void testSetOsLoader()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_uefi.xml" );
+		vm.setOsLoader( "/usr/share/qemu/edk2-x86_64-code.fd" );
+		assertEquals( "/usr/share/qemu/edk2-x86_64-code.fd", vm.getOsLoader() );
+	}
+
+	@Test
+	@DisplayName( "Get VM's OS Nvram from libvirt XML file" )
+	public void testGetOsNvram()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_uefi.xml" );
+		assertEquals( "/var/lib/libvirt/nvram/guest_VARS.fd", vm.getOsNvram() );
+	}
+
+	@Test
+	@DisplayName( "Set VM's OS Nvram in libvirt XML file" )
+	public void testSetOsNvram()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_uefi.xml" );
+		vm.setOsNvram( "/tmp/nvram-tmp/tmp_VARS.fd" );
+		assertEquals( "/tmp/nvram-tmp/tmp_VARS.fd", vm.getOsNvram() );
+	}
+
 	@Test
 	@DisplayName( "Get VM CPU model from libvirt XML file" )
 	public void testGetCpuModel()
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_uefi.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_uefi.xml
new file mode 100644
index 0000000..c4e2788
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_uefi.xml
@@ -0,0 +1,166 @@
+<domain type='kvm'>
+  <name>ubuntu-20-04</name>
+  <uuid>8dc5433c-0228-49e4-b019-fa2b606aa544</uuid>
+  <title>Ubuntu 20.04</title>
+  <description>Ubuntu 20.04 desktop installation</description>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://ubuntu.com/ubuntu/20.04"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-5.1'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/edk2-ovmf/x64/OVMF_CODE.fd</loader>
+    <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-model' check='partial'/>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw' cache='none' io='native'/>
+      <source dev='/dev/data/ubuntu-20-04.img'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <target dev='sda' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='floppy'>
+      <driver name='qemu' type='raw'/>
+      <target dev='fda' bus='fdc'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='ich9-ehci1'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='fdc' index='0'/>
+    <interface type='network'>
+      <mac address='52:54:00:0d:90:0c'/>
+      <source network='default'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='unix'>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </memballoon>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </rng>
+  </devices>
+</domain>
+
-- 
cgit v1.2.3-55-g7522


From 9bd2d82999eac1d27c6fc14ebe6e0e298435b2b6 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 10 Nov 2021 09:41:56 +0100
Subject: Enumerate target names of disk devices correctly

---
 .../VirtualizationConfigurationQemu.java           | 18 ++++++----
 .../VirtualizationConfigurationQemuUtils.java      | 40 +++++++++++++++++++++-
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index 8c3a95b..706a083 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -245,10 +245,12 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 		if ( storageDiskDevice == null ) {
 			// HDD does not exist, so create new storage (HDD) device
+			final BusType devBusType = BusType.VIRTIO;
+			final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( this.vmConfig,
+					devBusType );
 			storageDiskDevice = this.vmConfig.addDiskStorageDevice();
 			storageDiskDevice.setReadOnly( false );
-			storageDiskDevice.setBusType( BusType.VIRTIO );
-			String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "vd", index );
+			storageDiskDevice.setBusType( devBusType );
 			storageDiskDevice.setTargetDevice( targetDevName );
 
 			if ( diskImagePath == null || diskImagePath.isEmpty() ) {
@@ -319,9 +321,11 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 		if ( floppyDiskDevice == null ) {
 			// floppy device does not exist, so create new floppy device
+			final BusType devBusType = BusType.FDC;
+			final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( this.vmConfig,
+					devBusType );
 			floppyDiskDevice = this.vmConfig.addDiskFloppyDevice();
-			floppyDiskDevice.setBusType( BusType.FDC );
-			String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "fd", index );
+			floppyDiskDevice.setBusType( devBusType );
 			floppyDiskDevice.setTargetDevice( targetDevName );
 			floppyDiskDevice.setReadOnly( readOnly );
 
@@ -364,9 +368,11 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 
 		if ( cdromDiskDevice == null ) {
 			// CDROM device does not exist, so create new CDROM device
+			final BusType devBusType = BusType.SATA;
+			final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( this.vmConfig,
+					devBusType );
 			cdromDiskDevice = this.vmConfig.addDiskCdromDevice();
-			cdromDiskDevice.setBusType( BusType.SATA );
-			String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "sd", index );
+			cdromDiskDevice.setBusType( devBusType );
 			cdromDiskDevice.setTargetDevice( targetDevName );
 			cdromDiskDevice.setReadOnly( true );
 
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
index 06091c0..1befdc4 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
@@ -1,9 +1,11 @@
 package org.openslx.virtualization.configuration;
 
 import java.util.ArrayList;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.openslx.libvirt.domain.Domain;
 import org.openslx.libvirt.domain.device.Disk;
 import org.openslx.libvirt.domain.device.Disk.BusType;
 import org.openslx.virtualization.Version;
@@ -109,7 +111,7 @@ public class VirtualizationConfigurationQemuUtils
 	 * @param deviceNumber number of the device.
 	 * @return alphabetical device name.
 	 */
-	public static String createAlphabeticalDeviceName( String devicePrefix, int deviceNumber )
+	private static String createAlphabeticalDeviceName( String devicePrefix, int deviceNumber )
 	{
 		if ( deviceNumber < 0 || deviceNumber >= ( 'z' - 'a' ) ) {
 			String errorMsg = new String( "Device number is out of range to be able to create a valid device name." );
@@ -119,6 +121,42 @@ public class VirtualizationConfigurationQemuUtils
 		return devicePrefix + Character.valueOf( (char) ( 'a' + deviceNumber ) ).toString();
 	}
 
+	/**
+	 * Creates an alphabetical device name for a disk device with a bus <i>type</i> that is unique in
+	 * a Libvirt domain XML configuration.
+	 * 
+	 * @param config Libvirt domain XML configuration.
+	 * @param type device type for device name.
+	 * @return alphabetical device name.
+	 */
+	public static String createDeviceName( final Domain config, final BusType type ) throws IllegalArgumentException
+	{
+		final String devicePrefix;
+		final int deviceNumber;
+
+		switch ( type ) {
+		case FDC:
+			devicePrefix = "fd";
+			break;
+		case IDE:
+			devicePrefix = "hd";
+			break;
+		case SATA:
+			devicePrefix = "sd";
+			break;
+		case VIRTIO:
+			devicePrefix = "vd";
+			break;
+		default:
+			return null;
+		}
+
+		final Predicate<Disk> bySpecifiedBusType = d -> d.getBusType() == type;
+		deviceNumber = Long.valueOf( config.getDiskDevices().stream().filter( bySpecifiedBusType ).count() ).intValue();
+
+		return VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( devicePrefix, deviceNumber );
+	}
+
 	/**
 	 * Data container to store a Libvirt/QEMU machine name with version information.
 	 * 
-- 
cgit v1.2.3-55-g7522