cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 35ede04
Date Fri, 23 Jan 2015 09:46:45 GMT
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/35ede041
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35ede041
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35ede041

Branch: refs/heads/master
Commit: 35ede0418ac1730e2024bde6fcacd26168efdbed
Parents: 455998c
Author: Marcus Sorensen <marcus_sorensen@apple.com>
Authored: Fri Jan 23 02:34:08 2015 -0700
Committer: Marcus Sorensen <marcus_sorensen@apple.com>
Committed: Fri Jan 23 02:46:16 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/35ede041/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 5912f72..4db8cfa 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);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35ede041/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 += "<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";


Mime
View raw message