From 7a975667e311d11ae520f146de8d32b5b29f151f Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 2 Sep 2016 15:04:51 +0200 Subject: vmx editor stuff --- src/main/java/org/openslx/util/vm/VmwareMetaData.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/openslx/util/vm/VmwareMetaData.java') diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java index 9192035..fef2b2d 100644 --- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java @@ -52,8 +52,8 @@ public class VmwareMetaData extends VmMetaData public VmwareMetaData( List osList, byte[] vmxContent, int length ) { super( osList ); - this.config = new VmwareConfig( vmxContent, length ); - init(); + this.config = new VmwareConfig( vmxContent, length ); // still unfiltered + init(); // now filtered } private void init() @@ -61,6 +61,10 @@ public class VmwareMetaData extends VmMetaData for ( Entry entry : config.entrySet() ) { handleLoadEntry( entry ); } + // if we find this tag, we already went through the hdd's - so we're done. + if ( config.get("#SLX_HDD_BUS" ) != null) { + return; + } // Now find the HDDs and add to list for ( Entry cEntry : disks.entrySet() ) { Controller controller = cEntry.getValue(); @@ -84,6 +88,7 @@ public class VmwareMetaData extends VmMetaData hdds.add( new HardDisk( controller.virtualDev, bus, device.filename ) ); } } + // Add HDD to cleaned vmx if ( !hdds.isEmpty() ) { HardDisk hdd = hdds.get( 0 ); @@ -305,6 +310,11 @@ public class VmwareMetaData extends VmMetaData return config.toString( true, false ).getBytes( StandardCharsets.UTF_8 ); } + public byte[] getDefinitionArray() + { + return config.toString( false, false ).getBytes( StandardCharsets.UTF_8 ); + } + @Override public Virtualizer getVirtualizer() { -- cgit v1.2.3-55-g7522