From c874e20c24e8bcf7b606c55ef924606b857c1f6d Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Tue, 11 Mar 2014 11:13:12 -0600 Subject: [PATCH] CLOUDSTACK-6225: Check libvirt version and volume format before adding flag VIR_STORAGE_VOL_RESIZE_ALLOCATE to resize volume libvirt call --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5912dd34d2a..f4f6c740c1d 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 @@ -1804,8 +1804,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv try { Connect conn = LibvirtConnection.getConnection(); StorageVol v = conn.storageVolLookupByPath(path); + int flags = 0; - int flags = 1; + if (conn.getLibVirVersion() > 1001000 && vol.getFormat() == PhysicalDiskFormat.RAW) { + flags = 1; + } if (shrinkOk) { flags = 4; }