cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to 883210e
Date Wed, 07 Aug 2013 05:10:29 GMT
Updated Branches:
  refs/heads/master 789ac14c1 -> 883210e1f


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/883210e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/883210e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/883210e1

Branch: refs/heads/master
Commit: 883210e1fe9629a8b6c203e7e3ef55bc97ba2e5f
Parents: 789ac14
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Mon Jul 22 10:54:18 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Aug 6 23:10:33 2013 -0600

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java    | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/883210e1/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 5517054..0aba152 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);


Mime
View raw message