incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: CLOUDSTACK-587: use setMemoryLimits instead
Date Wed, 05 Dec 2012 19:56:20 GMT
Updated Branches:
  refs/heads/master 132114179 -> 40682fc43


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/40682fc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/40682fc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/40682fc4

Branch: refs/heads/master
Commit: 40682fc43dc202b1dbffb4fd32388ad1a46f6e6a
Parents: 1321141
Author: anthony <anthony@cloud.com>
Authored: Wed Dec 5 05:24:46 2012 -0800
Committer: anthony <anthony@cloud.com>
Committed: Wed Dec 5 05:24:46 2012 -0800

----------------------------------------------------------------------
 .../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/40682fc4/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/40682fc4/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) {


Mime
View raw message