Changeset 26653 in vbox

Timestamp:

Feb 19, 2010 2:01:06 PM (15 years ago)

Author:

vboxsync

Message:

Rewrote cpuid workaround

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (2 diffs)
• src/VBox/VMM/VM.cpp (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -931 +931 @@
 VMMR3DECL(void)         CPUMR3ResetCpu(PVMCPU pVCpu);
 VMMDECL(bool)           CPUMR3IsStateRestorePending(PVM pVM);
+VMMR3DECL(void)         CPUMR3SetHWVirtEx(PVM pVM, bool fHWVirtExEnabled);
 # ifdef DEBUG
 VMMR3DECL(void)         CPUMR3SaveEntryCtx(PVM pVM);

trunk/src/VBox/VMM/CPUM.cpp

@@ -819 +819 @@
 
     }
+}
+
+
+/**
+ * Apply late CPUM property changes based on the fHWVirtEx setting
+ *
+ * @param   pVM                 The VM to operate on.
+ * @param   fHWVirtExEnabled    HWVirtEx enabled/disabled
+ */
+VMMR3DECL(void) CPUMR3SetHWVirtEx(PVM pVM, bool fHWVirtExEnabled)
+{
     /*
      * Workaround for missing cpuid(0) patches when leaf 4 returns GuestCpuIdDef:
@@ -824 +835 @@
      * of processors from (cpuid(4).eax >> 26) + 1.
      */
-    if (!HWACCMR3IsAllowed(pVM))
+    if (!fHWVirtExEnabled)
         pVM->cpum.s.aGuestCpuIdStd[4].eax = 0;
 }
-
 
 /**

trunk/src/VBox/VMM/VM.cpp

@@ -1021 +1021 @@
     /** @todo Move this to the VMINITCOMPLETED_RING0 notification handler. */
     if (RT_SUCCESS(rc))
+    {
         rc = HWACCMR3InitFinalizeR0(pVM);
+        CPUMR3SetHWVirtEx(pVM, HWACCMIsEnabled(pVM));
+    }
 
     LogFlow(("vmR3InitRing0: returns %Rrc\n", rc));