etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8233 kvmtimer fix

This commit is contained in:
Mike Tutkowski 2015-02-06 16:17:32 -07:00
parent c234751069
commit 465ae4760e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -3723,7 +3723,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME);
clock.setTimer("rtc", "catchup", null);
} else if (vmTO.getType() != VirtualMachine.Type.User || isGuestPVEnabled(vmTO.getOs())) {
clock.setTimer("kvmclock", null, null, _noKvmClock);
if (_hypervisorLibvirtVersion >= (9 * 1000 + 10)) {
clock.setTimer("kvmclock", null, null, _noKvmClock);
}
}
vm.addComp(clock);

8
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View File

@ -94,8 +94,6 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n";
vmStr += "</clock>\n";
vmStr += "<features>\n";
vmStr += "<pae/>\n";
@ -168,8 +166,6 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n";
vmStr += "</clock>\n";
vmStr += "<features>\n";
vmStr += "<pae/>\n";
@ -240,8 +236,6 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n";
vmStr += "</clock>\n";
vmStr += "<features>\n";
vmStr += "<pae/>\n";
@ -317,8 +311,6 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n";
vmStr += "</clock>\n";
vmStr += "<features>\n";
vmStr += "<pae/>\n";