Remove HyperV features and disable clock by default

MissionCriticalCloud · Jan 24, 2018 · 965780e · 965780e
1 parent 22c68b5
commit 965780e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...ervisor/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/...ervisor/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1663,12 +1663,12 @@ public LibvirtVmDef createVmFromSpec(final VirtualMachineTO vmTo) {
         features.addFeature("apic");
         features.addFeature("acpi");
 
-        final HyperVEnlightenmentFeatureDef hyperVFeatures = new HyperVEnlightenmentFeatureDef();
-        hyperVFeatures.addFeature("relaxed", true);
-        hyperVFeatures.addFeature("vapic", true);
-        hyperVFeatures.addFeature("spinlocks", true);
-        hyperVFeatures.setRetries(8191);
-        features.addHyperVFeature(hyperVFeatures);
+//        final HyperVEnlightenmentFeatureDef hyperVFeatures = new HyperVEnlightenmentFeatureDef();
+//        hyperVFeatures.addFeature("relaxed", true);
+//        hyperVFeatures.addFeature("vapic", true);
+//        hyperVFeatures.addFeature("spinlocks", true);
+//        hyperVFeatures.setRetries(8191);
+//        features.addHyperVFeature(hyperVFeatures);
 
         vm.addComp(features);
 
@@ -1691,7 +1691,7 @@ public LibvirtVmDef createVmFromSpec(final VirtualMachineTO vmTo) {
         clock.addTimer("rtc", "catchup");
         clock.addTimer("pit", "delay");
         clock.addTimer("hpet", null, false);
-        clock.addTimer("hypervclock", null, true);
+        clock.addTimer("hypervclock", null, false);
 
         vm.addComp(clock);