Changeset 18927 in vbox for trunk/src/VBox/VMM/PDMDevHlp.cpp

Timestamp:

Apr 16, 2009 11:41:38 AM (16 years ago)

Author:

vboxsync

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

46003

Message:

Big step to separate VMM data structures for guest SMP. (pgm, em)

File:

• trunk/src/VBox/VMM/PDMDevHlp.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -1252 +1252 @@
 }
 
+/** @copydoc PDMDEVHLPR3::pfnGetVMCPU */
+static DECLCALLBACK(PVMCPU) pdmR3DevHlp_GetVMCPU(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_GetVMCPU: caller='%s'/%d for CPU %d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMMGetCpuId(pDevIns->Internal.s.pVMR3)));
+    return VMMGetCpu(pDevIns->Internal.s.pVMR3);
+}
 
 /** @copydoc PDMDEVHLPR3::pfnPCIBusRegister */
@@ -2161 +2168 @@
 #endif
 
-    int rc = PGMPhysSimpleReadGCPtr(pVM, pvDst, GCVirtSrc, cb);
+    int rc = PGMPhysSimpleReadGCPtr(VMMGetCpu(pVM), pvDst, GCVirtSrc, cb);
 
     LogFlow(("pdmR3DevHlp_PhysReadGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2184 +2191 @@
 #endif
 
-    int rc = PGMPhysSimpleWriteGCPtr(pVM, GCVirtDst, pvSrc, cb);
+    int rc = PGMPhysSimpleWriteGCPtr(VMMGetCpu(pVM), GCVirtDst, pvSrc, cb);
 
     LogFlow(("pdmR3DevHlp_PhysWriteGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2207 +2214 @@
 #endif
 
-    int rc = PGMPhysGCPtr2GCPhys(pVM, GCPtr, pGCPhys);
+    int rc = PGMPhysGCPtr2GCPhys(VMMGetCpu(pVM), GCPtr, pGCPhys);
 
     LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: returns %Rrc *pGCPhys=%RGp\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc, *pGCPhys));
@@ -2234 +2241 @@
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
 
-    bool fRc = PGMPhysIsA20Enabled(pDevIns->Internal.s.pVMR3);
+    bool fRc = PGMPhysIsA20Enabled(VMMGetCpu(pDevIns->Internal.s.pVMR3));
 
     LogFlow(("pdmR3DevHlp_A20IsEnabled: caller='%s'/%d: returns %d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, fRc));
@@ -2248 +2255 @@
     LogFlow(("pdmR3DevHlp_A20Set: caller='%s'/%d: fEnable=%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, fEnable));
     //Assert(*(unsigned *)&fEnable <= 1);
-    PGMR3PhysSetA20(pDevIns->Internal.s.pVMR3, fEnable);
+    PGMR3PhysSetA20(VMMGetCpu(pDevIns->Internal.s.pVMR3), fEnable);
 }
 
@@ -2772 +2779 @@
     pdmR3DevHlp_RegisterVMMDevHeap,
     pdmR3DevHlp_UnregisterVMMDevHeap,
+    pdmR3DevHlp_GetVMCPU,
     PDM_DEVHLP_VERSION /* the end */
 };
@@ -3159 +3167 @@
     AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
     return VERR_ACCESS_DENIED;
+}
+
+/** @copydoc PDMDEVHLPR3::pfnGetVMCPU */
+static DECLCALLBACK(PVMCPU) pdmR3DevHlp_Untrusted_GetVMCPU(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
+    return NULL;
 }
 
@@ -3255 +3271 @@
     pdmR3DevHlp_Untrusted_RegisterVMMDevHeap,
     pdmR3DevHlp_Untrusted_UnregisterVMMDevHeap,
+    pdmR3DevHlp_Untrusted_GetVMCPU,
     PDM_DEVHLP_VERSION /* the end */
 };