Summary: Use hypervisor as clock source for system vms BUG-ID: CLOUDSTACK-2492 Bugfix-for: 4.1,master Signed-off-by: Marcus Sorensen <mar...@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/bfc5887a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bfc5887a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bfc5887a Branch: refs/heads/object_store Commit: bfc5887a1bf6b41e88dd7a8f9987fcee8d3d9175 Parents: 8f7a51e Author: Marcus Sorensen <mar...@betterservers.com> Authored: Wed May 15 10:36:22 2013 -0600 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Wed May 15 10:36:22 2013 -0600 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfc5887a/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 b8c6f09..0147682 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 @@ -3152,6 +3152,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);
