cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to 0518936
Date Tue, 28 Jan 2014 18:51:37 GMT
Updated Branches:
  refs/heads/master 0c28b6636 -> 05189361b


CLOUDSTACK-5968 last patch fixes setting low currentMemory during
overprovision, this one explicitly tells libvirt we dont want a
balloon device (won't use it anyway, and will just suck up a percent
of vm memory)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05189361
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05189361
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05189361

Branch: refs/heads/master
Commit: 05189361b79e9ebd33486cf8d564a5e85a6747d8
Parents: 0c28b66
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Jan 28 11:50:40 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Jan 28 11:51:23 2014 -0700

----------------------------------------------------------------------
 .../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05189361/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 9fd058f..5aeacda 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
@@ -162,6 +162,8 @@ public class LibvirtVMDef {
             }
             if (_memBalloning) {
                 resBuidler.append("<devices>\n" + "<memballoon model='virtio'/>\n"
+ "</devices>\n");
+            } else {
+                resBuidler.append("<devices>\n" + "<memballoon model='none'/>\n"
+ "</devices>\n");
             }
             if (_vcpu != -1) {
                 resBuidler.append("<vcpu>" + _vcpu + "</vcpu>\n");


Mime
View raw message