Changeset 14600 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 25, 2008 8:51:37 PM (16 years ago)

Author:

vboxsync

Message:

MMHyperXToR0: fail and asset if the address wasn't mapped into ring-0 (instead of quietly returning the ring-3 address).

File:

• trunk/src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)

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

@@ -255 +255 @@
             if (pLookup->u.Locked.pvR0)
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /** @todo make NIL_RTR0PTR default! */
+            AssertMsgFailed(("%s\n", R3STRING(pLookup->pszDesc)));
             return NIL_RTR0PTR;
-#else
-            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.Locked.pvR3 + off);
-#endif
 
         case MMLOOKUPHYPERTYPE_HCPHYS:
             if (pLookup->u.HCPhys.pvR0)
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.HCPhys.pvR0 + off);
+            AssertMsgFailed(("%s\n", R3STRING(pLookup->pszDesc)));
             return NIL_RTR0PTR;
+
         default:
             AssertMsgFailed(("enmType=%d\n", pLookup->enmType));