Changeset 89868 in vbox

Timestamp:

Jun 23, 2021 6:02:11 PM (3 years ago)

Author:

vboxsync

Message:

Main/Console+Machine: Eliminate CMPXCHG16B hack (see bugref:6300) since it is no longer needed. Also make the ParavirtProvider check (Windows Server versions) for the Hyper-V case somewhat future proof. Add a reminder to Global.cpp when adding new guest OS types.

Location:

trunk/src/VBox

Files:

• Main/src-all/Global.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)

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

@@ -29 +29 @@
     /* NOTE1: we assume that unknown is always the first two entries!
      * NOTE2: please use powers of 2 when specifying the size of harddisks since
-     *        '2GB' looks better than '1.95GB' (= 2000MB) */
+     *        '2GB' looks better than '1.95GB' (= 2000MB)
+     * NOTE3: if you add new guest OS types please check if the code in
+     *        Machine::getEffectiveParavirtProvider and Console::i_configConstructorInner
+     *        are still covering the relevant cases. */
     { "Other",   "Other",             "Other",              "Other/Unknown",
       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,

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

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

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

@@ -1376 +1376 @@
                              || mUserData->s.strOsType == "WindowsVista"
                              || mUserData->s.strOsType == "WindowsVista_64"
+                             || (   (   mUserData->s.strOsType.startsWith("Windows202")
+                                     || mUserData->s.strOsType.startsWith("Windows201"))
+                                 && mUserData->s.strOsType.endsWith("_64"))
                              || mUserData->s.strOsType == "Windows2012"
                              || mUserData->s.strOsType == "Windows2012_64"

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -4238 +4238 @@
     }
 
-    /** @cfgm{/CPUM/IsaExts/CMPXCHG16B, boolean, depends}
-     * Expose CMPXCHG16B to the guest if supported by the host. For the time
-     * being the default is to only do this for VMs with nested paging and AMD-V or
-     * unrestricted guest mode.
-     */
-    rc = cpumR3CpuIdReadIsaExtCfgLegacy(pVM, pIsaExts, pCpumCfg, "CMPXCHG16B", &pConfig->enmCmpXchg16b, fNestedPagingAndFullGuestExec);
+    /** @cfgm{/CPUM/IsaExts/CMPXCHG16B, boolean, true}
+     * Expose CMPXCHG16B to the guest if available. All host CPUs which support
+     * hardware virtualization have it.
+     */
+    rc = cpumR3CpuIdReadIsaExtCfgLegacy(pVM, pIsaExts, pCpumCfg, "CMPXCHG16B", &pConfig->enmCmpXchg16b, true);
     AssertLogRelRCReturn(rc, rc);