Skip to content

vmware: disk controller fix #4416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Spaceman1984 wants to merge 1 commit into from
Closed

vmware: disk controller fix #4416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 3 additions & 22 deletions ...hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2048,8 +2048,8 @@ protected StartAnswer execute(StartCommand cmd) {
continue;

VirtualMachineDiskInfo matchingExistingDisk = getMatchingExistingDisk(diskInfoBuilder, vol, hyperHost, context);
controllerKey = getDiskController(matchingExistingDisk, vol, vmSpec, ideControllerKey, scsiControllerKey);
String diskController = getDiskController(vmMo, matchingExistingDisk, vol, new Pair<String, String>(rootDiskController, dataDiskController));

String diskController = getDiskController(vol, new Pair<String, String>(rootDiskController, dataDiskController));

if (DiskControllerType.getType(diskController) == DiskControllerType.osdefault) {
diskController = vmMo.getRecommendedDiskController(null);
Expand Down Expand Up @@ -3003,26 +3003,7 @@ private int getDiskController(VirtualMachineDiskInfo matchingExistingDisk, DiskT
return controllerKey;
}

private String getDiskController(VirtualMachineMO vmMo, VirtualMachineDiskInfo matchingExistingDisk, DiskTO vol, Pair<String, String> controllerInfo) throws Exception {
int controllerKey;
DiskControllerType controllerType = DiskControllerType.none;
if (matchingExistingDisk != null) {
String currentBusName = matchingExistingDisk.getDiskDeviceBusName();
if (currentBusName != null) {
s_logger.info("Chose disk controller based on existing information: " + currentBusName);
if (currentBusName.startsWith("ide")) {
controllerType = DiskControllerType.ide;
} else if (currentBusName.startsWith("scsi")) {
controllerType = DiskControllerType.scsi;
}
}
if (controllerType == DiskControllerType.scsi || controllerType == DiskControllerType.none) {
Ternary<Integer, Integer, DiskControllerType> vmScsiControllerInfo = vmMo.getScsiControllerInfo();
controllerType = vmScsiControllerInfo.third();
}
return controllerType.toString();
}

private String getDiskController(DiskTO vol, Pair<String, String> controllerInfo) {
if (vol.getType() == Volume.Type.ROOT) {
s_logger.info("Chose disk controller for vol " + vol.getType() + " -> " + controllerInfo.first()
+ ", based on root disk controller settings at global configuration setting.");
Expand Down