apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "XS host free memory might change, if user manually changes dom0 memory,"

Browse Source 
This reverts commit a1d09ae16f08c86bfca5c4a89dec371ef6d3ee67.
This commit is contained in:
Anthony Xu 2013-11-13 15:37:45 -08:00
parent 253da8f6ba
commit 74153e4a79
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -6035,7 +6035,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Set<VM> vms = host.getResidentVMs(conn);
for (VM vm : vms) {
if (vm.getIsControlDomain(conn)) {
dom0Ram = vm.getMemoryStaticMax(conn);
dom0Ram = vm.getMemoryDynamicMax(conn);
break;
}
}

2
server/src/com/cloud/capacity/CapacityManagerImpl.java
View File

@ -589,7 +589,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU);
CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY);
memCap.setTotalCapacity(host.getTotalMemory());
if (cpuCap != null && memCap != null){
long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();