kiwiflyer closed pull request #2870: KVM HyperV Enlightment for Improved
Windows Server 2008+ Performance
URL: https://github.com/apache/cloudstack/pull/2870
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index ed87974cd51..5be0f067f99 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2101,14 +2101,17 @@ So if getMinSpeed() returns null we fall back to
getSpeed().
features.addFeatures("pae");
features.addFeatures("apic");
features.addFeatures("acpi");
- //for rhel 6.5 and above, hyperv enlightment feature is added
- /*
- * if (vmTO.getOs().contains("Windows Server 2008") && hostOsVersion
!= null && ((hostOsVersion.first() == 6 && hostOsVersion.second() >= 5) ||
(hostOsVersion.first() >= 7))) {
- * LibvirtVMDef.HyperVEnlightenmentFeatureDef hyv = new
LibvirtVMDef.HyperVEnlightenmentFeatureDef();
- * hyv.setRelaxed(true);
- * features.addHyperVFeature(hyv);
- * }
- */
+ //for rhel 6.5 and above, hyperv enlightenment feature is added
+
+ if (vmTO.getOs().contains("Windows PV")) {
+ LibvirtVMDef.HyperVEnlightenmentFeatureDef hyv = new
LibvirtVMDef.HyperVEnlightenmentFeatureDef();
+ hyv.setFeature("relaxed", true);
+ hyv.setFeature("vapic", true);
+ hyv.setFeature("spinlocks", true);
+ hyv.setRetries(8096);
+ features.addHyperVFeature(hyv);
+ }
+
vm.addComp(features);
final TermPolicy term = new TermPolicy();
@@ -2120,7 +2123,7 @@ So if getMinSpeed() returns null we fall back to
getSpeed().
final ClockDef clock = new ClockDef();
if (vmTO.getOs().startsWith("Windows")) {
clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME);
- clock.setTimer("rtc", "catchup", null);
+ clock.setTimer("hypervclock", null, null);
} else if (vmTO.getType() != VirtualMachine.Type.User ||
isGuestPVEnabled(vmTO.getOs())) {
if (_hypervisorLibvirtVersion >= 9 * 1000 + 10) {
clock.setTimer("kvmclock", null, null, _noKvmClock);
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 08ece9a104e..1e49cb58e78 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -370,6 +370,8 @@ public String toString() {
if (_timerName.equals("kvmclock") && _noKvmClock) {
clockBuilder.append("present='no' />");
+ } else if (_timerName.equals("hypervclock")) {
+ clockBuilder.append("present='yes' />");
} else {
if (_tickPolicy != null) {
clockBuilder.append("tickpolicy='");
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
