cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [38/50] [abbrv] git commit: updated refs/heads/reporter to b26f3fc
Date Fri, 02 Jan 2015 14:36:30 GMT
CLOUDSTACK-8119. [VMware] Cannot attach more than 8 volumes to a VM.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b1bca2a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1bca2a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1bca2a2

Branch: refs/heads/reporter
Commit: b1bca2a2c02d0f0f5e3435fe2587334ae107495d
Parents: 4d7ede5
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Wed Dec 3 19:28:41 2014 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Wed Dec 24 11:36:27 2014 +0530

----------------------------------------------------------------------
 .../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/b1bca2a2/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 cd96105..727903e 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2323,7 +2323,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) {
@@ -2334,7 +2334,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;


Mime
View raw message