diff options
| author | Simon Rettberg | 2019-05-29 16:57:36 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-05-29 16:57:36 +0200 |
| commit | 7a7c20ee652f8d9a274fea055b38d7b8b289c641 (patch) | |
| tree | 8b2495025e99f23670c17c5d0789ccf2a30973ad | |
| parent | Refine active transfer detection and cancellation (diff) | |
| download | master-sync-shared-7a7c20ee652f8d9a274fea055b38d7b8b289c641.tar.gz master-sync-shared-7a7c20ee652f8d9a274fea055b38d7b8b289c641.tar.xz master-sync-shared-7a7c20ee652f8d9a274fea055b38d7b8b289c641.zip | |
[vmware] Support hwversion 14 and 15
| -rw-r--r-- | src/main/java/org/openslx/util/vm/VmMetaData.java | 17 | ||||
| -rw-r--r-- | src/main/java/org/openslx/util/vm/VmwareMetaData.java | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java index aafb6a4..c750ecc 100644 --- a/src/main/java/org/openslx/util/vm/VmMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmMetaData.java @@ -65,10 +65,19 @@ public abstract class VmMetaData<T, U, V, W> */ public static enum HWVersion { - NONE( "(invalid)" ), THREE( " 3 (Workstation 4/5, Player 1)" ), FOUR( " 4 (Workstation 4/5, Player 1/2, Fusion 1)" ), SIX( " 6 (Workstation 6)" ), SEVEN( - " 7 (Workstation 6.5/7, Player 3, Fusion 2/3)" ), EIGHT( " 8 (Workstation 8, Player/Fusion 4)" ), NINE( " 9 (Workstation 9, Player/Fusion 5)" ), TEN( - "10 (Workstation 10, Player/Fusion 6)" ), ELEVEN( - "11 (Workstation 11, Player/Fusion 7)" ), TWELVE( "12 (Workstation/Player 12, Fusion 8)" ), DEFAULT( "default" ); + NONE( "(invalid)" ), + THREE( " 3 (Workstation 4/5, Player 1)" ), + FOUR( " 4 (Workstation 4/5, Player 1/2, Fusion 1)" ), + SIX( " 6 (Workstation 6)" ), + SEVEN( " 7 (Workstation 6.5/7, Player 3, Fusion 2/3)" ), + EIGHT( " 8 (Workstation 8, Player/Fusion 4)" ), + NINE( " 9 (Workstation 9, Player/Fusion 5)" ), + TEN( "10 (Workstation 10, Player/Fusion 6)" ), + ELEVEN( "11 (Workstation 11, Player/Fusion 7)" ), + TWELVE( "12 (Workstation/Player 12, Fusion 8)" ), + FOURTEEN( "14 (Workstation/Player 14, Fusion 10)"), + FIFTEEN( "15 (Workstation/Player 15, Fusion 11)"), + 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 151be1e..f1e0149 100644 --- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java @@ -590,6 +590,8 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce hwversion.put( VmMetaData.HWVersion.TEN, new VmWareHWVersionMeta( 10 ) ); hwversion.put( VmMetaData.HWVersion.ELEVEN, new VmWareHWVersionMeta( 11 ) ); hwversion.put( VmMetaData.HWVersion.TWELVE, new VmWareHWVersionMeta( 12 ) ); + hwversion.put( VmMetaData.HWVersion.FOURTEEN, new VmWareHWVersionMeta( 14 ) ); + hwversion.put( VmMetaData.HWVersion.FIFTEEN, new VmWareHWVersionMeta( 15 ) ); networkCards.put( VmMetaData.EthernetDevType.AUTO, new VmWareEthernetDevTypeMeta( null ) ); networkCards.put( VmMetaData.EthernetDevType.PCNET32, new VmWareEthernetDevTypeMeta( "vlance" ) ); |