From 883210e1fe9629a8b6c203e7e3ef55bc97ba2e5f Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Mon, 22 Jul 2013 10:54:18 -0600 Subject: [PATCH] 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. --- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 -- 1 file changed, 2 deletions(-) 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 55170545940..0aba15263bf 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 @@ -3340,8 +3340,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);