From c8f6a3623a87ddda4ddb216786608a251d8ccbfe Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 28 Nov 2013 10:47:51 +0100 Subject: [PATCH] CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY) (cherry picked from commit d473d5a36a4c50793988081a52b602d58d95f302) --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 3 +++ 1 file changed, 3 insertions(+) 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 7b4b8b66d0c..013a7b817e0 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 @@ -192,6 +192,7 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuModeDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DevicesDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef; +import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.deviceType; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskProtocol; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FeaturesDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FilesystemDef; @@ -4871,6 +4872,8 @@ ServerResource { List disks = getDisks(conn, vmName); for (DiskDef disk : disks) { + if (disk.getDeviceType() != deviceType.DISK) + break; DomainBlockStats blockStats = dm.blockStats(disk.getDiskLabel()); String path = disk.getDiskPath(); // for example, path = /mnt/pool_uuid/disk_path/ String diskPath = null;