Changeset 45618 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 18, 2013 6:41:07 PM (12 years ago)

Author:

vboxsync

Message:

Do HMR3Init first in vmR3InitRing3 so the other components can skip raw-mode bits during init.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (1 diff)
• MMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -36 +36 @@
 
 
+
+/**
+ * Query HM state (enabled/disabled)
+ *
+ * @returns @c false if disabled, @c true if enabled.
+ * @param   pVM         The cross context VM structure.
+ * @sa      HMIsEnabled, HMR3IsEnabled
+ * @internal
+ */
+VMMDECL(bool) HMIsEnabledNotMacro(PVM pVM)
+{
+    Assert(pVM->fHMEnabledFixed);
+    return pVM->fHMEnabled;
+}
+
+
 /**
  * Queues a page for invalidation

trunk/src/VBox/VMM/VMMAll/MMAll.cpp

@@ -257 +257 @@
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-            AssertMsg(!VMMIsHwVirtExtForced(pVM), ("%s\n", R3STRING(pLookup->pszDesc)));
+            AssertMsg(!HMIsEnabled(pVM), ("%s\n", R3STRING(pLookup->pszDesc)));
 #else
             AssertMsgFailed(("%s\n", R3STRING(pLookup->pszDesc))); NOREF(pVM);