Changeset 101204 in vbox

Timestamp:

Sep 20, 2023 2:43:40 PM (12 months ago)

Author:

vboxsync

Message:

ostypes.h + Main: Renamed ARM32 -> arm32 + ARM64 -> arm64.

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (4 diffs)
• src/VBox/Main/src-all/Global.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/GuestOSTypeImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (5 diffs)

trunk/include/VBox/ostypes.h

@@ -56 +56 @@
     VBOXOSTYPE_Unknown          = 0,
     VBOXOSTYPE_Unknown_x64      = 0x00100,
-    VBOXOSTYPE_Unknown_ARM32    = 0x00200,
-    VBOXOSTYPE_Unknown_ARM64    = 0x00300,
+    VBOXOSTYPE_Unknown_arm32    = 0x00200,
+    VBOXOSTYPE_Unknown_arm64    = 0x00300,
 
     /** @name DOS and it's descendants
@@ -114 +114 @@
     VBOXOSTYPE_Debian           = 0x55000,
     VBOXOSTYPE_Debian_x64       = 0x55100,
-    VBOXOSTYPE_Debian_ARM32     = 0x55200,
-    VBOXOSTYPE_Debian_ARM64     = 0x55300,
+    VBOXOSTYPE_Debian_arm32     = 0x55200,
+    VBOXOSTYPE_Debian_arm64     = 0x55300,
     VBOXOSTYPE_Debian31         = 0x55001,  // 32-bit only
     VBOXOSTYPE_Debian4          = 0x55002,
@@ -173 +173 @@
     VBOXOSTYPE_Ubuntu           = 0x5C000,
     VBOXOSTYPE_Ubuntu_x64       = 0x5C100,
-    VBOXOSTYPE_Ubuntu_ARM32     = 0x5C200,
-    VBOXOSTYPE_Ubuntu_ARM64     = 0x5C300,
+    VBOXOSTYPE_Ubuntu_arm32     = 0x5C200,
+    VBOXOSTYPE_Ubuntu_arm64     = 0x5C300,
     VBOXOSTYPE_Xubuntu          = 0x5C001,
     VBOXOSTYPE_Xubuntu_x64      = 0x5C101,
@@ -278 +278 @@
     VBOXOSTYPE_x64              = 0x00100,
     /** Architecture value for 32-bit ARM. */
-    VBOXOSTYPE_ARM32            = 0x00200,
+    VBOXOSTYPE_arm32            = 0x00200,
     /** Architecture value for 64-bit ARM. */
-    VBOXOSTYPE_ARM64            = 0x00300,
+    VBOXOSTYPE_arm64            = 0x00300,
     /** Architecture value for unknown or unsupported architectures. */
     VBOXOSTYPE_UnknownArch      = 0x00f00,

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

@@ -62 +62 @@
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 },
 
-    { "Other",   "Other",             "",               "Other_ARM64",        "Other/Unknown (ARM 64-bit)",
-      VBOXOSTYPE_Unknown_ARM64,       VBOXOSHINT_64BIT | VBOXOSHINT_EFI,
+    { "Other",   "Other",             "",               "Other_arm64",        "Other/Unknown (ARM 64-bit)",
+      VBOXOSTYPE_Unknown_arm64,       VBOXOSHINT_64BIT | VBOXOSHINT_EFI,
       1,   64,   4,  2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
       StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_VirtioSound, AudioCodecType_Null },
@@ -232 +232 @@
 #define VBOX_LINUX_OSTYPE_X86(a_OStype)     VBOXOSTYPE_ ## a_OStype
 #define VBOX_LINUX_OSTYPE_X64(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _x64
-#define VBOX_LINUX_OSTYPE_ARM32(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _ARM32
-#define VBOX_LINUX_OSTYPE_ARM64(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _ARM64
+#define VBOX_LINUX_OSTYPE_ARM32(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _arm32
+#define VBOX_LINUX_OSTYPE_ARM64(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _arm64
 
 /** Base string for Linux-based OS IDs. */
@@ -242 +242 @@
 #define VBOX_LINUX_OSID_STR_X64(a_OSid)     VBOX_LINUX_OSID_STR_BASE(a_OSid ## _64)
 /* New since VBox 7.1. */
-#define VBOX_LINUX_OSID_STR_ARM32(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _ARM32)
+#define VBOX_LINUX_OSID_STR_ARM32(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _arm32)
 /* New since VBox 7.1. */
-#define VBOX_LINUX_OSID_STR_ARM64(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _ARM64)
+#define VBOX_LINUX_OSID_STR_ARM64(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _arm64)
 
 #define VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \

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;