From 35ede0418ac1730e2024bde6fcacd26168efdbed Mon Sep 17 00:00:00 2001
From: Marcus Sorensen <marcus_sorensen@apple.com>
Date: Fri, 23 Jan 2015 02:34:08 -0700
Subject: [PATCH] CLOUDSTACK-8177 KVM: disable tickpolicy for kvmclock. Newer
 libvirt enforces that kvmclock cannot accept parameters.

---
 .../hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
 .../kvm/resource/LibvirtComputingResourceTest.java        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 5912f72503b..4db8cfad07b 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
@@ -3726,7 +3726,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);
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 faa88f0cb65..a087f018c5a 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 += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
         vmStr += "<description>" + os + "</description>\n";
         vmStr += "<clock offset='utc'>\n";
-        vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n";
+        vmStr += "<timer name='kvmclock' >\n";
         vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
@@ -168,7 +168,7 @@ public class LibvirtComputingResourceTest {
         vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
         vmStr += "<description>" + os + "</description>\n";
         vmStr += "<clock offset='utc'>\n";
-        vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n";
+        vmStr += "<timer name='kvmclock' >\n";
         vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
@@ -240,7 +240,7 @@ public class LibvirtComputingResourceTest {
         vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
         vmStr += "<description>" + os + "</description>\n";
         vmStr += "<clock offset='utc'>\n";
-        vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n";
+        vmStr += "<timer name='kvmclock' >\n";
         vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
@@ -317,7 +317,7 @@ public class LibvirtComputingResourceTest {
         vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
         vmStr += "<description>" + os + "</description>\n";
         vmStr += "<clock offset='utc'>\n";
-        vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n";
+        vmStr += "<timer name='kvmclock' >\n";
         vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";