KVM: fix more issues of qcow2 format on CLVM

Author: weizhouapache

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -3641,6 +3641,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
                     if (pool.getType() == StoragePoolType.Linstor && isQemuDiscardBugFree(diskBusType)) {
                         disk.setDiscard(DiscardType.UNMAP);
                     }
+                    if (pool.getType() == StoragePoolType.CLVM) {
+                        disk.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);
+                    }
                 } else {
                     if (volume.getType() == Volume.Type.DATADISK && !(isWindowsTemplate && isUefiEnabled)) {
                         disk.defFileBasedDisk(physicalDisk.getPath(), devId, diskBusTypeData, DiskDef.DiskFmtType.QCOW2);
@@ -3995,7 +3998,7 @@ public synchronized String attachOrDetachDisk(final Connect conn,
                 if (attachingPool.getType() == StoragePoolType.RBD) {
                     diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), attachingPool.getAuthUserName(),
                             attachingPool.getUuid(), devId, busT, DiskProtocol.RBD, DiskDef.DiskFmtType.RAW);
-                } else if (attachingPool.getType() == StoragePoolType.PowerFlex) {
+                } else if (attachingPool.getType() == StoragePoolType.PowerFlex || attachingPool.getType() == StoragePoolType.CLVM) {
                     diskdef.defBlockBasedDisk(attachingDisk.getPath(), devId, busT);
                 } else if (attachingPool.getType() == StoragePoolType.Gluster) {
                     diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

@@ -1514,7 +1514,7 @@ protected synchronized void attachOrDetachDisk(final Connect conn, final boolean
                     final String glusterVolume = attachingPool.getSourceDir().replace("/", "");
                     diskdef.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,
                             null, devId, busT, DiskProtocol.GLUSTER, DiskDef.DiskFmtType.QCOW2);
-                } else if (attachingPool.getType() == StoragePoolType.PowerFlex) {
+                } else if (attachingPool.getType() == StoragePoolType.PowerFlex || attachingPool.getType() == StoragePoolType.CLVM) {
                     diskdef.defBlockBasedDisk(attachingDisk.getPath(), devId, busT);
                     if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
                         diskdef.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);