Changeset 53012 in vbox for trunk

Timestamp:

Oct 9, 2014 5:40:56 PM (10 years ago)

Author:

vboxsync

Message:

Main,Frontend: Windows 10 guest os type.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/globals/UIIconPool.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• Main/src-all/Global.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -287 +287 @@
     m_guestOSTypeIconNames.insert("Windows81_64",    ":/os_win8_64.png");
     m_guestOSTypeIconNames.insert("Windows2012_64",  ":/os_win2k12_64.png");
+    m_guestOSTypeIconNames.insert("Windows10",       ":/os_win_other.png");
+    m_guestOSTypeIconNames.insert("Windows10_64",    ":/os_win_other.png");
     m_guestOSTypeIconNames.insert("WindowsNT",       ":/os_win_other.png");
     m_guestOSTypeIconNames.insert("WindowsNT_64",    ":/os_win_other.png"); /// @todo os_win_other_64

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

@@ -3556 +3556 @@
            || strGuestOSTypeId.startsWith("Windows8")
            || strGuestOSTypeId.startsWith("Windows81")
+           || strGuestOSTypeId.startsWith("Windows10")
            || strGuestOSTypeId.startsWith("Windows2008")
            || strGuestOSTypeId.startsWith("Windows2012");

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

@@ -74 +74 @@
     { QRegExp( "(Wi.*8.*64)|(W8.*64)",            Qt::CaseInsensitive), "Windows8_64" },
     { QRegExp( "(Wi.*8.*32)|(W8.*32)",            Qt::CaseInsensitive), "Windows8" },
+    { QRegExp( "(Wi.*10.*64)|(W10.*64)",          Qt::CaseInsensitive), "Windows10_64" },
+    { QRegExp( "(Wi.*10.*32)|(W10.*32)",          Qt::CaseInsensitive), "Windows10" },
     { QRegExp(  "Wi.*3.*1",                       Qt::CaseInsensitive), "Windows31" },
     { QRegExp(  "Wi.*64",                         Qt::CaseInsensitive), "WindowsXP_64" },

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

@@ -120 +120 @@
     { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
       VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
+    { "Windows", "Microsoft Windows", "Windows10",          "Windows 10 (32 bit)",
+      VBOXOSTYPE_Win10,            VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
+    { "Windows", "Microsoft Windows", "Windows10_64",       "Windows 10 (64 bit)",
+      VBOXOSTYPE_Win10_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -996 +996 @@
         /* Expose CMPXCHG16B. Currently a hack. */
         if (   osTypeId == "Windows81_64"
-            || osTypeId == "Windows2012_64")
-        {
-            LogRel(("Enabling CMPXCHG16B for Windows 8.1 / 2k12 guests\n"));
+            || osTypeId == "Windows2012_64"
+            || osTypeId == "Windows10_64")
+        {
+            LogRel(("Enabling CMPXCHG16B for Windows 8.1 / 2k12 or newer guests\n"));
             InsertConfigInteger(pCPUM, "CMPXCHG16B", true);
         }

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

@@ -1281 +1281 @@
                     if (fOsXGuest)
                         *aParavirtProvider = ParavirtProvider_Minimal;
-                    else if (   mUserData->s.strOsType == "Windows81"
+                    else if (   mUserData->s.strOsType == "Windows10"
+                             || mUserData->s.strOsType == "Windows10_64"
+                             || mUserData->s.strOsType == "Windows81"
                              || mUserData->s.strOsType == "Windows81_64"
                              || mUserData->s.strOsType == "Windows8"