Changeset 108082 in vbox
- Timestamp:
- Feb 5, 2025 5:37:00 PM (2 weeks ago)
- svn:sync-xref-src-repo-rev:
- 167376
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
r107682 r108082 786 786 const CGuestOSType comNewType = gpGlobalSession->virtualBox().GetGuestOSType(newGeneralData.m_strGuestOsTypeId); 787 787 comPlatformX86.SetCPUProperty(KCPUPropertyTypeX86_LongMode, comNewType.GetIs64Bit()); 788 fSuccess = comPlatformX86.isOk(); 789 /// @todo convey error info .. 788 if (!comPlatformX86.isOk()) 789 { 790 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatformX86)); 791 return false; 792 } 790 793 break; 791 794 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
r107478 r108082 978 978 CPlatform comPlatform = m_machine.GetPlatform(); 979 979 comPlatform.SetChipsetType(newSystemData.m_chipsetType); 980 fSuccess = comPlatform.isOk(); 981 /// @todo convey error info .. 980 if (!comPlatform.isOk()) 981 { 982 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatform)); 983 return false; 984 } 982 985 } 983 986 /* Save TPM type: */ … … 986 989 CTrustedPlatformModule comModule = m_machine.GetTrustedPlatformModule(); 987 990 comModule.SetType(newSystemData.m_tpmType); 988 fSuccess = comModule.isOk(); 989 /// @todo convey error info .. 991 if (!comModule.isOk()) 992 { 993 notifyOperationProgressError(UIErrorString::formatErrorInfo(comModule)); 994 return false; 995 } 990 996 } 991 997 /* Save pointing HID type: */ … … 1000 1006 CFirmwareSettings comFirmwareSettings = m_machine.GetFirmwareSettings(); 1001 1007 comFirmwareSettings.SetIOAPICEnabled(newSystemData.m_fEnabledIoApic); 1002 fSuccess = comFirmwareSettings.isOk(); 1003 /// @todo convey error info .. 1008 if (!comFirmwareSettings.isOk()) 1009 { 1010 notifyOperationProgressError(UIErrorString::formatErrorInfo(comFirmwareSettings)); 1011 return false; 1012 } 1004 1013 } 1005 1014 /* Save firware type (whether EFI is enabled): */ … … 1008 1017 CFirmwareSettings comFirmwareSettings = m_machine.GetFirmwareSettings(); 1009 1018 comFirmwareSettings.SetFirmwareType(newSystemData.m_fEnabledEFI ? KFirmwareType_EFI : KFirmwareType_BIOS); 1010 fSuccess = comFirmwareSettings.isOk(); 1011 /// @todo convey error info .. 1019 if (!comFirmwareSettings.isOk()) 1020 { 1021 notifyOperationProgressError(UIErrorString::formatErrorInfo(comFirmwareSettings)); 1022 return false; 1023 } 1012 1024 } 1013 1025 /* Save whether UTC is enabled: */ … … 1016 1028 CPlatform comPlatform = m_machine.GetPlatform(); 1017 1029 comPlatform.SetRTCUseUTC(newSystemData.m_fEnabledUTC); 1018 fSuccess = comPlatform.isOk(); 1019 /// @todo convey error info .. 1030 if (!comPlatform.isOk()) 1031 { 1032 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatform)); 1033 return false; 1034 } 1020 1035 } 1021 1036 /* Save whether secure boot is enabled: */ … … 1038 1053 /* Init if required: */ 1039 1054 if (!newSystemData.m_fAvailableSecureBoot) 1055 { 1040 1056 comStoreLvl1.InitUefiVariableStore(0); 1057 if (!comStoreLvl1.isOk()) 1058 { 1059 notifyOperationProgressError(UIErrorString::formatErrorInfo(comStoreLvl1)); 1060 return false; 1061 } 1062 } 1041 1063 /* Enroll everything: */ 1042 1064 comStoreLvl2 = comStoreLvl1.GetUefiVariableStore(); 1043 1065 comStoreLvl2.EnrollOraclePlatformKey(); 1066 if (!comStoreLvl2.isOk()) 1067 { 1068 notifyOperationProgressError(UIErrorString::formatErrorInfo(comStoreLvl2)); 1069 return false; 1070 } 1044 1071 comStoreLvl2.EnrollDefaultMsSignatures(); 1072 if (!comStoreLvl2.isOk()) 1073 { 1074 notifyOperationProgressError(UIErrorString::formatErrorInfo(comStoreLvl2)); 1075 return false; 1076 } 1045 1077 } 1046 1078 comStoreLvl2.SetSecureBootEnabled(true); 1047 fSuccess = comStoreLvl2.isOk(); 1048 /// @todo convey error info .. 1079 if (!comStoreLvl2.isOk()) 1080 { 1081 notifyOperationProgressError(UIErrorString::formatErrorInfo(comStoreLvl2)); 1082 return false; 1083 } 1049 1084 } 1050 1085 /* Disabling secure boot? */ … … 1052 1087 { 1053 1088 comStoreLvl2.SetSecureBootEnabled(false); 1054 fSuccess = comStoreLvl2.isOk(); 1055 /// @todo convey error info .. 1089 if (!comStoreLvl2.isOk()) 1090 { 1091 notifyOperationProgressError(UIErrorString::formatErrorInfo(comStoreLvl2)); 1092 return false; 1093 } 1056 1094 } 1057 1095 } … … 1100 1138 { 1101 1139 comPlatformX86.SetCPUProperty(KCPUPropertyTypeX86_PAE, newSystemData.m_fEnabledPAE); 1102 fSuccess = comPlatformX86.isOk(); 1103 /// @todo convey error info .. 1140 if (!comPlatformX86.isOk()) 1141 { 1142 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatformX86)); 1143 return false; 1144 } 1104 1145 } 1105 1146 /* Save whether Nested HW Virt Ex is enabled: */ … … 1107 1148 { 1108 1149 comPlatformX86.SetCPUProperty(KCPUPropertyTypeX86_HWVirt, newSystemData.m_fEnabledNestedHwVirtEx); 1109 fSuccess = comPlatformX86.isOk(); 1110 /// @todo convey error info .. 1150 if (!comPlatformX86.isOk()) 1151 { 1152 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatformX86)); 1153 return false; 1154 } 1111 1155 } 1112 1156 … … 1176 1220 { 1177 1221 comPlatformX86.SetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging, newSystemData.m_fEnabledNestedPaging); 1178 fSuccess = comPlatformX86.isOk(); 1179 /// @todo convey error info .. 1222 if (!comPlatformX86.isOk()) 1223 { 1224 notifyOperationProgressError(UIErrorString::formatErrorInfo(comPlatformX86)); 1225 return false; 1226 } 1180 1227 } 1181 1228
Note:
See TracChangeset
for help on using the changeset viewer.