You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/02/21 21:45:58 UTC
git commit: refs/heads/4.0 - CLOUDSTACK-587: use setMemoryLimits
instead
Updated Branches:
refs/heads/4.0 e7f3355f7 -> 2b09f68b3
CLOUDSTACK-587:
use setMemoryLimits instead
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b09f68b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2b09f68b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2b09f68b
Branch: refs/heads/4.0
Commit: 2b09f68b302dbf8cf0c44109dcc03d918f3ed7ea
Parents: e7f3355
Author: anthony <an...@cloud.com>
Authored: Wed Dec 5 05:24:46 2012 -0800
Committer: Chip Childers <ch...@gmail.com>
Committed: Thu Feb 21 15:44:56 2013 -0500
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 6 +-----
.../xen/resource/XenServer56Resource.java | 5 -----
2 files changed, 1 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b09f68b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index d2db85c..967a299 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3113,11 +3113,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected void setMemory(Connection conn, VM vm, long memsize) throws XmlRpcException, XenAPIException {
- vm.setMemoryStaticMin(conn, memsize);
- vm.setMemoryDynamicMin(conn, memsize);
-
- vm.setMemoryDynamicMax(conn, memsize);
- vm.setMemoryStaticMax(conn, memsize);
+ vm.setMemoryLimits(conn, memsize, memsize, memsize, memsize);
}
private void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b09f68b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 270240b..716bb7c 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -74,11 +74,6 @@ public class XenServer56Resource extends CitrixResourceBase {
}
}
- @Override
- protected void setMemory(Connection conn, VM vm, long memsize) throws XmlRpcException, XenAPIException {
- vm.setMemoryLimits(conn, memsize, memsize, memsize, memsize);
- }
-
@Override
protected String getGuestOsType(String stdType, boolean bootFromCD) {