diff options
| author | Simon Rettberg | 2019-06-28 11:58:58 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-06-28 11:58:58 +0200 |
| commit | af5f2c7383bdb089c8717e63e2de419fa066d0e8 (patch) | |
| tree | 152234d2cdcb76737b132b6dd21cc26d74ac120b | |
| parent | [vm] Turn disableSuspend into more versatile tweakForNonPersistent (diff) | |
| download | master-sync-shared-af5f2c7383bdb089c8717e63e2de419fa066d0e8.tar.gz master-sync-shared-af5f2c7383bdb089c8717e63e2de419fa066d0e8.tar.xz master-sync-shared-af5f2c7383bdb089c8717e63e2de419fa066d0e8.zip | |
Add support for EFI and hwversion 16
| -rw-r--r-- | src/main/java/org/openslx/util/vm/VmMetaData.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/openslx/util/vm/VmwareMetaData.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java index 15e2cb5..29e2db9 100644 --- a/src/main/java/org/openslx/util/vm/VmMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmMetaData.java @@ -78,6 +78,7 @@ public abstract class VmMetaData<T, U, V, W, X> TWELVE( "12 (Workstation/Player 12, Fusion 8)" ), FOURTEEN( "14 (Workstation/Player 14, Fusion 10)"), FIFTEEN( "15 (Workstation/Player 15, Fusion 11)"), + FIFTEEN_ONE( "16 (Workstation/Player 15.1, Fusion 11.1)"), DEFAULT( "default" ); public final String displayName; diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java index fb5b22a..038a10c 100644 --- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java @@ -89,7 +89,8 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce static { String[] list = { "^guestos", "^uuid\\.bios", "^config\\.version", "^ehci[.:]", "^mks\\.enable3d", "^virtualhw\\.", "^sound[.:]", "\\.pcislotnumber$", "^pcibridge", "\\.virtualdev$", "^tools\\.syncTime$", "^time\\.synchronize", - "^bios\\.bootDelay", "^rtc\\.", "^xhci[.:]", "^usb_xhci[.:]", "\\.deviceType$", "\\.port$", "\\.parent$", "^usb[.:]" }; + "^bios\\.bootDelay", "^rtc\\.", "^xhci[.:]", "^usb_xhci[.:]", "\\.deviceType$", "\\.port$", "\\.parent$", "^usb[.:]", + "^firmware" }; whitelist = new Pattern[ list.length ]; for ( int i = 0; i < list.length; ++i ) { whitelist[i] = Pattern.compile( list[i].toLowerCase() ); @@ -642,6 +643,7 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce hwversion.put( VmMetaData.HWVersion.TWELVE, new VmWareHWVersionMeta( 12 ) ); hwversion.put( VmMetaData.HWVersion.FOURTEEN, new VmWareHWVersionMeta( 14 ) ); hwversion.put( VmMetaData.HWVersion.FIFTEEN, new VmWareHWVersionMeta( 15 ) ); + hwversion.put( VmMetaData.HWVersion.FIFTEEN_ONE, new VmWareHWVersionMeta( 16 ) ); networkCards.put( VmMetaData.EthernetDevType.AUTO, new VmWareEthernetDevTypeMeta( null ) ); networkCards.put( VmMetaData.EthernetDevType.PCNET32, new VmWareEthernetDevTypeMeta( "vlance" ) ); |