Index: include/VBox/ostypes.h =================================================================== --- include/VBox/ostypes.h (revision 92744) +++ include/VBox/ostypes.h (working copy) @@ -84,6 +84,7 @@ VBOXOSTYPE_OS2Warp45 = 0x43000, VBOXOSTYPE_ECS = 0x44000, VBOXOSTYPE_OS21x = 0x48000, + VBOXOSTYPE_ArcaOS = 0x49000, VBOXOSTYPE_Linux = 0x50000, VBOXOSTYPE_Linux_x64 = 0x50100, VBOXOSTYPE_Linux22 = 0x51000, Index: src/VBox/Devices/VMMDev/VMMDev.cpp =================================================================== --- src/VBox/Devices/VMMDev/VMMDev.cpp (revision 92744) +++ src/VBox/Devices/VMMDev/VMMDev.cpp (working copy) @@ -195,6 +195,7 @@ case VBOXOSTYPE_OS2Warp45: pszOs = "OS/2 Warp 4.5"; break; case VBOXOSTYPE_ECS: pszOs = "OS/2 ECS"; break; case VBOXOSTYPE_OS21x: pszOs = "OS/2 2.1x"; break; + case VBOXOSTYPE_ArcaOS: pszOs = "OS/2 ArcaOS"; break; case VBOXOSTYPE_Linux: pszOs = "Linux"; break; case VBOXOSTYPE_Linux22: pszOs = "Linux 2.2"; break; case VBOXOSTYPE_Linux24: pszOs = "Linux 2.4"; break; Index: src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (revision 92744) +++ src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (working copy) @@ -359,6 +359,7 @@ m_guestOSTypeIconNames.insert("OS2eCS", ":/os_os2ecs.png"); m_guestOSTypeIconNames.insert("OS21x", ":/os_os2_other.png"); m_guestOSTypeIconNames.insert("OS2", ":/os_os2_other.png"); + m_guestOSTypeIconNames.insert("OS2ArcaOS" ":/os_os2_other.png"); m_guestOSTypeIconNames.insert("Linux22", ":/os_linux22.png"); m_guestOSTypeIconNames.insert("Linux24", ":/os_linux24.png"); m_guestOSTypeIconNames.insert("Linux24_64", ":/os_linux24_64.png"); Index: src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (revision 92744) +++ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (working copy) @@ -89,12 +89,14 @@ { QRegExp("Sol.*32", Qt::CaseInsensitive), "Solaris" }, /* 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)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, + { QRegExp("(OS[/|!-]{,1}2.*a)|(Arca.*)", Qt::CaseInsensitive), "OS2ArcaOS" }, + { QRegExp( "OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, + { QRegExp( "eComS.*", Qt::CaseInsensitive), "OS2eCS" }, + { QRegExp( "Arca.*", Qt::CaseInsensitive), "OS2ArcaOS" }, /* Other: Must come before Ubuntu/Maverick and before Linux??? */ { QRegExp("QN", Qt::CaseInsensitive), "QNX" }, Index: src/VBox/Main/include/ovfreader.h =================================================================== --- src/VBox/Main/include/ovfreader.h (revision 92744) +++ src/VBox/Main/include/ovfreader.h (working copy) @@ -190,6 +190,7 @@ CIMOSType_CIMOS_WindowsServer2016 = 118, CIMOSType_CIMOS_Windows10 = 119, CIMOSType_CIMOS_Windows10_64 = 120, + CIMOSType_CIMOS_ArcaOS = 121, // the above covers up to CIM 2.52.0, without checking when it was added }; Index: src/VBox/Main/src-all/Global.cpp =================================================================== --- src/VBox/Main/src-all/Global.cpp (revision 92744) +++ src/VBox/Main/src-all/Global.cpp (working copy) @@ -429,6 +429,11 @@ 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, 16, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 1, StorageControllerType_IntelAhci, StorageBus_SATA, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, + { "OS2", "IBM OS/2", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 1, 96, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, Index: src/VBox/Main/src-server/ApplianceImpl.cpp =================================================================== --- src/VBox/Main/src-server/ApplianceImpl.cpp (revision 92744) +++ src/VBox/Main/src-server/ApplianceImpl.cpp (working copy) @@ -187,6 +187,8 @@ { ovf::CIMOSType_CIMOS_Windows10_64, VBOXOSTYPE_Win10_x64 }, { ovf::CIMOSType_CIMOS_WindowsServer2016, VBOXOSTYPE_Win2k19_x64 }, // no CIM type for this yet + { ovf::CIMOSType_CIMOS_ArcaOS, VBOXOSTYPE_ArcaOS }, + // there are no CIM types for these, so these turn to "other" on export: // VBOXOSTYPE_OpenBSD // VBOXOSTYPE_OpenBSD_x64 Index: src/VBox/Main/xml/Settings.cpp =================================================================== --- src/VBox/Main/xml/Settings.cpp (revision 92744) +++ src/VBox/Main/xml/Settings.cpp (working copy) @@ -5950,7 +5950,8 @@ { "netware", "Netware" }, { "solaris", "Solaris" }, { "opensolaris", "OpenSolaris" }, - { "l4", "L4" } + { "l4", "L4" }, + { "arca", "OS2ArcaOS" } }; void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)