From 178953e9636f27253a849c39c46244c58ba52670 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 14 Aug 2012 16:33:58 -0700 Subject: [PATCH] Adds missing bit from the original CLVM patch 263216caa5b548099451f669fae918ed63608fd7 (https://reviews.apache.org/r/6470/) regarding 'patchDisk' in createPatchVbd. This same patch should apply cleanly to both master and 4.0 branches RB: https://reviews.apache.org/r/6615/ Send-by: shadowsor@gmail.com --- .../kvm/resource/LibvirtComputingResource.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 8b876cf7d0c..0b18eb1bf60 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 @@ -2708,9 +2708,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements /* add patch disk */ DiskDef patchDisk = new DiskDef(); - patchDisk.defFileBasedDisk(datadiskPath, 1, rootDisk.getBusType(), - DiskDef.diskFmtType.RAW); - + if (pool.getType() == StoragePoolType.CLVM) { + patchDisk.defBlockBasedDisk(datadiskPath, 1, rootDisk.getBusType()); + } else { + patchDisk.defFileBasedDisk(datadiskPath, 1, rootDisk.getBusType(), + DiskDef.diskFmtType.RAW); + } + disks.add(patchDisk); String bootArgs = vmSpec.getBootArgs();