Updated Branches: refs/heads/4.2 ca7f22062 -> ca678a874
CLOUDSTACK-4300: possible fix: cputune feature is only available after 0.9.0, so start vm can fail on rhel 6.1 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca678a87 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca678a87 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca678a87 Branch: refs/heads/4.2 Commit: ca678a8742c441e5f39d13a3979070c881f3fbe6 Parents: ca7f220 Author: Edison Su <[email protected]> Authored: Sat Aug 17 00:18:56 2013 -0700 Committer: Edison Su <[email protected]> Committed: Sat Aug 17 00:19:03 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca678a87/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 53d4a64..9104504 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 @@ -3385,23 +3385,25 @@ ServerResource { cmd.setModel(_guestCpuModel); vm.addComp(cmd); - CpuTuneDef ctd = new CpuTuneDef(); - /** - A 4.0.X/4.1.X management server doesn't send the correct JSON - command for getMinSpeed, it only sends a 'speed' field. + if (_hypervisorLibvirtVersion >= 9000) { + CpuTuneDef ctd = new CpuTuneDef(); + /** + A 4.0.X/4.1.X management server doesn't send the correct JSON + command for getMinSpeed, it only sends a 'speed' field. - So if getMinSpeed() returns null we fall back to getSpeed(). + So if getMinSpeed() returns null we fall back to getSpeed(). - This way a >4.1 agent can work communicate a <=4.1 management server + This way a >4.1 agent can work communicate a <=4.1 management server - This change is due to the overcommit feature in 4.2 - */ - if (vmTO.getMinSpeed() != null) { - ctd.setShares(vmTO.getCpus() * vmTO.getMinSpeed()); - } else { - ctd.setShares(vmTO.getCpus() * vmTO.getSpeed()); + This change is due to the overcommit feature in 4.2 + */ + if (vmTO.getMinSpeed() != null) { + ctd.setShares(vmTO.getCpus() * vmTO.getMinSpeed()); + } else { + ctd.setShares(vmTO.getCpus() * vmTO.getSpeed()); + } + vm.addComp(ctd); } - vm.addComp(ctd); FeaturesDef features = new FeaturesDef(); features.addFeatures("pae");
