Changeset 28002 in vbox

Timestamp:

Apr 6, 2010 12:32:01 PM (15 years ago)

Author:

vboxsync

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

59709

Message:

More changes

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/PGMPhys.cpp (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -467 +467 @@
 VMMR3DECL(int)      PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc);
 VMMR3DECL(int)      PGMR3PhysChangeMemBalloon(PVM pVM, bool fInflate, unsigned cPages, RTGCPHYS *paPhysPage);
-VMMR3DECL(int)      PGMR3QueryBalloonSize(PVM pVM, uint64_t *puBalloonVM, uint64_t *puBalloonAllVMs);
+VMMR3DECL(int)      PGMR3QueryBalloonSize(PVM pVM, uint64_t *puVMBalloonSize, uint64_t *puTotalBalloonSize);
 VMMR3DECL(int)      PGMR3PhysMMIORegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb,
                                           R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -957 +957 @@
  *
  * @returns VBox status code.
- * @param   pVM             The VM handle.
- * @param   puBalloonVM     Pointer to VM balloon size (in pages)
- * @param   puBalloonAllVMs Pointer to total balloon size of all VMs (in pages)
- */
-VMMR3DECL(int) PGMR3QueryBalloonSize(PVM pVM, uint64_t *puBalloonVM, uint64_t *puBalloonAllVMs)
+ * @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, uint64_t *puVMBalloonSize, uint64_t *puTotalBalloonSize)
 {
     int rc = VINF_SUCCESS;
 
-    if (puBalloonVM)
-        *puBalloonVM = pVM->pgm.s.cBalloonedPages;
-
-    if (puBalloonAllVMs)
-    {
-        *puBalloonAllVMs = 0;
-        rc = GMMR3QueryTotalBalloonSize(pVM, puBalloonAllVMs);
+    if (puVMBalloonSize)
+        *puVMBalloonSize = pVM->pgm.s.cBalloonedPages * _4K / _1M;
+
+    if (puTotalBalloonSize)
+    {
+        *puTotalBalloonSize = 0;
+        rc = GMMR3QueryTotalBalloonSize(pVM, puTotalBalloonSize);
         AssertRC(rc);
+        *puTotalBalloonSize = *puTotalBalloonSize * _4K / _1M;
     }