Changeset 102085 in vbox

Timestamp:

Nov 13, 2023 3:42:38 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: VM Settings / General page: Make sure LONG mode setting saved on the basis of current settings dialog architecture, not CMachine architecture; Those two are just different sources of the same value, but the last one is used everwhere, so for consistence.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -54 +54 @@
 #include "CPlatform.h"
 #include "CPlatformX86.h"
-#ifdef VBOX_WITH_VIRT_ARMV8
-# include "CPlatformARM.h"
-#endif
 #include "CProgress.h"
 
@@ -777 +774 @@
             {
                 /* Update long mode CPU feature bit when OS type changed: */
-                const CPlatform comPlatform = m_machine.GetPlatform();
-                switch (comPlatform.GetArchitecture())
+                const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
+                                                    ? optionalFlags().value("arch").value<KPlatformArchitecture>()
+                                                    : KPlatformArchitecture_x86;
+                switch (enmArch)
                 {
                     case KPlatformArchitecture_x86:
                     {
+                        const CPlatform comPlatform = m_machine.GetPlatform();
                         CPlatformX86 comPlatformX86 = comPlatform.GetX86();
-                        const CGuestOSType &comNewType = uiCommon().virtualBox().GetGuestOSType(newGeneralData.m_strGuestOsTypeId);
+                        const CGuestOSType comNewType = uiCommon().virtualBox().GetGuestOSType(newGeneralData.m_strGuestOsTypeId);
                         comPlatformX86.SetCPUProperty(KCPUPropertyTypeX86_LongMode, comNewType.GetIs64Bit());
                         fSuccess = comPlatformX86.isOk();
@@ -789 +789 @@
                         break;
                     }
-
-#ifdef VBOX_WITH_VIRT_ARMV8
-                    case KPlatformArchitecture_ARM:
-                    {
-                        CPlatformARM comPlatformARM = comPlatform.GetARM();
-                        /** @todo BUGBUG ARM stuff goes here. */
-                        fSuccess = comPlatformARM.isOk();
-                        break;
-                    }
-#endif
-
                     default:
                         break;