You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/08/15 23:14:09 UTC
[6/20] git commit: 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
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f6c64941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f6c64941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f6c64941
Branch: refs/heads/4.0
Commit: f6c6494126e905b429c77a2c1e001212d841c837
Parents: eb78e60
Author: Edison Su <su...@gmail.com>
Authored: Tue Aug 14 16:33:58 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Wed Aug 15 14:09:30 2012 -0700
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f6c64941/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
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 8b876cf..0b18eb1 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();