You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/04/17 16:06:15 UTC
[6/7] git commit: updated refs/heads/4.5 to 48c1ffd
CLOUDSTACK-8119. [VMware] Cannot attach more than 8 volumes to a VM.
(cherry picked from commit b1bca2a2c02d0f0f5e3435fe2587334ae107495d)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8aabab8a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8aabab8a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8aabab8a
Branch: refs/heads/4.5
Commit: 8aabab8a5629c06c8ee7aeffbf99dc67ccceb851
Parents: 4708a0b
Author: Likitha Shetty <li...@citrix.com>
Authored: Wed Dec 3 19:28:41 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 17 15:54:03 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8aabab8a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 8f9eec0..ac5b414 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2377,7 +2377,7 @@ public class VirtualMachineMO extends BaseMO {
List<Integer> existingUnitNumbers = new ArrayList<Integer>();
int deviceNumber = 0;
- int ideControllerKey = getIDEDeviceControllerKey();
+ int scsiControllerKey = getScsiDeviceControllerKeyNoException();
if (devices != null && devices.size() > 0) {
for (VirtualDevice device : devices) {
if (device.getControllerKey() != null && device.getControllerKey().intValue() == controllerKey) {
@@ -2388,7 +2388,7 @@ public class VirtualMachineMO extends BaseMO {
while (true) {
// Next device number should be the lowest device number on the key that is not in use and is not reserved.
if (!existingUnitNumbers.contains(Integer.valueOf(deviceNumber))) {
- if (controllerKey != ideControllerKey && !VmwareHelper.isReservedScsiDeviceNumber(deviceNumber))
+ if (controllerKey != scsiControllerKey || !VmwareHelper.isReservedScsiDeviceNumber(deviceNumber))
break;
}
++deviceNumber;