Changeset 17368 in vbox for trunk/src

Timestamp:

Mar 5, 2009 12:58:27 AM (16 years ago)

Author:

vboxsync

Message:

GMM: Fixed to the ring-3 interface, mainly using VMMR3CallR0.

File:

• trunk/src/VBox/VMM/GMM.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/GMM.cpp

@@ -51 +51 @@
     Req.enmPolicy = enmPolicy;
     Req.enmPriority = enmPriority;
-    return SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_INITIAL_RESERVATION, 0, &Req.Hdr);
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_INITIAL_RESERVATION, 0, &Req.Hdr);
 }
 
@@ -66 +66 @@
     Req.cShadowPages = cShadowPages;
     Req.cFixedPages = cFixedPages;
-    return SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_UPDATE_RESERVATION, 0, &Req.Hdr);
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_UPDATE_RESERVATION, 0, &Req.Hdr);
 }
 
@@ -91 +91 @@
     pReq->cPages = cPages;
     NOREF(pVM);
+    *ppReq = pReq;
     return VINF_SUCCESS;
 }
@@ -107 +108 @@
     for (unsigned i = 0; ; i++)
     {
-        int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_ALLOCATE_PAGES, 0, &pReq->Hdr);
+        int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_ALLOCATE_PAGES, 0, &pReq->Hdr);
         if (RT_SUCCESS(rc))
             return rc;
@@ -126 +127 @@
                               pReq->cPages);
 
-        rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvChunk, NULL);
+        rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvChunk, NULL);
         if (RT_FAILURE(rc))
             return VMSetError(pVM, rc, RT_SRC_POS, N_("GMM seeding failed"));
@@ -178 +179 @@
 GMMR3DECL(int) GMMR3FreePagesPerform(PVM pVM, PGMMFREEPAGESREQ pReq)
 {
-    int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_FREE_PAGES, 0, &pReq->Hdr);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_FREE_PAGES, 0, &pReq->Hdr);
     if (RT_SUCCESS(rc))
         return rc;
@@ -223 +224 @@
     }
 
-    int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_FREE_PAGES, 0, &pReq->Hdr);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_FREE_PAGES, 0, &pReq->Hdr);
     AssertLogRelRC(rc);
 
@@ -237 +238 @@
     Req.Hdr.cbReq = sizeof(Req);
 
-    return SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_BALLOONED_PAGES, 0, &Req.Hdr);
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_BALLOONED_PAGES, 0, &Req.Hdr);
 }
 #endif
@@ -247 +248 @@
 GMMR3DECL(int)  GMMR3DeflatedBalloon(PVM pVM, uint32_t cPages)
 {
-    return SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_DEFLATED_BALLOON, cPages, NULL);
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_DEFLATED_BALLOON, cPages, NULL);
 }
 
@@ -262 +263 @@
     Req.idChunkUnmap = idChunkUnmap;
     Req.pvR3 = NULL;
-    int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
     if (RT_SUCCESS(rc) && ppvR3)
         *ppvR3 = Req.pvR3;
@@ -274 +275 @@
 GMMR3DECL(int)  GMMR3SeedChunk(PVM pVM, RTR3PTR pvR3)
 {
-    return SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvR3, NULL);
-}
-
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvR3, NULL);
+}
+