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(+)

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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 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(-)

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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(-)

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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(-)

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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 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

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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(-)

(limited to 'src/main/java/org/openslx/virtualization/configuration')

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