Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6A5210B25 for ; Fri, 23 Jan 2015 09:40:30 +0000 (UTC) Received: (qmail 42064 invoked by uid 500); 23 Jan 2015 09:40:31 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 42046 invoked by uid 500); 23 Jan 2015 09:40:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 42037 invoked by uid 99); 23 Jan 2015 09:40:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 09:40:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEE98E0393; Fri, 23 Jan 2015 09:40:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: commits@cloudstack.apache.org Message-Id: <6b534321300c4d42b45ae6142251d233@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.5 to 46301cb Date: Fri, 23 Jan 2015 09:40:17 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.5 d08369ad0 -> 46301cbaf CLOUDSTACK-8177 KVM: disable tickpolicy for kvmclock. Newer libvirt enforces that kvmclock cannot accept parameters. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46301cba Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46301cba Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46301cba Branch: refs/heads/4.5 Commit: 46301cbaf2367999103dcf0f6485fe00f48ec9dd Parents: d08369a Author: Marcus Sorensen Authored: Fri Jan 23 02:34:08 2015 -0700 Committer: Marcus Sorensen Committed: Fri Jan 23 02:34:08 2015 -0700 ---------------------------------------------------------------------- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- .../kvm/resource/LibvirtComputingResourceTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46301cba/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 68c776a..691601f 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 @@ -3723,7 +3723,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME); clock.setTimer("rtc", "catchup", null); } else if (vmTO.getType() != VirtualMachine.Type.User || isGuestPVEnabled(vmTO.getOs())) { - clock.setTimer("kvmclock", "catchup", null, _noKvmClock); + clock.setTimer("kvmclock", null, null, _noKvmClock); } vm.addComp(clock); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46301cba/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index faa88f0..a087f01 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -94,7 +94,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -168,7 +168,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -240,7 +240,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -317,7 +317,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n";