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

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/VMMR0

Files:

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

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: