Changeset 94493 in vbox

Timestamp:

Apr 6, 2022 1:30:19 PM (3 years ago)

Author:

vboxsync

Message:

Main/Global: Follow-up to the Linux OS subtypes update (r150791) as
VBOXOSHINT_PAE was accidentally left out for some 32-bit guest OSes.
Also align a few Linux descriptions with what was present previously.
bugref:5936

File:

• trunk/src/VBox/Main/src-all/Global.cpp (modified) (6 diffs)

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

@@ -199 +199 @@
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
-#define VBOX_LINUX_OSHINTS_A_32   (VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC)
+#define VBOX_LINUX_OSHINTS_A_32   (VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC | VBOXOSHINT_PAE)
 #define VBOX_LINUX_OSHINTS_A_64   (VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC)
 
@@ -205 +205 @@
 #define VBOX_LINUX_OSHINTS_B_64   (VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC)
 
-#define VBOX_LINUX_OSHINTS_C_32   (VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC)
+#define VBOX_LINUX_OSHINTS_C_32   (VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC | VBOXOSHINT_PAE)
 #define VBOX_LINUX_OSHINTS_C_64   (VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC)
+
+#define VBOX_LINUX_OSHINTS_D_32   (VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE)
+#define VBOX_LINUX_OSHINTS_D_64   (VBOXOSHINT_RTCUTC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC)
 
 #define VBOX_LINUX_OSTYPE_32(a_OStype)      (VBOXOSTYPE_ ## a_OStype)
@@ -266 +269 @@
 /* Linux 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */
 #define VBOX_LINUX_SUBTYPE_D_32(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
-    VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_32, a_Memory, a_Vram, a_Diskspace, \
+    VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_32, a_Memory, a_Vram, a_Diskspace, \
                                    NetworkAdapterType_Am79C973, StorageControllerType_PIIX4, StorageBus_IDE)
 
 /* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */
 #define VBOX_LINUX_SUBTYPE_D_64(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
-    VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_64, a_Memory, a_Vram, a_Diskspace, \
+    VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_64, a_Memory, a_Vram, a_Diskspace, \
                                    NetworkAdapterType_I82540EM, StorageControllerType_PIIX4, StorageBus_IDE)
 
     VBOX_LINUX_SUBTYPE_D_32(Linux22, "Linux 2.2 (32-bit)",                      64,  4, 2),
     VBOX_LINUX_SUBTYPE_D_32(Linux24, "Linux 2.4 (32-bit)",                     128, 16, 2),
-    VBOX_LINUX_SUBTYPE_A_64(Linux24, "Linux 2.4 (64-bit)",                    1024, 16, 4),
+    VBOX_LINUX_SUBTYPE_D_64(Linux24, "Linux 2.4 (64-bit)",                    1024, 16, 4),
     VBOX_LINUX_SUBTYPE_A_32(Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (32-bit)",  1024, 16, 8),
     VBOX_LINUX_SUBTYPE_A_64(Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (64-bit)",  1024, 16, 8),
@@ -303 +306 @@
     VBOX_LINUX_SUBTYPE_A_64(Debian11, "Debian 11 Bullseye (64-bit)", 2048, 16, 20),
 
-    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_32(Fedora, "Fedora Linux (32-bit)", FedoraCore, 2048, 16, 15),
-    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_64(Fedora, "Fedora Linux (64-bit)", FedoraCore, 2048, 16, 15),
-
-    VBOX_LINUX_SUBTYPE_A_32(Gentoo, "Gentoo Linux (32-bit)", 1024, 16, 8),
-    VBOX_LINUX_SUBTYPE_A_64(Gentoo, "Gentoo Linux (64-bit)", 1024, 16, 8),
-
-    VBOX_LINUX_SUBTYPE_A_32(Mandriva,  "Mandriva Linux (32-bit)",        1024, 16, 8),
-    VBOX_LINUX_SUBTYPE_A_64(Mandriva,  "Mandriva Linux (64-bit)",        1024, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_32(Fedora, "Fedora (32-bit)", FedoraCore, 2048, 16, 15),
+    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_64(Fedora, "Fedora (64-bit)", FedoraCore, 2048, 16, 15),
+
+    VBOX_LINUX_SUBTYPE_A_32(Gentoo, "Gentoo (32-bit)", 1024, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_64(Gentoo, "Gentoo (64-bit)", 1024, 16, 8),
+
+    VBOX_LINUX_SUBTYPE_A_32(Mandriva,  "Mandriva (32-bit)",        1024, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_64(Mandriva,  "Mandriva (64-bit)",        1024, 16, 8),
     VBOX_LINUX_SUBTYPE_A_32(OpenMandriva_Lx, "OpenMandriva Lx (32-bit)", 2048, 16, 10),
     VBOX_LINUX_SUBTYPE_A_64(OpenMandriva_Lx, "OpenMandriva Lx (64-bit)", 2048, 16, 10),
@@ -342 +345 @@
     VBOX_LINUX_SUBTYPE_B_64(RedHat8,  "Red Hat 8.x (64-bit)",  2048, 16, 20),  // 64-bit only
 
-    VBOX_LINUX_SUBTYPE_A_32(OpenSUSE,            "openSUSE Linux (32-bit)",         1024, 16, 8),
-    VBOX_LINUX_SUBTYPE_A_64(OpenSUSE,            "openSUSE Linux (64-bit)",         1024, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_32(OpenSUSE,            "openSUSE (32-bit)",               1024, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_64(OpenSUSE,            "openSUSE (64-bit)",               1024, 16, 8),
     VBOX_LINUX_SUBTYPE_A_64(OpenSUSE_Leap,       "openSUSE Leap (64-bit)",          2048, 16, 8),  // 64-bit only
     VBOX_LINUX_SUBTYPE_A_32(OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (32-bit)",    2048, 16, 8),
@@ -397 +400 @@
     VBOX_LINUX_SUBTYPE_C_64(Xandros, "Xandros (64-bit)", 1024, 16, 8),
 
-    VBOX_LINUX_SUBTYPE_D_32(Linux, "Other Linux (32-bit)", 256, 16, 8),
-    VBOX_LINUX_SUBTYPE_D_64(Linux, "Other Linux (64-bit)", 512, 16, 8),
+    VBOX_LINUX_SUBTYPE_A_32(Linux, "Other Linux (32-bit)", 256, 16, 8),
+    VBOX_LINUX_SUBTYPE_B_64(Linux, "Other Linux (64-bit)", 512, 16, 8),
 
     { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32-bit)",