Changeset 107121 in vbox

Timestamp:

Nov 22, 2024 2:11:54 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166090

Message:

VBox/ostypes.h+Main/{Global,Appliance}+VMMDev+FE/Qt: Add two new OStypes
for Windows 10 and 11 on ARM. bugref:10732

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)
• src/VBox/Main/src-all/Global.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (1 diff)

trunk/include/VBox/ostypes.h

@@ -142 +142 @@
     VBOXOSTYPE_Win10            = 0x3B000,
     VBOXOSTYPE_Win10_x64        = 0x3B100,
+    VBOXOSTYPE_Win10_arm64      = 0x3B300,
     VBOXOSTYPE_Win2k16_x64      = 0x3C100,
     VBOXOSTYPE_Win2k19_x64      = 0x3D100,
     VBOXOSTYPE_Win11_x64        = 0x3E100,
+    VBOXOSTYPE_Win11_arm64      = 0x3E300,
     VBOXOSTYPE_Win2k22_x64      = 0x3F100,
     VBOXOSTYPE_Win2k25_x64      = 0x3F101,

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -186 +186 @@
 {
     const char *pszOs;
-    switch (pGuestInfo->osType & ~VBOXOSTYPE_x64)
+    switch (pGuestInfo->osType & ~VBOXOSTYPE_ArchitectureMask)
     {
         case VBOXOSTYPE_DOS:                              pszOs = "DOS";            break;
@@ -206 +206 @@
         case VBOXOSTYPE_Win2k12_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k12";   break;
         case VBOXOSTYPE_Win81:                            pszOs = "Windows 8.1";    break;
-        case VBOXOSTYPE_Win10:                            pszOs = "Windows 10";     break;
+        case VBOXOSTYPE_Win10:
+            if (   (pGuestInfo->osType & VBOXOSTYPE_ArchitectureMask) == VBOXOSTYPE_arm32
+                || (pGuestInfo->osType & VBOXOSTYPE_ArchitectureMask) == VBOXOSTYPE_arm64)
+                pszOs = "Windows 10 on ARM";
+            else
+                pszOs = "Windows 10";
+            break;
         case VBOXOSTYPE_Win2k16_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k16";   break;
         case VBOXOSTYPE_Win2k19_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k19";   break;
         case VBOXOSTYPE_Win2k22_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k22";   break;
         case VBOXOSTYPE_Win2k25_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k25";   break;
-        case VBOXOSTYPE_Win11_x64 & ~VBOXOSTYPE_x64:      pszOs = "Windows 11";     break;
+        case VBOXOSTYPE_Win11_x64 & ~VBOXOSTYPE_x64:
+            if (   (pGuestInfo->osType & VBOXOSTYPE_ArchitectureMask) == VBOXOSTYPE_arm32
+                || (pGuestInfo->osType & VBOXOSTYPE_ArchitectureMask) == VBOXOSTYPE_arm64)
+                pszOs = "Windows 11 on ARM";
+            else
+                pszOs = "Windows 11";
+            break;
         case VBOXOSTYPE_OS2:                              pszOs = "OS/2";           break;
         case VBOXOSTYPE_OS2Warp3:                         pszOs = "OS/2 Warp 3";    break;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -357 +357 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows10"),             ":/os_win10.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows10"),             ":/os_win10.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Windows10"),             ":/os_win10.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows11"),             ":/os_win11.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Windows11"),             ":/os_win11.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2016"),           ":/os_win2k16.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2019"),           ":/os_win2k19.png");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -90 +90 @@
     { QRegularExpression( "(Wi.*8.*32)|(W8.*32)",            QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Windows8") },
     { QRegularExpression( "(Wi.*10.*64)|(W10.*64)",          QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X64("Windows10") },
+    { QRegularExpression( "(Wi.*10.*64)|(W10.*64)",          QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_A64("Windows10") },
     { QRegularExpression( "(Wi.*10.*32)|(W10.*32)",          QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Windows10") },
     { QRegularExpression( "(Wi.*11)|(W11)",                  QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X64("Windows11") },
+    { QRegularExpression( "(Wi.*11)|(W11)",                  QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_A64("Windows11") },
     { QRegularExpression(  "Wi.*3.*1",                       QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Windows31") },
     /* Set Windows 10 as default for "Windows". */
     { QRegularExpression(  "Wi.*64",                         QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X64("Windows10") },
     { QRegularExpression(  "Wi.*32",                         QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Windows10") },
+    /* Set Windows 11 as default for "Windows" on ARM. */
+    { QRegularExpression(  "Wi.*",                           QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_A64("Windows11") },
     /* ReactOS wants to be considered as Windows 2003 */
     { QRegularExpression(  "Reac.*",                         QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Windows2003") },

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

@@ -47 +47 @@
 #define VBOX_GUEST_ADDITIONS_NAME_NONE     ""
 #define VBOX_GUEST_ADDITIONS_NAME_WIN      "VBoxWindowsAdditions.exe"
+#define VBOX_GUEST_ADDITIONS_NAME_WIN_A64  "VBoxWindowsAdditions-arm64.exe"
 #define VBOX_GUEST_ADDITIONS_NAME_SOLARIS  "VBoxSolarisAdditions.pkg"
 #define VBOX_GUEST_ADDITIONS_NAME_DARWIN   "VBoxDarwinAdditions.pkg"
@@ -200 +201 @@
       StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
 
+    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_A64("Windows10"),       "Windows 10 on ARM (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN_A64, VBOX_OSTYPE_ARM64(Win11), VBOXOSHINT_64BIT | VBOXOSHINT_EFI | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_EFI_SECUREBOOT | VBOXOSHINT_TPM2 | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBHID,
+      2, 4096, 128, 50 * _1G64, GraphicsControllerType_QemuRamFB, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
+      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+
     { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2016"),     "Windows Server 2016 (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN,
       VBOXOSTYPE_Win2k16_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
@@ -214 +219 @@
       2, 4096, 128, 80 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
       StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+
+    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_A64("Windows11"),       "Windows 11 on ARM (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN_A64, VBOX_OSTYPE_ARM64(Win11), VBOXOSHINT_64BIT | VBOXOSHINT_EFI | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_EFI_SECUREBOOT | VBOXOSHINT_TPM2 | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBHID,
+      2, 4096, 128, 80 * _1G64, GraphicsControllerType_QemuRamFB, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
+      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
 
     { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2022"),     "Windows Server 2022 (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN,

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

@@ -288 +288 @@
     { ovf::CIMOSType_CIMOS_Windows10,                            VBOXOSTYPE_Win10 },
     { ovf::CIMOSType_CIMOS_Windows10_64,                         VBOXOSTYPE_Win10_x64 },
+    { ovf::CIMOSType_CIMOS_Windows10_64,                         VBOXOSTYPE_Win10_arm64 },      // no CIM type for this yet
+    { ovf::CIMOSType_CIMOS_Windows10_64,                         VBOXOSTYPE_Win11_x64 },        // no CIM type for this yet
+    { ovf::CIMOSType_CIMOS_Windows10_64,                         VBOXOSTYPE_Win11_arm64 },      // no CIM type for this yet
     { ovf::CIMOSType_CIMOS_WindowsServer2016,                    VBOXOSTYPE_Win2k19_x64 },      // no CIM type for this yet
     { ovf::CIMOSType_CIMOS_WindowsServer2016,                    VBOXOSTYPE_Win2k22_x64 },      // no CIM type for this yet