From 966cbd842fac0996742f33c85c60221c9e461930 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 23 Apr 2021 16:44:18 +0200
Subject: Refactors and abstracts version information in config logic and disk
 image

---
 src/main/java/org/openslx/vm/disk/DiskImageQcow2.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/org/openslx/vm/disk/DiskImageQcow2.java')

diff --git a/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java b/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java
index 5f72a00..04e61ea 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java
+++ b/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java
@@ -5,6 +5,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.openslx.virtualization.Version;
+
 /**
  * QCOW2 disk image for virtual machines.
  * 
@@ -120,7 +122,7 @@ public class DiskImageQcow2 extends DiskImage
 
 		// check if QCOW2 image uses extended L2 tables
 		// extended L2 tables are only possible in QCOW2 version 3 header format
-		if ( this.getVersion() >= 3 ) {
+		if ( this.getVersion().getMajor() >= Short.valueOf( "3" ) ) {
 			// read incompatible feature bits
 			final long qcowIncompatibleFeatures = DiskImageUtils.readLong( diskFile, 72 );
 
@@ -216,7 +218,7 @@ public class DiskImageQcow2 extends DiskImage
 	}
 
 	@Override
-	public int getVersion() throws DiskImageException
+	public Version getVersion() throws DiskImageException
 	{
 		final RandomAccessFile diskFile = this.getDiskImage();
 		final int qcowVersion = DiskImageUtils.readInt( diskFile, 4 );
@@ -228,7 +230,7 @@ public class DiskImageQcow2 extends DiskImage
 			throw new DiskImageException( errorMsg );
 		}
 
-		return DiskImageUtils.versionFromMajor( Integer.valueOf( qcowVersion ).shortValue() );
+		return new Version( Integer.valueOf( qcowVersion ).shortValue() );
 	}
 
 	@Override
-- 
cgit v1.2.3-55-g7522