Changeset 40290 in vbox

Timestamp:

Feb 29, 2012 11:15:22 AM (13 years ago)

Author:

vboxsync

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

76529

Message:

Windows 8 / 32-bit guests require PAE

File:

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

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

@@ -35 +35 @@
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
     { "Windows", "Microsoft Windows", "Windows31",          "Windows 3.1",
-      VBOXOSTYPE_Win31,           VBOXOSHINT_NONE | VBOXOSHINT_FLOPPY,
+      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
         32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
     { "Windows", "Microsoft Windows", "Windows95",          "Windows 95",
-      VBOXOSTYPE_Win95,           VBOXOSHINT_NONE | VBOXOSHINT_FLOPPY,
+      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
     { "Windows", "Microsoft Windows", "Windows98",          "Windows 98",
-      VBOXOSTYPE_Win98,           VBOXOSHINT_NONE | VBOXOSHINT_FLOPPY,
+      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
     { "Windows", "Microsoft Windows", "WindowsMe",          "Windows ME",
-      VBOXOSTYPE_WinMe,           VBOXOSHINT_NONE | VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
         128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
@@ -55 +55 @@
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
     { "Windows", "Microsoft Windows", "Windows2000",        "Windows 2000",
-      VBOXOSTYPE_Win2k,           VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
        168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
     { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP",
-      VBOXOSTYPE_WinXP,           VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
        192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
@@ -67 +67 @@
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
     { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003",
-      VBOXOSTYPE_Win2k3,          VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
        256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
@@ -75 +75 @@
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
     { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista",
-      VBOXOSTYPE_WinVista,        VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
@@ -83 +83 @@
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
     { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008",
-      VBOXOSTYPE_Win2k8,          VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
@@ -91 +91 @@
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
     { "Windows", "Microsoft Windows", "Windows7",           "Windows 7",
-      VBOXOSTYPE_Win7,            VBOXOSHINT_NONE | VBOXOSHINT_USBTABLET,
+      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
@@ -99 +99 @@
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
     { "Windows", "Microsoft Windows", "Windows8",           "Windows 8",
-      VBOXOSTYPE_Win8,            VBOXOSHINT_NONE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_ACCEL3D,
+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_ACCEL3D | VBOXOSHINT_PAE,
        1024,128, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
@@ -297 +297 @@
       ChipsetType_ICH9, AudioControllerType_HDA  },
     { "Other",   "Other",             "DOS",                "DOS",
-      VBOXOSTYPE_DOS,             VBOXOSHINT_NONE | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
+      VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
         32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },