Changeset 914 in vbox

Timestamp:

Feb 14, 2007 11:23:08 PM (18 years ago)

Author:

vboxsync

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

18641

Message:

PVMR0 changes for darwin.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (2 diffs)
• include/VBox/sup.h (modified) (8 diffs)
• src/VBox/HostDrivers/Support/SUPDRVIOC.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (3 diffs)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (9 diffs)
• src/VBox/HostDrivers/Support/testcase/tstInt.cpp (modified) (3 diffs)
• src/VBox/VMM/HWACCM.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMDriver.cpp (modified) (1 diff)
• src/VBox/VMM/PDMLdr.cpp (modified) (1 diff)
• src/VBox/VMM/PGMMap.cpp (modified) (4 diffs)
• src/VBox/VMM/VM.cpp (modified) (5 diffs)
• src/VBox/VMM/VMM.cpp (modified) (17 diffs)
• src/VBox/VMM/VMMInternal.h (modified) (4 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (4 diffs)

trunk/include/VBox/pgm.h

@@ -1382 +1382 @@
  * @returns VBox status code.
  * @param   pVM         The virtual machine.
- * @param   pvAddr      Intermediate context address of the mapping. This must be entriely below 4GB!
+ * @param   Addr        Intermediate context address of the mapping.
  * @param   HCPhys      Start of the range of physical pages. This must be entriely below 4GB!
  * @param   cbPages     Number of bytes to map.
@@ -1388 +1388 @@
  * @remark  This API shall not be used to anything but mapping the switcher code.
  */
-PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, void *pvAddr, RTHCPHYS HCPhys, unsigned cbPages);
+PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages);
 
 /**

trunk/include/VBox/sup.h

@@ -169 +169 @@
 {
     PCSUPGLOBALINFOPAGE pGIP;
-    __asm__ __volatile__ ("movabs g_SUPGlobalInfoPage,%0\n\t" 
+    __asm__ __volatile__ ("movabs g_SUPGlobalInfoPage,%0\n\t"
                           : "=a" (pGIP));
     return pGIP;
@@ -176 +176 @@
 # else
 #  define g_pSUPGlobalInfoPage         (&g_SUPGlobalInfoPage)
-#endif 
+#endif
 #else
 extern DECLIMPORT(PCSUPGLOBALINFOPAGE)  g_pSUPGlobalInfoPage;
@@ -251 +251 @@
  *
  * @returns error code specific to uFunction.
- * @param   pVM         Pointer to the Host Context mapping of the VM structure.
+ * @param   pVMR0       Pointer to the Ring-0 (Host Context) mapping of the VM structure.
  * @param   uOperation  Operation to execute.
  * @param   pvArg       Argument.
  */
-SUPR3DECL(int) SUPCallVMMR0(PVM pVM, unsigned uOperation, void *pvArg);
+SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg);
 
 /**
@@ -265 +265 @@
  *
  * @returns error code specific to uFunction.
- * @param   pVM         Pointer to the Host Context mapping of the VM structure.
+ * @param   pVMR0       Pointer to the Ring-0 (Host Context) mapping of the VM structure.
  * @param   uOperation  Operation to execute.
  * @param   pvArg       Pointer to argument structure or if cbArg is 0 just an value.
@@ -272 +272 @@
  *                      being invalidated while we're executing the call.
  */
-SUPR3DECL(int) SUPCallVMMR0Ex(PVM pVM, unsigned uOperation, void *pvArg, unsigned cbArg);
+SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, void *pvArg, unsigned cbArg);
 
 /**
@@ -349 +349 @@
  * @returns NULL on failure.
  * @param   cb          Number of bytes to allocate.
- * @param   ppvR0       Where to store the ring-0 mapping of the allocation. (optional)
+ * @param   pR0Ptr      Where to store the ring-0 mapping of the allocation. (optional)
  * @param   pHCPhys     Where to store the physical address of the memory block.
  *
@@ -356 +356 @@
  *          the world switchers.
  */
-SUPR3DECL(void *) SUPContAlloc2(unsigned cb, void **ppvR0, PRTHCPHYS pHCPhys);
+SUPR3DECL(void *) SUPContAlloc2(unsigned cb, PRTR0PTR pR0Ptr, PRTHCPHYS pHCPhys);
 
 /**
@@ -486 +486 @@
 SUPR0DECL(int) SUPR0LockMem(PSUPDRVSESSION pSession, void *pvR3, unsigned cb, PSUPPAGE paPages);
 SUPR0DECL(int) SUPR0UnlockMem(PSUPDRVSESSION pSession, void *pvR3);
-SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, void **ppvR3, PRTHCPHYS pHCPhys);
+SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, PRTR3PTR ppvR3, PRTHCPHYS pHCPhys);
 SUPR0DECL(int) SUPR0ContFree(PSUPDRVSESSION pSession, void *pv);
 SUPR0DECL(int) SUPR0LowAlloc(PSUPDRVSESSION pSession, unsigned cPages, void **ppvR3, PSUPPAGE paPages);

trunk/src/VBox/HostDrivers/Support/SUPDRVIOC.h

@@ -300 +300 @@
 {
     /** The address of the ring-0 mapping of the allocated memory. */
-    void       *pvR0;
+    RTR0PTR     pvR0;
     /** The address of the ring-3 mapping of the allocated memory. */
-    void       *pvR3;
+    RTR3PTR     pvR3;
     /** The physical address of the allocation. */
     RTHCPHYS    HCPhys;
@@ -458 +458 @@
     uint32_t    u32SessionCookie;
     /** The VM handle. */
-    PVM         pVM;
+    PVMR0       pVMR0;
     /** Which operation to execute. */
     uint32_t    uOperation;

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -1145 +1145 @@
              * Execute.
              */
-            pOut->rc = pDevExt->pfnVMMR0Entry(pIn->pVM, pIn->uOperation, pIn->pvArg);
+            pOut->rc = pDevExt->pfnVMMR0Entry(pIn->pVMR0, pIn->uOperation, pIn->pvArg);
             *pcbReturned = sizeof(*pOut);
             return 0;
@@ -1837 +1837 @@
  * @param   pHCPhys     Where to put the physical address of allocated memory.
  */
-SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, void **ppvR3, PRTHCPHYS pHCPhys)
+SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, PRTR3PTR ppvR3, PRTHCPHYS pHCPhys)
 {
     int             rc;
@@ -2832 +2832 @@
     *u.pb++ = 0xf8;
 
-    /* 
+    /*
      * Call VMMR0Entry
-     *      We don't have to push the arguments here, but we have to 
+     *      We don't have to push the arguments here, but we have to
      *      reserve some stack space for the interrupt forwarding.
      */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -79 +79 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef DECLCALLBACK(int) FNCALLVMMR0(PVM pVM, unsigned uOperation, void *pvArg);
+typedef DECLCALLBACK(int) FNCALLVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg);
 typedef FNCALLVMMR0 *PFNCALLVMMR0;
 
@@ -356 +356 @@
 }
 
-SUPR3DECL(int) SUPCallVMMR0Ex(PVM pVM, unsigned uOperation, void *pvArg, unsigned cbArg)
+SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, void *pvArg, unsigned cbArg)
 {
     /*
@@ -364 +364 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pVM              = pVM;
+    In.pVMR0            = pVMR0;
     In.uOperation       = uOperation;
     In.cbArg            = cbArg;
@@ -377 +377 @@
 
 
-SUPR3DECL(int) SUPCallVMMR0(PVM pVM, unsigned uOperation, void *pvArg)
+SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg)
 {
 #ifndef VBOX_WITHOUT_IDT_PATCHING
-    return g_pfnCallVMMR0(pVM, uOperation, pvArg);
+    return g_pfnCallVMMR0(pVMR0, uOperation, pvArg);
 
 #else
-    if (uOperation == VMMR0_DO_RAW_RUN)
+    if (RT_LIKELY(uOperation == VMMR0_DO_RAW_RUN))
     {
         Assert(!pvArg);
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_RAW_RUN);
     }
-    if (uOperation == VMMR0_DO_HWACC_RUN)
+    if (RT_LIKELY(uOperation == VMMR0_DO_HWACC_RUN))
     {
         Assert(!pvArg);
@@ -398 +398 @@
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_NOP);
     }
-    return SUPCallVMMR0Ex(pVM, uOperation, pvArg, pvArg ? sizeof(pvArg) : 0);
+    return SUPCallVMMR0Ex(pVMR0, uOperation, pvArg, pvArg ? sizeof(pvArg) : 0);
 #endif
 }
@@ -478 +478 @@
 SUPR3DECL(void *) SUPContAlloc(unsigned cb, PRTHCPHYS pHCPhys)
 {
-    return SUPContAlloc2(cb, NULL, pHCPhys);
-}
-
-
-SUPR3DECL(void *) SUPContAlloc2(unsigned cb, void **ppvR0, PRTHCPHYS pHCPhys)
+    return SUPContAlloc2(cb, NIL_RTR0PTR, pHCPhys);
+}
+
+
+SUPR3DECL(void *) SUPContAlloc2(unsigned cb, PRTR0PTR pR0Ptr, PRTHCPHYS pHCPhys)
 {
     /*
@@ -490 +490 @@
     AssertPtr(pHCPhys);
     *pHCPhys = NIL_RTHCPHYS;
+    AssertPtrNull(pR0Ptr);
+    if (pR0Ptr)
+        *pR0Ptr = NIL_RTR0PTR;
 
     /*
@@ -506 +509 @@
         rc = SUPPageAlloc(In.cb >> PAGE_SHIFT, &Out.pvR3);
         Out.HCPhys = (uintptr_t)Out.pvR3 + (PAGE_SHIFT * 1024);
-        Out.pvR0 = Out.pvR3;
+        Out.pvR0 = (uintptr_t)Out.pvR3;
     }
     if (VBOX_SUCCESS(rc))
     {
         *pHCPhys = (RTHCPHYS)Out.HCPhys;
-        if (ppvR0)
-            *ppvR0 = Out.pvR0;
+        if (pR0Ptr)
+            *pR0Ptr = Out.pvR0;
         return Out.pvR3;
     }
@@ -717 +720 @@
      * reg params:
      *      <GCC>   <MSC>   <argument>
-     *      rdi     rcx     pVM
+     *      rdi     rcx     pVMR0
      *      esi     edx     uOperation
      *      rdx     r8      pvArg

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -89 +89 @@
             PVMR0 pVMR0;
             RTHCPHYS HCPhysVM;
-            PVM pVM = (PVM)SUPContAlloc2(sizeof(*pVM), (void **)&pVMR0, &HCPhysVM);
+            PVM pVM = (PVM)SUPContAlloc2(sizeof(*pVM), &pVMR0, &HCPhysVM);
             if (pVM)
             {
                 pVM->pVMGC = 0;
-                pVM->pVMHC = pVM;
+                pVM->pVMR3 = pVM;
+                pVM->pVMR0 = pVMR0;
                 pVM->HCPhysVM = HCPhysVM;
                 pVM->pSession = pSession;
@@ -108 +109 @@
                     for (i = cIterations; i > 0; i--)
                     {
-                        rc = SUPCallVMMR0((PVM)pVMR0, VMMR0_DO_NOP, NULL);
+                        rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
                         if (rc != VINF_SUCCESS)
                         {
@@ -130 +131 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0((PVM)pVMR0, VMMR0_DO_NOP, NULL);
+                            rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -292 +292 @@
             pVM->hwaccm.s.fInitialized = true;
 
-            int rc = SUPCallVMMR0(pVM, VMMR0_DO_HWACC_SETUP_VM, NULL);
+            int rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)
@@ -324 +324 @@
             pVM->hwaccm.s.fInitialized = true;
 
-            int rc = SUPCallVMMR0(pVM, VMMR0_DO_HWACC_SETUP_VM, NULL);
+            int rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -961 +961 @@
     if (    uOperation >= VMMR0_DO_SRV_START
         &&  uOperation <  VMMR0_DO_SRV_END)
-        rc = SUPCallVMMR0Ex(pDrvIns->Internal.s.pVM, uOperation, pvArg, cbArg);
+        rc = SUPCallVMMR0Ex(pDrvIns->Internal.s.pVM->pVMR0, uOperation, pvArg, cbArg);
     else
     {

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -20 +20 @@
  */
 
-#if defined(__DARWIN__) ||defined(__OS2__)
+#if defined(__OS2__)
 # define PDMLDR_FAKE_MODE
 #endif

trunk/src/VBox/VMM/PGMMap.cpp

@@ -455 +455 @@
  * @returns VBox status code.
  * @param   pVM         The virtual machine.
- * @param   pvAddr      Intermediate context address of the mapping. This must be entriely below 4GB!
+ * @param   Addr        Intermediate context address of the mapping.
  * @param   HCPhys      Start of the range of physical pages. This must be entriely below 4GB!
  * @param   cbPages     Number of bytes to map.
  *
  * @remark  This API shall not be used to anything but mapping the switcher code.
- * @todo pvAddr must be a RTUINTPTR!
- */
-PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, void *pvAddr, RTHCPHYS HCPhys, unsigned cbPages)
-{
-    LogFlow(("PGMR3MapIntermediate: pvAddr=%p HCPhys=%VHp cbPages=%#x\n", pvAddr, HCPhys, cbPages));
+ */
+PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages)
+{
+    LogFlow(("PGMR3MapIntermediate: Addr=%RTptr HCPhys=%VHp cbPages=%#x\n", Addr, HCPhys, cbPages));
 
     /*
@@ -472 +471 @@
     cbPages  = RT_ALIGN(cbPages, PAGE_SIZE);
     HCPhys  &= X86_PTE_PAE_PG_MASK;
-    pvAddr   = (void *)((RTUINTPTR)pvAddr & PAGE_BASE_MASK);
+    Addr    &= PAGE_BASE_MASK;
     /* We only care about the first 4GB, because on AMD64 we'll be repeating them all over the address space. */
-    uint32_t uAddress = (uint32_t)(uintptr_t)pvAddr;
+    uint32_t uAddress = (uint32_t)Addr;
 
     /*
@@ -482 +481 @@
     AssertMsg(pVM->pgm.s.pInterPD, ("Bad init order, paging.\n"));
     AssertMsg(cbPages <= (512 << PAGE_SHIFT), ("The mapping is too big %d bytes\n", cbPages));
-    AssertMsg(HCPhys < _4G && HCPhys + cbPages < _4G, ("pvAddr=%p HCPhys=%VHp cbPages=%d\n", pvAddr, HCPhys, cbPages));
+    AssertMsg(HCPhys < _4G && HCPhys + cbPages < _4G, ("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
 
     /*
@@ -494 +493 @@
        )
     {
-        AssertMsgFailed(("pvAddr=%p HCPhys=%VHp cbPages=%d\n", pvAddr, HCPhys, cbPages));
-        LogRel(("pvAddr=%p HCPhys=%VHp cbPages=%d\n", pvAddr, HCPhys, cbPages));
+        AssertMsgFailed(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
+        LogRel(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
         return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
     }

trunk/src/VBox/VMM/VM.cpp

@@ -188 +188 @@
          */
         RTHCPHYS HCPhysVM;
-        PVM pVM = (PVM)SUPContAlloc(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE), &HCPhysVM);
+        PVMR0 pVMR0;
+        PVM pVM = (PVM)SUPContAlloc2(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE), &pVMR0, &HCPhysVM);
         if (pVM)
         {
@@ -198 +199 @@
             memset(pVM, 0, sizeof(*pVM));
             pVM->pVMHC = pVM;
+            pVM->pVMR0 = pVMR0;
+            pVM->pVMR3 = pVM;
             pVM->HCPhysVM = HCPhysVM;
             pVM->pSession = pSession;
@@ -1002 +1005 @@
     if (pVM->vm.s.fPreventSaveState)
     {
-        LogRel(("VMM: vmR3Save: saving the VM state is not allowed at this moment\n")); 
-        return VERR_VM_SAVE_STATE_NOT_ALLOWED; 
+        LogRel(("VMM: vmR3Save: saving the VM state is not allowed at this moment\n"));
+        return VERR_VM_SAVE_STATE_NOT_ALLOWED;
     }
 
@@ -1173 +1176 @@
      * ACPI and we find the VMSTATE_OFF. Just ignore the second power-off request.
      */
-    /** @todo r=bird: We should find a proper solution to this problem. This is just a workaround. 
+    /** @todo r=bird: We should find a proper solution to this problem. This is just a workaround.
      * Guest code should really run after we've entered VMSTATE_OFF really... */
     if (pVM->enmVMState == VMSTATE_OFF)
@@ -2707 +2710 @@
  */
 static void vmR3SetRuntimeErrorWorkerDoCall(PVM pVM, PVMATRUNTIMEERROR pCur, bool fFatal,
-                                            const char *pszErrorID, 
+                                            const char *pszErrorID,
                                             const char *pszFormat, ...)
 {

trunk/src/VBox/VMM/VMM.cpp

@@ -246 +246 @@
             struct
             {
-                void *pvR0;
-                void *pvR3;
+                RTR0PTR  pvR0;
+                void    *pvR3;
                 RTHCPHYS HCPhys;
             } aBadTries[16];
@@ -360 +360 @@
         AssertMsgRCReturn(rc, ("Configuration error. Failed to query \"YieldEMTInterval\", rc=%Vrc\n", rc), rc);
 
+    /* GC switchers are enabled by default. Turned off by HWACCM. */
+    pVM->vmm.s.fSwitcherDisabled = false;
+
     /*
      * Register the saved state data unit.
@@ -369 +372 @@
         return rc;
 
-    /* GC switchers are enabled by default. Turned off by HWACCM. */
-    pVM->vmm.s.fSwitcherDisabled = false;
+#ifdef VBOX_WITHOUT_IDT_PATCHING
+    /*
+     * Register the Ring-0 VM handle with the session for fast ioctl calls.
+     */
+    rc = SUPSetVMForFastIOCtl(pVM->pVMR0);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
 
     /*
@@ -615 +624 @@
         rc = VINF_SUCCESS;
 #else
-        rc = SUPCallVMMR0(pVM, VMMR0_DO_VMMR0_INIT, (void *)VBOX_VERSION);
+        rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_VMMR0_INIT, (void *)VBOX_VERSION);
 #endif
         if (    pVM->vmm.s.pR0Logger
@@ -675 +684 @@
             rc = VINF_SUCCESS;
 #else
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_CALL_HYPERVISOR, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_CALL_HYPERVISOR, NULL);
 #endif
 #ifdef LOG_ENABLED
@@ -1045 +1054 @@
                 uint32_t offCPUM = *u.pu32++;
                 Assert(offCPUM < sizeof(pVM->cpum));
-                *uSrc.pu32 = (uint32_t)((uintptr_t)&pVM->cpum + offCPUM);
-                break;
-            }
-
-            /*
-             * Make 32-bit HC pointer given VM offset.
+                *uSrc.pu32 = (uint32_t)pVM->pVMR0 + RT_OFFSETOF(VM, cpum) + offCPUM;
+                break;
+            }
+
+            /*
+             * Make 32-bit R0 pointer given VM offset.
              */
             case FIX_HC_VM_OFF:
@@ -1056 +1065 @@
                 uint32_t offVM = *u.pu32++;
                 Assert(offVM < sizeof(VM));
-                *uSrc.pu32 = (uint32_t)(uintptr_t)pVM + offVM;
+                *uSrc.pu32 = (uint32_t)pVM->pVMR0 + offVM;
                 break;
             }
@@ -1240 +1249 @@
             {
                 Assert(offSrc < pSwitcher->cbCode);
-                *uSrc.pu64 = (uintptr_t)&pVM->cpum;
+                *uSrc.pu64 = pVM->pVMR0 + RT_OFFSETOF(VM, cpum);
                 break;
             }
@@ -1834 +1843 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1882 +1891 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_HWACC_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL);
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1963 +1972 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -2017 +2026 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -2544 +2553 @@
     CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
     CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnGCCallTrampoline);
-    return SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+    return SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
 }
 
@@ -2578 +2587 @@
     CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
     CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnGCCallTrampoline);
-    rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+    rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
     bool fDump = false;
     if (rc != rcExpect)
@@ -2656 +2665 @@
     {
         RTPrintf("VMM: VMMGCEntry=%VGv\n", GCPtrEP);
-        
+
         /*
          * Test various crashes which we must be able to recover from.
@@ -2818 +2827 @@
         do
         {
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
             if (VBOX_FAILURE(rc))
             {
@@ -2869 +2878 @@
 
             uint64_t TickThisStart = ASMReadTSC();
-            rc = SUPCallVMMR0(pVM, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
             uint64_t TickThisElapsed = ASMReadTSC() - TickThisStart;
             if (VBOX_FAILURE(rc))

trunk/src/VBox/VMM/VMMInternal.h

@@ -110 +110 @@
     uint32_t    eip;
     uint32_t    u32Padding;
-#endif 
+#endif
 #if HC_ARCH_BITS == 64
     uint64_t    rbx;
 # ifdef __WIN__
-    uint64_t    rsi;            
-    uint64_t    rdi;            
+    uint64_t    rsi;
+    uint64_t    rdi;
 # endif
     uint64_t    rbp;
@@ -124 +124 @@
     uint64_t    rsp;
     uint64_t    rip;
-#endif 
+#endif
     /** @} */
 
@@ -157 +157 @@
     /** Pointer to core code ring-3 mapping - contiguous memory.
      * At present this only means the context switcher code. */
-    RTHCPTR                     pvHCCoreCodeR3;
+    RTR3PTR                     pvHCCoreCodeR3;
     /** Pointer to core code ring-0 mapping - contiguous memory.
      * At present this only means the context switcher code. */
-    RTHCPTR                     pvHCCoreCodeR0;
+    RTR0PTR                     pvHCCoreCodeR0;
     /** Pointer to core code guest context mapping. */
     RTGCPTR                     pvGCCoreCode;
@@ -250 +250 @@
     VMMR0JMPBUF                 CallHostR0JmpBuf;
     /** @} */
-    
+
     /** Number of VMMR0_DO_RUN_GC calls. */
     STAMCOUNTER                 StatRunGC;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -137 +137 @@
              || VBOX_GET_VERSION_MINOR(uVersion) < VBOX_VERSION_MINOR))
         return VERR_VERSION_MISMATCH;
+    if (    !VALID_PTR(pVM)
+        ||  pVM->pVMR0 != pVM)
+        return VERR_INVALID_PARAMETER;
 
     /*
@@ -449 +452 @@
 #else
                     return rc;
-#endif 
+#endif
 
                 /*
@@ -461 +464 @@
                     TRPMR0DispatchHostInterrupt(pVM);
 #else /* !VBOX_WITHOUT_IDT_PATCHING */
-                    /* 
+                    /*
                      * Don't trust the compiler to get this right.
-                     * gcc -fomit-frame-pointer screws up big time here. This works fine in 64-bit 
+                     * gcc -fomit-frame-pointer screws up big time here. This works fine in 64-bit
                      * mode too because we push the arguments on the stack in the IDT patch code.
                      */
@@ -475 +478 @@
 #  error "huh?"
 # endif
-                    if (    ((uintptr_t *)pvRet)[1] == (uintptr_t)pVM 
+                    if (    ((uintptr_t *)pvRet)[1] == (uintptr_t)pVM
                         &&  ((uintptr_t *)pvRet)[2] == (uintptr_t)uOperation
                         &&  ((uintptr_t *)pvRet)[3] == (uintptr_t)pvArg)