Repository: cloudstack Updated Branches: refs/heads/4.5 c23475106 -> 465ae4760
CLOUDSTACK-8233 kvmtimer fix Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/465ae476 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/465ae476 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/465ae476 Branch: refs/heads/4.5 Commit: 465ae4760e90dfd04977e10fb75cb6a5b1fc9979 Parents: c234751 Author: Mike Tutkowski <[email protected]> Authored: Fri Feb 6 16:17:32 2015 -0700 Committer: Mike Tutkowski <[email protected]> Committed: Sun Feb 8 17:45:46 2015 -0700 ---------------------------------------------------------------------- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 +++- .../kvm/resource/LibvirtComputingResourceTest.java | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/465ae476/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index f2b3c63..4202834 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -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); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/465ae476/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index a087f01..bf4546c 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -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";
