Summary: Use hypervisor as clock source for system vms BUG-ID: CLOUDSTACK-2492 Bugfix-for: 4.1,master Signed-off-by: Marcus Sorensen <[email protected]> 1368635782 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20a9d877 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20a9d877 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20a9d877 Branch: refs/heads/object_store Commit: 20a9d877cf2211abf99c2502601e024a47f22114 Parents: 3fa8fda Author: Marcus Sorensen <[email protected]> Authored: Wed May 15 10:36:22 2013 -0600 Committer: Edison Su <[email protected]> Committed: Wed May 15 19:41:50 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20a9d877/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 b3e9be1..15d3d58 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 @@ -3146,6 +3146,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);
