Changeset 101188 in vbox for trunk/src/VBox

Timestamp:

Sep 20, 2023 9:19:31 AM (16 months ago)

Author:

vboxsync

Message:

ostypes.h: Renamed _arm32 / _arm64 -> _ARM32 / _ARM64, to match the rest of the stuff.

Location:

trunk/src/VBox/Main

Files:

• src-all/Global.cpp (modified) (1 diff)
• src-server/GuestOSTypeImpl.cpp (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/Global.cpp

@@ -61 +61 @@
 #ifdef VBOX_WITH_VIRT_ARMV8
     { "Other",   "Other",             "",               "Other_ARM",          "Other/Unknown (ARM)",
-      VBOXOSTYPE_Unknown_arm32,       VBOXOSHINT_NONE | VBOXOSHINT_EFI,
+      VBOXOSTYPE_Unknown_ARM32,       VBOXOSHINT_NONE | VBOXOSHINT_EFI,
       1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
       StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_VirtioSound, AudioCodecType_Null },
 
     { "Other",   "Other",             "",               "Other_ARM64",        "Other/Unknown (ARM 64-bit)",
-      VBOXOSTYPE_Unknown_arm64,       VBOXOSHINT_64BIT | VBOXOSHINT_EFI,
+      VBOXOSTYPE_Unknown_ARM64,       VBOXOSHINT_64BIT | VBOXOSHINT_EFI,
       1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
       StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_VirtioSound, AudioCodecType_Null },

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

@@ -215 +215 @@
         || osTypePlatformArchitectureMasked & VBOXOSTYPE_x64)
         return PlatformArchitecture_x86;
-    else if (   osTypePlatformArchitectureMasked & VBOXOSTYPE_arm32
-             || osTypePlatformArchitectureMasked & VBOXOSTYPE_arm64)
+    else if (   osTypePlatformArchitectureMasked & VBOXOSTYPE_ARM32
+             || osTypePlatformArchitectureMasked & VBOXOSTYPE_ARM64)
         return PlatformArchitecture_ARM;
 

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

@@ -550 +550 @@
         /* PROCESSOR_ARCHITECTURE_PPC           / [3]  = */ { "ppc",                 VBOXOSTYPE_UnknownArch },
         /* PROCESSOR_ARCHITECTURE_SHX           / [4]  = */ { "shx",                 VBOXOSTYPE_UnknownArch },
-        /* PROCESSOR_ARCHITECTURE_ARM           / [5]  = */ { "arm32",               VBOXOSTYPE_arm32       },
+        /* PROCESSOR_ARCHITECTURE_ARM           / [5]  = */ { "arm32",               VBOXOSTYPE_ARM32       },
         /* PROCESSOR_ARCHITECTURE_IA64          / [6]  = */ { "ia64",                VBOXOSTYPE_UnknownArch },
         /* PROCESSOR_ARCHITECTURE_ALPHA64       / [7]  = */ { "alpha64",             VBOXOSTYPE_UnknownArch },
@@ -557 +557 @@
         /* PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 / [10] = */ { "x86-on-x64",          VBOXOSTYPE_UnknownArch },
         /* PROCESSOR_ARCHITECTURE_NEUTRAL       / [11] = */ { "noarch",              VBOXOSTYPE_UnknownArch },
-        /* PROCESSOR_ARCHITECTURE_ARM64         / [12] = */ { "arm64",               VBOXOSTYPE_arm64       },
+        /* PROCESSOR_ARCHITECTURE_ARM64         / [12] = */ { "arm64",               VBOXOSTYPE_ARM64       },
         /* PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64/ [13] = */ { "arm32-on-arm64",      VBOXOSTYPE_UnknownArch },
         /* PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 / [14] = */ { "x86-on-arm32",        VBOXOSTYPE_UnknownArch },
@@ -1306 +1306 @@
     { RT_STR_TUPLE("x64"),    VBOXOSTYPE_x64 }, /* ditto */
 
-    { RT_STR_TUPLE("arm"),    VBOXOSTYPE_arm64 },
-    { RT_STR_TUPLE("arm64"),  VBOXOSTYPE_arm64 },
-    { RT_STR_TUPLE("arm-64"), VBOXOSTYPE_arm64 },
-    { RT_STR_TUPLE("arm_64"), VBOXOSTYPE_arm64 },
-
-    { RT_STR_TUPLE("arm32"),  VBOXOSTYPE_arm32 },
-    { RT_STR_TUPLE("arm-32"), VBOXOSTYPE_arm32 },
-    { RT_STR_TUPLE("arm_32"), VBOXOSTYPE_arm32 },
-    { RT_STR_TUPLE("armel"),  VBOXOSTYPE_arm32 }, // mostly Debians
+    { RT_STR_TUPLE("arm"),    VBOXOSTYPE_ARM64 },
+    { RT_STR_TUPLE("arm64"),  VBOXOSTYPE_ARM64 },
+    { RT_STR_TUPLE("arm-64"), VBOXOSTYPE_ARM64 },
+    { RT_STR_TUPLE("arm_64"), VBOXOSTYPE_ARM64 },
+
+    { RT_STR_TUPLE("arm32"),  VBOXOSTYPE_ARM32 },
+    { RT_STR_TUPLE("arm-32"), VBOXOSTYPE_ARM32 },
+    { RT_STR_TUPLE("arm_32"), VBOXOSTYPE_ARM32 },
+    { RT_STR_TUPLE("armel"),  VBOXOSTYPE_ARM32 }, // mostly Debians
 
     { RT_STR_TUPLE("x86"),    VBOXOSTYPE_x86 },
@@ -2073 +2073 @@
         static struct { const char *pszFile; VBOXOSTYPE fArch; } const s_aArchSpecificFiles[] =
         {
-            { "EFI/BOOT/grubaa64.efi", VBOXOSTYPE_arm64 },
-            { "EFI/BOOT/BOOTAA64.EFI", VBOXOSTYPE_arm64 },
+            { "EFI/BOOT/grubaa64.efi", VBOXOSTYPE_ARM64 },
+            { "EFI/BOOT/BOOTAA64.EFI", VBOXOSTYPE_ARM64 },
         };
         PRTFSOBJINFO pObjInfo = (PRTFSOBJINFO)&pBuf->ab[0];
@@ -3957 +3957 @@
     /* For now we don't support unattended installation for ARM guests. */
     const VBOXOSTYPE enmArchitectureMasked = (VBOXOSTYPE)(mEnmOsType & VBOXOSTYPE_ArchitectureMask);
-    if (   enmArchitectureMasked == VBOXOSTYPE_arm32
-        || enmArchitectureMasked == VBOXOSTYPE_arm64)
+    if (   enmArchitectureMasked == VBOXOSTYPE_ARM32
+        || enmArchitectureMasked == VBOXOSTYPE_ARM64)
         return S_OK;