You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2015/01/23 10:40:17 UTC
git commit: updated refs/heads/4.5 to 46301cb
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 <ma...@apple.com>
Authored: Fri Jan 23 02:34:08 2015 -0700
Committer: Marcus Sorensen <ma...@apple.com>
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 += "<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";