You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/05/28 00:35:41 UTC
[15/50] [abbrv] git commit: bug CS-15094: cpu limit is
cpuspeed*cpucount
bug CS-15094: cpu limit is cpuspeed*cpucount
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a96a9a04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a96a9a04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a96a9a04
Branch: refs/heads/3.0.x
Commit: a96a9a040d2da101528bfcef5a84cb221d5926b5
Parents: 79a7ddb
Author: Edison Su <su...@gmail.com>
Authored: Fri May 25 10:50:26 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri May 25 10:50:36 2012 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a96a9a04/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
index 6761143..28fdf40 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
@@ -528,7 +528,7 @@ public class VmwareHelper {
ResourceAllocationInfo cpuInfo = new ResourceAllocationInfo();
if (limitCpuUse) {
- cpuInfo.setLimit((long)cpuSpeedMHz);
+ cpuInfo.setLimit((long)(cpuSpeedMHz * cpuCount));
} else {
cpuInfo.setLimit(-1L);
}