Repository: cloudstack Updated Branches: refs/heads/master b145a7d14 -> 41fdc418f
CLOUDSTACK-7472: Disable kvmclock for LXC Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/41fdc418 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/41fdc418 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/41fdc418 Branch: refs/heads/master Commit: 41fdc418ffb6a92760647e785f5123019adb3926 Parents: bab81f0 Author: Kishan Kavala <[email protected]> Authored: Fri Sep 5 19:26:57 2014 +0530 Committer: Kishan Kavala <[email protected]> Committed: Fri Sep 5 19:38:55 2014 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/41fdc418/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 8e30d97..b6c1364 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 @@ -799,6 +799,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv value = (String) params.get("kvmclock.disable"); if (Boolean.parseBoolean(value)) { _noKvmClock = true; + } else if(HypervisorType.LXC.equals(_hypervisorType) && (value == null)){ + //Disable kvmclock by default for LXC + _noKvmClock = true; } LibvirtConnection.initialize(_hypervisorURI);
