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 += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -168,7 +168,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -240,7 +240,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -317,7 +317,7 @@ public class LibvirtComputingResourceTest { vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n"; vmStr += "" + os + "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n";