From 7aa2380b3bc33ad6b1a892b1b3491c93eee8edbb Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 26 Mar 2021 16:22:54 +0100
Subject: Fix issues in filtering sources of Libvirt network interfaces

---
 src/main/java/org/openslx/libvirt/domain/Domain.java      | 3 ++-
 src/main/java/org/openslx/libvirt/domain/device/Disk.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/org/openslx/libvirt/domain')

diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java
index 727da13..dbc60e6 100644
--- a/src/main/java/org/openslx/libvirt/domain/Domain.java
+++ b/src/main/java/org/openslx/libvirt/domain/Domain.java
@@ -1216,7 +1216,8 @@ public class Domain extends LibvirtXmlDocument
 	public void removeInterfaceDevicesSource()
 	{
 		for ( Interface interfaceDevice : this.getInterfaceDevices() ) {
-			interfaceDevice.removeSource();
+			// set empty source to preserve the XML attribute (to prevent XML validation errors)
+			interfaceDevice.setSource( "" );
 		}
 	}
 }
diff --git a/src/main/java/org/openslx/libvirt/domain/device/Disk.java b/src/main/java/org/openslx/libvirt/domain/device/Disk.java
index 464e7b6..d9007f5 100644
--- a/src/main/java/org/openslx/libvirt/domain/device/Disk.java
+++ b/src/main/java/org/openslx/libvirt/domain/device/Disk.java
@@ -68,7 +68,7 @@ public class Disk extends Device
 			storageSource = this.getXmlElementAttributeValue( "source", "file" );
 			break;
 		case BLOCK:
-			storageSource = this.getXmlElementAttributeValue( "source", "bdev" );
+			storageSource = this.getXmlElementAttributeValue( "source", "dev" );
 			break;
 		}
 
@@ -96,7 +96,7 @@ public class Disk extends Device
 			this.setXmlElementAttributeValue( "source", "file", source );
 			break;
 		case BLOCK:
-			this.setXmlElementAttributeValue( "source", "bdev", source );
+			this.setXmlElementAttributeValue( "source", "dev", source );
 			break;
 		}
 	}
-- 
cgit v1.2.3-55-g7522