From 465ae4760e90dfd04977e10fb75cb6a5b1fc9979 Mon Sep 17 00:00:00 2001
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date: Fri, 6 Feb 2015 16:17:32 -0700
Subject: [PATCH] CLOUDSTACK-8233 kvmtimer fix

---
 .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 +++-
 .../kvm/resource/LibvirtComputingResourceTest.java        | 8 --------
 2 files changed, 3 insertions(+), 9 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 f2b3c6341be..4202834699e 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,9 @@ 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", null, null, _noKvmClock);
+            if (_hypervisorLibvirtVersion >= (9 * 1000 + 10)) {
+                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 a087f018c5a..bf4546c63d1 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,8 +94,6 @@ 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' >\n";
-        vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
         vmStr += "<pae/>\n";
@@ -168,8 +166,6 @@ 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' >\n";
-        vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
         vmStr += "<pae/>\n";
@@ -240,8 +236,6 @@ 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' >\n";
-        vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
         vmStr += "<pae/>\n";
@@ -317,8 +311,6 @@ 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' >\n";
-        vmStr += "</timer>\n";
         vmStr += "</clock>\n";
         vmStr += "<features>\n";
         vmStr += "<pae/>\n";