apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8177

Browse Source 
KVM: disable tickpolicy for kvmclock. Newer libvirt enforces that
kvmclock cannot accept parameters.
This commit is contained in:
Marcus Sorensen 2015-01-23 02:34:08 -07:00
parent 455998ce95
commit 35ede0418a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -3726,7 +3726,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME); clock.setClockOffset(ClockDef.ClockOffset.LOCALTIME);
clock.setTimer("rtc", "catchup", null); clock.setTimer("rtc", "catchup", null);
} else if (vmTO.getType() != VirtualMachine.Type.User || isGuestPVEnabled(vmTO.getOs())) { } 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); vm.addComp(clock);

8
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View File

@ -94,7 +94,7 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n"; vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n"; vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n"; vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n"; vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n"; vmStr += "</timer>\n";
vmStr += "</clock>\n"; vmStr += "</clock>\n";
vmStr += "<features>\n"; vmStr += "<features>\n";
@ -168,7 +168,7 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n"; vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n"; vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n"; vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n"; vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n"; vmStr += "</timer>\n";
vmStr += "</clock>\n"; vmStr += "</clock>\n";
vmStr += "<features>\n"; vmStr += "<features>\n";
@ -240,7 +240,7 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n"; vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n"; vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n"; vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n"; vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n"; vmStr += "</timer>\n";
vmStr += "</clock>\n"; vmStr += "</clock>\n";
vmStr += "<features>\n"; vmStr += "<features>\n";
@ -317,7 +317,7 @@ public class LibvirtComputingResourceTest {
vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n"; vmStr += "<uuid>b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9</uuid>\n";
vmStr += "<description>" + os + "</description>\n"; vmStr += "<description>" + os + "</description>\n";
vmStr += "<clock offset='utc'>\n"; vmStr += "<clock offset='utc'>\n";
vmStr += "<timer name='kvmclock' tickpolicy='catchup' >\n"; vmStr += "<timer name='kvmclock' >\n";
vmStr += "</timer>\n"; vmStr += "</timer>\n";
vmStr += "</clock>\n"; vmStr += "</clock>\n";
vmStr += "<features>\n"; vmStr += "<features>\n";