You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/07/22 18:55:15 UTC
git commit: updated refs/heads/4.1 to 0fa108f
Updated Branches:
refs/heads/4.1 01a2257e7 -> 0fa108f03
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/0fa108f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fa108f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fa108f0
Branch: refs/heads/4.1
Commit: 0fa108f03895e83ccc5d4c81e058ea8f424663b9
Parents: 01a2257
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Jul 22 10:54:18 2013 -0600
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Jul 22 10:54:18 2013 -0600
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fa108f0/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 526f028..f443154 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
@@ -3051,8 +3051,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);