You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/04/03 12:33:26 UTC
[18/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to
3890860
Cloudstack-1739
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a3a1c79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a3a1c79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a3a1c79
Branch: refs/heads/kvm-vnc-listen
Commit: 7a3a1c792a0c263ccde74e6156afaa57470b2847
Parents: 45eb9fd
Author: Bharat Kumar <bh...@citrix.com>
Authored: Fri Mar 29 17:14:59 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Mon Apr 1 10:36:19 2013 +0530
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 4 ++--
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a3a1c79/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 6852e2c..7b70b62 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
@@ -3066,8 +3066,8 @@ ServerResource {
if (vmTO.getMinRam() != vmTO.getMaxRam()){
grd.setMemBalloning(true);
- grd.setCurrentMem((int)vmTO.getMinRam()/1024);
- grd.setMemorySize((int)vmTO.getMaxRam()/1024);
+ grd.setCurrentMem((long)vmTO.getMinRam()/1024);
+ grd.setMemorySize((long)vmTO.getMaxRam()/1024);
}
else{
grd.setMemorySize(vmTO.getMaxRam() / 1024);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a3a1c79/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index c93aeeb..3d896a7 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -113,7 +113,7 @@ public class LibvirtVMDef {
public static class GuestResourceDef {
private long _mem;
- private int _currentMem = -1;
+ private long _currentMem = -1;
private String _memBacking;
private int _vcpu = -1;
private boolean _memBalloning= false;
@@ -122,7 +122,7 @@ public class LibvirtVMDef {
_mem = mem;
}
- public void setCurrentMem(int currMem) {
+ public void setCurrentMem(long currMem) {
_currentMem = currMem;
}