Changeset 101271 in vbox

Timestamp:

Sep 26, 2023 1:13:10 PM (12 months ago)

Author:

vboxsync

Message:

Main: More guest OS types string fixes; we now use explicitly _x64 instead of _64 for the x86_64 stuff.

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImplConfigX86.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -806 +806 @@
             uint32_t uMaxIntelFamilyModelStep = UINT32_MAX;
             if (   osTypeId == "MacOS"
-                || osTypeId == "MacOS_64")
+                || osTypeId == "MacOS_x64")
                 uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn / X5482. */
             else if (   osTypeId == "MacOS106"
-                     || osTypeId == "MacOS106_64")
+                     || osTypeId == "MacOS106_x64")
                 uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn / X5482 */
             else if (   osTypeId == "MacOS107"
-                     || osTypeId == "MacOS107_64")
+                     || osTypeId == "MacOS107_x64")
                 uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn / X5482 */ /** @todo figure out
                                                                                 what is required here. */
             else if (   osTypeId == "MacOS108"
-                     || osTypeId == "MacOS108_64")
+                     || osTypeId == "MacOS108_x64")
                 uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn / X5482 */ /** @todo figure out
                                                                                 what is required here. */
             else if (   osTypeId == "MacOS109"
-                     || osTypeId == "MacOS109_64")
+                     || osTypeId == "MacOS109_x64")
                 uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn / X5482 */ /** @todo figure
                                                                                 out what is required here. */

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -501 +501 @@
 
         /* Enable the VMMDev testing feature for bootsector VMs: */
-        if (aOsType && aOsType->i_id() == "VBoxBS_64")
+        if (aOsType && aOsType->i_id() == "VBoxBS_x64")
             mData->pMachineConfigFile->mapExtraDataItems["VBoxInternal/Devices/VMMDev/0/Config/TestingEnabled"] = "1";
 
@@ -15359 +15359 @@
 
     /* Enable the VMMDev testing feature for bootsector VMs: */
-    if (osTypeId == "VBoxBS_64")
+    if (osTypeId == "VBoxBS_x64")
     {
         hrc = setExtraData("VBoxInternal/Devices/VMMDev/0/Config/TestingEnabled", "1");