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

Timestamp:

Apr 6, 2010 2:52:25 PM (15 years ago)

Author:

vboxsync

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

59719

Message:

Use PGMR3QueryFreeMemory instead

Location:

trunk/src/VBox/VMM

Files:

• GMM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)
• VMMR0/GMMR0.cpp (modified) (4 diffs)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/GMM.cpp

@@ -291 +291 @@
 
 /**
- * @see GMMR0QueryTotalBalloonSizeReq
- */
-GMMR3DECL(int)  GMMR3QueryTotalBalloonSize(PVM pVM, uint64_t *pcTotalBalloonedPages)
-{
-    GMMBALLOONQUERYREQ Req;
-    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-    Req.cBalloonedPages = 0;
-
-    *pcTotalBalloonedPages = 0;
-    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE, 0, &Req.Hdr);
+ * @see GMMR0QueryTotalFreePagesReq
+ */
+GMMR3DECL(int)  GMMR3QueryTotalFreePages(PVM pVM, uint64_t *pcTotalFreePages)
+{
+    GMMFREEQUERYREQ Req;
+    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    Req.Hdr.cbReq = sizeof(Req);
+    Req.cFreePages = 0;
+
+    *pcTotalFreePages = 0;
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES, 0, &Req.Hdr);
     if (rc == VINF_SUCCESS)
-        *pcTotalBalloonedPages = Req.cBalloonedPages;
+        *pcTotalFreePages = Req.cFreePages;
 
     return rc;

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -954 +954 @@
 
 /**
- * Query the VM and host balloon sizes
+ * Query the amount of free memory inside VMMR0
  *
  * @returns VBox status code.
  * @param   pVM                 The VM handle.
- * @param   puVMBalloonSize     Pointer to VM balloon size (in megabytes)
- * @param   puTotalBalloonSize  Pointer to total balloon size of all VMs (in megabytes)
- */
-VMMR3DECL(int) PGMR3QueryBalloonSize(PVM pVM, unsigned *puVMBalloonSize, unsigned *puTotalBalloonSize)
+ * @param   puTotalFreeSize     Pointer to total free (allocated but not used yet) memory inside VMMR0 (in megabytes)
+ */
+VMMR3DECL(int) PGMR3QueryFreeMemory(PVM pVM, unsigned *puTotalFreeSize)
 {
     int rc = VINF_SUCCESS;
 
-    if (puVMBalloonSize)
-        *puVMBalloonSize = pVM->pgm.s.cBalloonedPages * _4K / _1M;
-
-    if (puTotalBalloonSize)
+    if (puTotalFreeSize)
     {
         uint64_t cPages = 0;
-        rc = GMMR3QueryTotalBalloonSize(pVM, &cPages);
+        rc = GMMR3QueryTotalFreePages(pVM, &cPages);
         AssertRC(rc);
-        *puTotalBalloonSize = (unsigned) (cPages * _4K / _1M);
+        *puTotalFreeSize = (unsigned) (cPages * _4K / _1M);
     }
 

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

@@ -2992 +2992 @@
 
 /**
- * Return the total amount of ballooned pages for all VMs
+ * Return the total amount of free pages
  *
  * @returns VBox status code:
@@ -2998 +2998 @@
  * @param   pReq            The request packet.
  */
-GMMR0DECL(int) GMMR0QueryTotalBalloonSizeReq(PVM pVM, PGMMBALLOONQUERYREQ pReq)
+GMMR0DECL(int) GMMR0QueryTotalFreePagesReq(PVM pVM, PGMMFREEQUERYREQ pReq)
 {
     /*
@@ -3005 +3005 @@
     AssertPtrReturn(pVM, VERR_INVALID_POINTER);
     AssertPtrReturn(pReq, VERR_INVALID_POINTER);
-    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMBALLOONQUERYREQ),
-                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMBALLOONQUERYREQ)),
+    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMFREEQUERYREQ),
+                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMFREEQUERYREQ)),
                     VERR_INVALID_PARAMETER);
 
@@ -3014 +3014 @@
     PGMM pGMM;
     GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
-    pReq->cBalloonedPages = pGMM->cBalloonedPages;
+    pReq->cFreePages = (pGMM->cChunks << GMM_CHUNK_SHIFT) - pGMM->cAllocatedPages; 
     GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
 

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

@@ -910 +910 @@
             return GMMR0FreeLargePageReq(pVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr);
 
+        case VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES:
+            if (u64Arg)
+                return VERR_INVALID_PARAMETER;
+            return GMMR0QueryTotalFreePagesReq(pVM, (PGMMFREEQUERYREQ)pReqHdr);
+
         case VMMR0_DO_GMM_BALLOONED_PAGES:
             if (u64Arg)
                 return VERR_INVALID_PARAMETER;
             return GMMR0BalloonedPagesReq(pVM, idCpu, (PGMMBALLOONEDPAGESREQ)pReqHdr);
-
-        case VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE:
-            if (u64Arg)
-                return VERR_INVALID_PARAMETER;
-            return GMMR0QueryTotalBalloonSizeReq(pVM, (PGMMBALLOONQUERYREQ)pReqHdr);
 
         case VMMR0_DO_GMM_MAP_UNMAP_CHUNK: