BUG-ID:CLOUDSTACK-7472: kvmclock fix for LXC is not required after fixing CLOUDSTACK-8177
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> This closes #557 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a19a891 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a19a891 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a19a891 Branch: refs/heads/reporter Commit: 3a19a8916eb7840302882cddd8465ac56150d32d Parents: f138192 Author: Kishan Kavala <kis...@apache.org> Authored: Thu Jul 2 16:52:46 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri Jul 3 15:21:18 2015 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a19a891/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 7bd02d0..82b2792 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -783,9 +783,6 @@ 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);
