Changeset 66220 in vbox

Timestamp:

Mar 23, 2017 12:11:13 PM (8 years ago)

Author:

vboxsync

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

114138

Message:

Windows 2016 OS type

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• src/VBox/Main/src-all/Global.cpp (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/init-win.cpp (modified) (1 diff)

trunk/include/VBox/ostypes.h

@@ -72 +72 @@
     VBOXOSTYPE_Win10            = 0x3B000,
     VBOXOSTYPE_Win10_x64        = 0x3B100,
+    VBOXOSTYPE_Win2k16_x64      = 0x3C100,
     VBOXOSTYPE_OS2              = 0x40000,
     VBOXOSTYPE_OS2Warp3         = 0x41000,

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -194 +194 @@
         case VBOXOSTYPE_Win81:                            pszOs = "Windows 8.1";    break;
         case VBOXOSTYPE_Win10:                            pszOs = "Windows 10";     break;
+        case VBOXOSTYPE_Win2k16_x64 & ~VBOXOSTYPE_x64:    pszOs = "Windows 2k16";   break;
         case VBOXOSTYPE_OS2:                              pszOs = "OS/2";           break;
         case VBOXOSTYPE_OS2Warp3:                         pszOs = "OS/2 Warp 3";    break;

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

@@ -292 +292 @@
     m_guestOSTypeIconNames.insert("Windows10",       ":/os_win10.png");
     m_guestOSTypeIconNames.insert("Windows10_64",    ":/os_win10_64.png");
+    m_guestOSTypeIconNames.insert("Windows2016_64",  ":/os_win2k12_64.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/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -65 +65 @@
     { QRegExp("((Wi.*Vis)|(Vista)).*64",          Qt::CaseInsensitive), "WindowsVista_64" },
     { QRegExp("((Wi.*Vis)|(Vista)).*32",          Qt::CaseInsensitive), "WindowsVista" },
+    { QRegExp( "(Wi.*2016)|(W2K16)|(Win2K16)",    Qt::CaseInsensitive), "Windows2016_64" },
     { QRegExp( "(Wi.*2012)|(W2K12)|(Win2K12)",    Qt::CaseInsensitive), "Windows2012_64" },
     { QRegExp("((Wi.*2008)|(W2K8)|(Win2k8)).*64", Qt::CaseInsensitive), "Windows2008_64" },

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

@@ -153 +153 @@
       VBOXOSTYPE_Win10_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3,
        2048,128, 32 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+
+    { "Windows", "Microsoft Windows", "Windows2016_64",     "Windows 2016 (64-bit)",
+      VBOXOSTYPE_Win2k16_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3,
+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
 

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

@@ -957 +957 @@
         if (   osTypeId == "Windows81_64"
             || osTypeId == "Windows2012_64"
-            || osTypeId == "Windows10_64")
+            || osTypeId == "Windows10_64"
+            || osTypeId == "Windows2016_64")
         {
             LogRel(("Enabling CMPXCHG16B for Windows 8.1 / 2k12 or newer guests\n"));

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -174 +174 @@
         {
             if (bProductType != VER_NT_WORKSTATION)
-               enmVer = kRTWinOSType_2012R2;
+                enmVer = kRTWinOSType_2012R2;
             else
                 enmVer = kRTWinOSType_81;