Changeset 93070 in vbox

Timestamp:

Dec 23, 2021 9:51:22 PM (3 years ago)

Author:

vboxsync

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

149077

Message:

Added ArcaOS to the list of OS/2 variants. ticketref:20741

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (3 diffs)
• 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) (2 diffs)
• src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (1 diff)

trunk/include/VBox/ostypes.h

@@ -48 +48 @@
     VBOXOSTYPE_Unknown          = 0,
     VBOXOSTYPE_Unknown_x64      = 0x00100,
+    /** @name DOS and it's descendants
+     * @{ */
     VBOXOSTYPE_DOS              = 0x10000,
     VBOXOSTYPE_Win31            = 0x15000,
@@ -84 +86 @@
     VBOXOSTYPE_OS2Warp45        = 0x43000,
     VBOXOSTYPE_ECS              = 0x44000,
+    VBOXOSTYPE_ArcaOS           = 0x45000,
     VBOXOSTYPE_OS21x            = 0x48000,
+    /** @} */
+    /** @name Unixy related OSes
+     * @{ */
     VBOXOSTYPE_Linux            = 0x50000,
     VBOXOSTYPE_Linux_x64        = 0x50100,
@@ -139 +145 @@
     VBOXOSTYPE_MacOS1012_x64    = 0xB8100,
     VBOXOSTYPE_MacOS1013_x64    = 0xB9100,
+    /** @} */
+    /** @name Other OSes and stuff
+     * @{ */
     VBOXOSTYPE_JRockitVE        = 0xC0000,
     VBOXOSTYPE_Haiku            = 0xD0000,
     VBOXOSTYPE_Haiku_x64        = 0xD0100,
     VBOXOSTYPE_VBoxBS_x64       = 0xE0100,
+    /** @} */
+
 /** The bit number which indicates 64-bit or 32-bit. */
 #define VBOXOSTYPE_x64_BIT       8
     /** The mask which indicates 64-bit. */
-    VBOXOSTYPE_x64            = 1 << VBOXOSTYPE_x64_BIT,
+    VBOXOSTYPE_x64              = 1 << VBOXOSTYPE_x64_BIT,
+
     /** The usual 32-bit hack. */
     VBOXOSTYPE_32BIT_HACK = 0x7fffffff

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

@@ -195 +195 @@
         case VBOXOSTYPE_OS2Warp45:                        pszOs = "OS/2 Warp 4.5";  break;
         case VBOXOSTYPE_ECS:                              pszOs = "OS/2 ECS";       break;
+        case VBOXOSTYPE_ArcaOS:                           pszOs = "OS/2 ArcaOS";    break;
         case VBOXOSTYPE_OS21x:                            pszOs = "OS/2 2.1x";      break;
         case VBOXOSTYPE_Linux:                            pszOs = "Linux";          break;
@@ -228 +229 @@
         case VBOXOSTYPE_MacOS1013_x64 & ~VBOXOSTYPE_x64:  pszOs = "macOS 10.13";    break;
         case VBOXOSTYPE_Haiku:                            pszOs = "Haiku";          break;
+        case VBOXOSTYPE_VBoxBS_x64 & ~VBOXOSTYPE_x64:     pszOs = "VBox Bootsector"; break;
         default:                                          pszOs = "unknown";        break;
     }

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

@@ -358 +358 @@
     m_guestOSTypeIconNames.insert("OS2Warp45",       ":/os_os2warp45.png");
     m_guestOSTypeIconNames.insert("OS2eCS",          ":/os_os2ecs.png");
+    m_guestOSTypeIconNames.insert("OS2ArcaOS",       ":/os_os2_other.png"); /** @todo icon? */
     m_guestOSTypeIconNames.insert("OS21x",           ":/os_os2_other.png");
     m_guestOSTypeIconNames.insert("OS2",             ":/os_os2_other.png");

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

@@ -90 +90 @@
 
     /* OS/2: */
-    { QRegExp( "OS[/|!-]{,1}2.*W.*4.?5",    Qt::CaseInsensitive), "OS2Warp45" },
-    { QRegExp( "OS[/|!-]{,1}2.*W.*4",       Qt::CaseInsensitive), "OS2Warp4" },
-    { QRegExp( "OS[/|!-]{,1}2.*W",          Qt::CaseInsensitive), "OS2Warp3" },
-    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-    { QRegExp( "OS[/|!-]{,1}2",             Qt::CaseInsensitive), "OS2" },
-    { QRegExp( "eComS.*",                   Qt::CaseInsensitive), "OS2eCS" },
+    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+    { QRegExp("OS[/|!-]{,1}2.*W.*4",    Qt::CaseInsensitive), "OS2Warp4" },
+    { QRegExp("OS[/|!-]{,1}2.*W",       Qt::CaseInsensitive), "OS2Warp3" },
+    { QRegExp("OS[/|!-]{,1}2.*e",       Qt::CaseInsensitive), "OS2eCS" },
+    { QRegExp("OS[/|!-]{,1}2.*Ar.*",    Qt::CaseInsensitive), "OS2ArcaOS" },
+    { QRegExp("OS[/|!-]{,1}2",          Qt::CaseInsensitive), "OS2" },
+    { QRegExp("(eComS.*|eCS.*)",        Qt::CaseInsensitive), "OS2eCS" },
+    { QRegExp("Arca.*",                 Qt::CaseInsensitive), "OS2ArcaOS" },
 
     /* Other: Must come before Ubuntu/Maverick and before Linux??? */

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

@@ -405 +405 @@
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
+    { "OS2",     "IBM OS/2",          "OS21x",              "OS/2 1.x",
+      VBOXOSTYPE_OS21x,           VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET,
+      1,    8,   4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
+
     { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
@@ -425 +430 @@
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
-    { "OS2",     "IBM OS/2",          "OS21x",              "OS/2 1.x",
-      VBOXOSTYPE_OS21x,           VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET,
-      1,    8,   4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
+    { "OS2",     "IBM OS/2",          "OS2ArcaOS",          "ArcaOS",
+      VBOXOSTYPE_ArcaOS,          VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
+      1, 1024,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 1, StorageControllerType_IntelAhci, StorageBus_SATA,
+      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 },
 
     { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",

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

@@ -85 +85 @@
     { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2Warp4 },
     { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2Warp45 },
+    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS21x },
+    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_ECS },
+    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_ArcaOS },
     { ovf::CIMOSType_CIMOS_MSDOS,                                VBOXOSTYPE_DOS },
     { ovf::CIMOSType_CIMOS_WIN3x,                                VBOXOSTYPE_Win31 },