Pearl1594 commented on code in PR #6276:
URL: https://github.com/apache/cloudstack/pull/6276#discussion_r934409626
##########
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java:
##########
@@ -4442,6 +4421,42 @@ public UserVmVO doInTransaction(TransactionStatus
status) throws InsufficientCap
});
}
+ private void updateVMDiskController(UserVmVO vm, Map<String, String>
customParameters, GuestOSVO guestOS) {
+ // If hypervisor is vSphere and OS is OS X, set special settings.
+ if (guestOS.getDisplayName().toLowerCase().contains("apple mac os")) {
+ vm.setDetail(VmDetailConstants.SMC_PRESENT, "TRUE");
+ vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, "scsi");
+ vm.setDetail(VmDetailConstants.DATA_DISK_CONTROLLER, "scsi");
+ vm.setDetail(VmDetailConstants.FIRMWARE, "efi");
+ s_logger.info("guestOS is OSX : overwrite root disk controller to
scsi, use smc and efi");
+ } else {
+ String rootDiskControllerSetting =
customParameters.get(VmDetailConstants.ROOT_DISK_CONTROLLER);
+ String dataDiskControllerSetting =
customParameters.get(VmDetailConstants.DATA_DISK_CONTROLLER);
+ if (StringUtils.isNotEmpty(rootDiskControllerSetting)) {
+ vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER,
rootDiskControllerSetting);
+ }
+
+ if (StringUtils.isNotEmpty(dataDiskControllerSetting)) {
+ vm.setDetail(VmDetailConstants.DATA_DISK_CONTROLLER,
dataDiskControllerSetting);
+ }
+
+ String controllerSetting =
StringUtils.defaultIfEmpty(_configDao.getValue(Config.VmwareRootDiskControllerType.key()),
+ Config.VmwareRootDiskControllerType.getDefaultValue());
+
+ // Don't override if VM already has root/data disk controller
detail
+ if (vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER) == null) {
+ vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER,
controllerSetting);
+ }
Review Comment:
I am not sure if it's worth doing this at this point, as it's not merely
checking if it's null and setting it to some value.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
