etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13'

This commit is contained in:
Rohit Yadav 2020-02-19 13:13:04 +05:30
parent 4ab6b42250 37d2b8537c
commit 3950de116d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/cloud/hypervisor/KVMGuru.java
View File

@ -132,7 +132,7 @@ public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru {
guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion());
}
if (guestOsMapping == null || host == null) {
to.setPlatformEmulator("Other");
to.setPlatformEmulator(guestOS.getDisplayName() == null ? "Other" : guestOS.getDisplayName());
} else {
to.setPlatformEmulator(guestOsMapping.getGuestOsName());
}

8
server/src/main/java/com/cloud/server/StatsCollector.java
View File

@ -928,13 +928,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
List<VolumeVO> volumes = _volsDao.findByPoolId(pool.getId(), null);
List<String> volumeLocators = new ArrayList<String>();
for (VolumeVO volume : volumes) {
if (volume.getFormat() == ImageFormat.QCOW2) {
if (pool.isManaged()) {
volumeLocators.add(volume.getPath());
} else {
volumeLocators.add(volume.getUuid());
}
} else if (volume.getFormat() == ImageFormat.VHD) {
if (volume.getFormat() == ImageFormat.QCOW2 || volume.getFormat() == ImageFormat.VHD) {
volumeLocators.add(volume.getPath());
} else if (volume.getFormat() == ImageFormat.OVA) {
volumeLocators.add(volume.getChainInfo());