vbox的更動 12545 路徑 trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

時間撮記:

2008-9-17 下午03:11:37 (16 年 以前)

作者:

vboxsync

訊息:

Updates for per-cpu MMIO range registration. (APIC)

檔案:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (修改) (7 筆差異)

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

@@ -84 +84 @@
 #endif
 
+    unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
+    Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+
     int rc;
     if (RT_LIKELY(pRange->CTXALLSUFF(pfnWriteCallback)))
-        rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
+        rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
     else
         rc = VINF_SUCCESS;
@@ -104 +107 @@
 #endif
 
+    unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
+    Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+
     int rc;
     if (RT_LIKELY(pRange->CTXALLSUFF(pfnReadCallback)))
-        rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhysFault, pvData, cb);
+        rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhysFault, pvData, cb);
     else
     {
@@ -583 +589 @@
     if (pRange->CTXALLSUFF(pfnFillCallback))
     {
+        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+
         /*
          * Use the fill callback.
@@ -590 +599 @@
         {
             /* addr++ variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), Phys, u32Data, cb, cTransfers);
+            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), Phys, u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -602 +611 @@
         {
             /* addr-- variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
+            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -1268 +1277 @@
          * Perform the read and deal with the result.
          */
+        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
             STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfRead), a);
 #endif
-        int rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhys, pu32Value, cbValue);
+        int rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhys, pu32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
@@ -1375 +1387 @@
     if (pRange->CTXALLSUFF(pfnWriteCallback))
     {
+        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
             STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfWrite), a);
 #endif
-        int rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhys, &u32Value, cbValue);
+        int rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhys, &u32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)