(cloudstack) branch main updated: kvm: fix vm deployment from RAW template (#10880)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 96b8e23767e kvm: fix vm deployment from RAW template (#10880)
96b8e23767e is described below

commit 96b8e23767ec1f01b66641edaa9bc94283e6528a
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Mon May 19 21:44:01 2025 +0200

    kvm: fix vm deployment from RAW template (#10880)
    
    * kvm: fix vm deployment from RAW template
    
    * Update 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
    
    Co-authored-by: João Jandre <48719461+joaojan...@users.noreply.github.com>
    
    ---------
    
    Co-authored-by: João Jandre <48719461+joaojan...@users.noreply.github.com>
---
 .../java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index d3710b57663..c0d58c57908 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -1609,7 +1609,9 @@ public class LibvirtStorageAdaptor implements 
StorageAdaptor {
                     } else {
                         destFile = new QemuImgFile(destPath, destFormat);
                         try {
-                            qemu.convert(srcFile, destFile, null, null, new 
QemuImageOptions(srcFile.getFormat(), srcFile.getFileName(), null), null, 
false, true);
+                            boolean isQCOW2 = 
PhysicalDiskFormat.QCOW2.equals(sourceFormat);
+                            qemu.convert(srcFile, destFile, null, null, new 
QemuImageOptions(srcFile.getFormat(), srcFile.getFileName(), null),
+                                    null, false, isQCOW2);
                             Map<String, String> destInfo = qemu.info(destFile);
                             Long virtualSize = 
Long.parseLong(destInfo.get(QemuImg.VIRTUAL_SIZE));
                             newDisk.setVirtualSize(virtualSize);