cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: updated refs/heads/4.1 to c7ebcb4
Date Wed, 15 May 2013 18:37:26 GMT
Updated Branches:
  refs/heads/4.1 aed9a623d -> c7ebcb4e8


Summary: Use hypervisor as clock source for system vms

BUG-ID: CLOUDSTACK-2492
Bugfix-for: 4.1,master
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1368635782 -0600


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7ebcb4e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7ebcb4e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7ebcb4e

Branch: refs/heads/4.1
Commit: c7ebcb4e8c287ae88d2f6e6d71cc536612a5e635
Parents: aed9a62
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Wed May 15 10:36:22 2013 -0600
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Wed May 15 19:36:41 2013 +0100

----------------------------------------------------------------------
 .../kvm/resource/LibvirtComputingResource.java     |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7ebcb4e/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 e6db9bf..b44e8b7 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
@@ -3048,6 +3048,8 @@ 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