Updated Branches: refs/heads/4.2 7fced6460 -> 3b2e62dbf
Revert "Summary: Use hypervisor as clock source for system vms" removing due to CLOUDSTACK-2872, ubuntu 12.04's libvirt isn't new enough This reverts commit c7ebcb4e8c287ae88d2f6e6d71cc536612a5e635. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b2e62db Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b2e62db Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b2e62db Branch: refs/heads/4.2 Commit: 3b2e62dbfacd9b747c606d46f4d9d4fbda247a94 Parents: 7fced64 Author: Marcus Sorensen <[email protected]> Authored: Mon Jul 22 10:54:18 2013 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Tue Aug 6 23:10:04 2013 -0600 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b2e62db/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 650a203..17473a0 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 @@ -3366,8 +3366,6 @@ ServerResource { if (vmTO.getOs().startsWith("Windows")) { clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME); clock.setTimer("rtc", "catchup", null); - } else if (vmTO.getType() != VirtualMachine.Type.User) { - clock.setTimer("kvmclock", "catchup", null); } vm.addComp(clock);
