VirtualBox

Ticket #20741: VBox-ArcaOS-patch.txt

File VBox-ArcaOS-patch.txt, 6.9 KB (added by martiniturbide, 3 years ago)

Patch file

Line 
1Index: include/VBox/ostypes.h
2===================================================================
3--- include/VBox/ostypes.h (revision 92744)
4+++ include/VBox/ostypes.h (working copy)
5@@ -84,6 +84,7 @@
6 VBOXOSTYPE_OS2Warp45 = 0x43000,
7 VBOXOSTYPE_ECS = 0x44000,
8 VBOXOSTYPE_OS21x = 0x48000,
9+ VBOXOSTYPE_ArcaOS = 0x49000,
10 VBOXOSTYPE_Linux = 0x50000,
11 VBOXOSTYPE_Linux_x64 = 0x50100,
12 VBOXOSTYPE_Linux22 = 0x51000,
13Index: src/VBox/Devices/VMMDev/VMMDev.cpp
14===================================================================
15--- src/VBox/Devices/VMMDev/VMMDev.cpp (revision 92744)
16+++ src/VBox/Devices/VMMDev/VMMDev.cpp (working copy)
17@@ -195,6 +195,7 @@
18 case VBOXOSTYPE_OS2Warp45: pszOs = "OS/2 Warp 4.5"; break;
19 case VBOXOSTYPE_ECS: pszOs = "OS/2 ECS"; break;
20 case VBOXOSTYPE_OS21x: pszOs = "OS/2 2.1x"; break;
21+ case VBOXOSTYPE_ArcaOS: pszOs = "OS/2 ArcaOS"; break;
22 case VBOXOSTYPE_Linux: pszOs = "Linux"; break;
23 case VBOXOSTYPE_Linux22: pszOs = "Linux 2.2"; break;
24 case VBOXOSTYPE_Linux24: pszOs = "Linux 2.4"; break;
25Index: src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
26===================================================================
27--- src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (revision 92744)
28+++ src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (working copy)
29@@ -359,6 +359,7 @@
30 m_guestOSTypeIconNames.insert("OS2eCS", ":/os_os2ecs.png");
31 m_guestOSTypeIconNames.insert("OS21x", ":/os_os2_other.png");
32 m_guestOSTypeIconNames.insert("OS2", ":/os_os2_other.png");
33+ m_guestOSTypeIconNames.insert("OS2ArcaOS" ":/os_os2_other.png");
34 m_guestOSTypeIconNames.insert("Linux22", ":/os_linux22.png");
35 m_guestOSTypeIconNames.insert("Linux24", ":/os_linux24.png");
36 m_guestOSTypeIconNames.insert("Linux24_64", ":/os_linux24_64.png");
37Index: src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp
38===================================================================
39--- src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (revision 92744)
40+++ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (working copy)
41@@ -89,12 +89,14 @@
42 { QRegExp("Sol.*32", Qt::CaseInsensitive), "Solaris" },
43
44 /* OS/2: */
45- { QRegExp( "OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
46- { QRegExp( "OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
47- { QRegExp( "OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
48- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
49- { QRegExp( "OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
50- { QRegExp( "eComS.*", Qt::CaseInsensitive), "OS2eCS" },
51+ { QRegExp( "OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
52+ { QRegExp( "OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
53+ { QRegExp( "OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
54+ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
55+ { QRegExp("(OS[/|!-]{,1}2.*a)|(Arca.*)", Qt::CaseInsensitive), "OS2ArcaOS" },
56+ { QRegExp( "OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
57+ { QRegExp( "eComS.*", Qt::CaseInsensitive), "OS2eCS" },
58+ { QRegExp( "Arca.*", Qt::CaseInsensitive), "OS2ArcaOS" },
59
60 /* Other: Must come before Ubuntu/Maverick and before Linux??? */
61 { QRegExp("QN", Qt::CaseInsensitive), "QNX" },
62Index: src/VBox/Main/include/ovfreader.h
63===================================================================
64--- src/VBox/Main/include/ovfreader.h (revision 92744)
65+++ src/VBox/Main/include/ovfreader.h (working copy)
66@@ -190,6 +190,7 @@
67 CIMOSType_CIMOS_WindowsServer2016 = 118,
68 CIMOSType_CIMOS_Windows10 = 119,
69 CIMOSType_CIMOS_Windows10_64 = 120,
70+ CIMOSType_CIMOS_ArcaOS = 121,
71 // the above covers up to CIM 2.52.0, without checking when it was added
72 };
73
74Index: src/VBox/Main/src-all/Global.cpp
75===================================================================
76--- src/VBox/Main/src-all/Global.cpp (revision 92744)
77+++ src/VBox/Main/src-all/Global.cpp (working copy)
78@@ -429,6 +429,11 @@
79 1, 8, 4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
80 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 },
81
82+ { "OS2", "IBM OS/2", "OS2ArcaOS", "ArcaOS",
83+ VBOXOSTYPE_ArcaOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
84+ 1, 1024, 16, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 1, StorageControllerType_IntelAhci, StorageBus_SATA,
85+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 },
86+
87 { "OS2", "IBM OS/2", "OS2", "Other OS/2",
88 VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
89 1, 96, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
90Index: src/VBox/Main/src-server/ApplianceImpl.cpp
91===================================================================
92--- src/VBox/Main/src-server/ApplianceImpl.cpp (revision 92744)
93+++ src/VBox/Main/src-server/ApplianceImpl.cpp (working copy)
94@@ -187,6 +187,8 @@
95 { ovf::CIMOSType_CIMOS_Windows10_64, VBOXOSTYPE_Win10_x64 },
96 { ovf::CIMOSType_CIMOS_WindowsServer2016, VBOXOSTYPE_Win2k19_x64 }, // no CIM type for this yet
97
98+ { ovf::CIMOSType_CIMOS_ArcaOS, VBOXOSTYPE_ArcaOS },
99+
100 // there are no CIM types for these, so these turn to "other" on export:
101 // VBOXOSTYPE_OpenBSD
102 // VBOXOSTYPE_OpenBSD_x64
103Index: src/VBox/Main/xml/Settings.cpp
104===================================================================
105--- src/VBox/Main/xml/Settings.cpp (revision 92744)
106+++ src/VBox/Main/xml/Settings.cpp (working copy)
107@@ -5950,7 +5950,8 @@
108 { "netware", "Netware" },
109 { "solaris", "Solaris" },
110 { "opensolaris", "OpenSolaris" },
111- { "l4", "L4" }
112+ { "l4", "L4" },
113+ { "arca", "OS2ArcaOS" }
114 };
115
116 void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy