From ec5718de1e82a1f1bb21360c1942e2fc0e561797 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 10 Nov 2021 09:49:44 +0100
Subject: [qemu] Enumerate target names of disk devices correctly

---
 .../qemu/configuration/TransformationGenericDiskCdromDevices.java    | 5 +++--
 .../qemu/configuration/TransformationGenericDiskFloppyDevices.java   | 5 +++--
 .../qemu/configuration/TransformationGenericDiskStorageDevices.java  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'core/modules/qemu')

diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java
index 64b279de..a7c3b015 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java
@@ -111,9 +111,10 @@ public class TransformationGenericDiskCdromDevices extends TransformationGeneric
 		if ( disk == null ) {
 			if ( fileName != null ) {
 				// CDROM drive does not exist, so create new CDROM drive
+				final BusType devBusType = BusType.SATA;
+				final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( config, devBusType );
 				final DiskCdrom newDisk = config.addDiskCdromDevice();
-				newDisk.setBusType( BusType.SATA );
-				String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "sd", index );
+				newDisk.setBusType( devBusType );
 				newDisk.setTargetDevice( targetDevName );
 
 				this.setDiskCdromStorage( newDisk, fileName );
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java
index fe3d3c34..c32d3fa0 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java
@@ -62,9 +62,10 @@ public class TransformationGenericDiskFloppyDevices extends TransformationGeneri
 		if ( disk == null ) {
 			if ( fileName != null ) {
 				// floppy device does not exist, so create new floppy device
+				final BusType devBusType = BusType.FDC;
+				final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( config, devBusType );
 				final DiskFloppy newDisk = config.addDiskFloppyDevice();
-				newDisk.setBusType( BusType.FDC );
-				String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "fd", index );
+				newDisk.setBusType( devBusType );
 				newDisk.setTargetDevice( targetDevName );
 
 				if ( fileName.isEmpty() ) {
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java
index 9bd1edbb..cf93eb66 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java
@@ -66,9 +66,10 @@ public class TransformationGenericDiskStorageDevices extends TransformationGener
 		if ( disk == null ) {
 			if ( fileName != null && !fileName.isEmpty() ) {
 				// storage device does not exist, so create new storage device
+				final BusType devBusType = BusType.VIRTIO;
+				final String targetDevName = VirtualizationConfigurationQemuUtils.createDeviceName( config, devBusType );
 				final DiskFloppy newDisk = config.addDiskFloppyDevice();
-				newDisk.setBusType( BusType.VIRTIO );
-				String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "vd", index );
+				newDisk.setBusType( devBusType );
 				newDisk.setTargetDevice( targetDevName );
 				newDisk.setStorage( StorageType.FILE, fileName );
 			}
-- 
cgit v1.2.3-55-g7522