summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-07-19 16:28:02 +0200
committerSimon Rettberg2019-07-19 16:28:02 +0200
commit100bf4d93adac7c207e5c0f0d81ebcee8534046b (patch)
tree7b8183c91248dc19de1049a1414fb6ca77fc5ad9
parent[vmware] Add usb.mangleUsb3Speed = TRUE if using USB 1.1/2.0 (diff)
downloadmaster-sync-shared-100bf4d93adac7c207e5c0f0d81ebcee8534046b.tar.gz
master-sync-shared-100bf4d93adac7c207e5c0f0d81ebcee8534046b.tar.xz
master-sync-shared-100bf4d93adac7c207e5c0f0d81ebcee8534046b.zip
[vm] Move workaround to actually take effect
-rw-r--r--src/main/java/org/openslx/util/vm/VmwareMetaData.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index c486be2..29227a7 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -132,6 +132,10 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
for ( Entry<String, ConfigEntry> entry : config.entrySet() ) {
handleLoadEntry( entry );
}
+ // Fix accidentally filtered USB config if we see EHCI is present
+ if ( isSetAndTrue( "ehci.present" ) && !isSetAndTrue( "usb.present" ) ) {
+ addFiltered( "usb.present", "TRUE" );
+ }
// if we find this tag, we already went through the hdd's - so we're done.
if ( config.get( "#SLX_HDD_BUS" ) != null ) {
return;
@@ -170,11 +174,6 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
addFiltered( "#SLX_HDD_CHIP", hdd.chipsetDriver );
}
}
-
- // Fix accidentally filtered USB config if we see EHCI is present
- if ( isSetAndTrue( "ehci.present" ) && !isSetAndTrue( "usb.present" ) ) {
- addFiltered( "usb.present", "TRUE" );
- }
}
private void addFiltered( String key, String value )