gitqueue
diff --git a/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java‎
Lines changed: 12 additions & 0 deletions b/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java‎
Lines changed: 2 additions & 0 deletions b/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java‎
Lines changed: 5 additions & 0 deletions b/‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java‎
Lines changed: 5 additions & 0 deletions
@@ -1,3 +1,4 @@
+
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -129,6 +130,17 @@ public <T extends VirtualMachine> VirtualMachineTO implement(VirtualMachineProfi
                 }
             }
         }
+        
+        String diskDeviceType = details.get(VmDetailConstants.ROOK_DISK_CONTROLLER);
+        if (!(vm.getVirtualMachine() instanceof DomainRouterVO || vm.getVirtualMachine() instanceof ConsoleProxyVO 
+            || vm.getVirtualMachine() instanceof SecondaryStorageVmVO)){
+            // user vm
+            if (diskDeviceType != null){
+                details.remove(VmDetailConstants.ROOK_DISK_CONTROLLER);
+            }
+            details.put(VmDetailConstants.ROOK_DISK_CONTROLLER, _vmwareMgr.getRootDiskController());
+        }
+        
         to.setDetails(details);
 
         if(vm.getVirtualMachine() instanceof DomainRouterVO) {
 
@@ -67,4 +67,6 @@ List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceContext, l
     String getPublicVSwitchName(long dcId, HypervisorType hypervisorType);
 
     String getGuestVSwitchName(long dcId, HypervisorType hypervisorType);
+    
+    public String getRootDiskController();
 }
@@ -906,4 +906,9 @@ public Map<String, String> getNexusVSMCredentialsByClusterId(Long clusterId) {
         }
         return nexusVSMCredentials;
     }
+
+    @Override
+    public String getRootDiskController() {
+        return _rootDiskController;
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,6 @@ List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceContext, l`
`67`	`67`	`String getPublicVSwitchName(long dcId, HypervisorType hypervisorType);`
`68`	`68`
`69`	`69`	`String getGuestVSwitchName(long dcId, HypervisorType hypervisorType);`
	`70`	`+`
	`71`	`+ public String getRootDiskController();`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -906,4 +906,9 @@ public Map<String, String> getNexusVSMCredentialsByClusterId(Long clusterId) {`
`906`	`906`	`}`
`907`	`907`	`return nexusVSMCredentials;`
`908`	`908`	`}`
	`909`	`+`
	`910`	`+ @Override`
	`911`	`+ public String getRootDiskController() {`
	`912`	`+ return _rootDiskController;`
	`913`	`+ }`
`909`	`914`	`}`