Changeset 27023 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 4, 2010 1:32:45 PM (15 years ago)

Author:

vboxsync

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

58333

Message:

Guest Additions: memory ballooning for guests without support for RTR0MemObjAllocPhysNC()

Location:

trunk/src/VBox/Additions/WINNT/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (13 diffs)
• VBoxGuest_Internal.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -558 +558 @@
 
 #ifdef VBOX_WITH_MANAGEMENT
-static int VBoxGuestSetBalloonSize(PVBOXGUESTDEVEXT pDevExt, uint32_t u32BalloonSize)
+static int VBoxGuestSetBalloonSize(PVBOXGUESTDEVEXT pDevExt, uint32_t cBalloonChunks)
 {
     VMMDevChangeMemBalloon *req = NULL;
@@ -564 +564 @@
     uint32_t i;
 
-    if (u32BalloonSize > pDevExt->MemBalloon.cMaxBalloons)
-    {
-        AssertMsgFailed(("VBoxGuestSetBalloonSize illegal balloon size %d (max=%d)\n", u32BalloonSize, pDevExt->MemBalloon.cMaxBalloons));
+    if (cBalloonChunks > pDevExt->MemBalloon.cMaxBalloonChunks)
+    {
+        AssertMsgFailed(("VBoxGuestSetBalloonSize illegal balloon size %d (max=%d)\n", cBalloonChunks, pDevExt->MemBalloon.cMaxBalloonChunks));
         return VERR_INVALID_PARAMETER;
     }
 
-    if (u32BalloonSize == pDevExt->MemBalloon.cBalloons)
+    if (cBalloonChunks == pDevExt->MemBalloon.cBalloonChunks)
         return VINF_SUCCESS;    /* nothing to do */
 
@@ -578 +578 @@
         return rc;
 
-    if (u32BalloonSize > pDevExt->MemBalloon.cBalloons)
+    if (cBalloonChunks > pDevExt->MemBalloon.cBalloonChunks)
     {
         /* inflate */
-        for (i = pDevExt->MemBalloon.cBalloons; i < u32BalloonSize; i++)
+        for (i = pDevExt->MemBalloon.cBalloonChunks; i < cBalloonChunks; i++)
         {
 #ifndef TARGET_NT4
@@ -669 +669 @@
 #endif
                 pDevExt->MemBalloon.paMdlMemBalloon[i] = pMdl;
-                pDevExt->MemBalloon.cBalloons++;
+                pDevExt->MemBalloon.cBalloonChunks++;
             }
         }
@@ -676 +676 @@
     {
         /* deflate */
-        for (i = pDevExt->MemBalloon.cBalloons; i > u32BalloonSize; i--)
+        for (i = pDevExt->MemBalloon.cBalloonChunks; i > cBalloonChunks; i--)
         {
             uint32_t index = i - 1;
@@ -718 +718 @@
 
                 pDevExt->MemBalloon.paMdlMemBalloon[index] = NULL;
-                pDevExt->MemBalloon.cBalloons--;
-            }
-        }
-    }
-    Assert(pDevExt->MemBalloon.cBalloons <= pDevExt->MemBalloon.cMaxBalloons);
+                pDevExt->MemBalloon.cBalloonChunks--;
+            }
+        }
+    }
+    Assert(pDevExt->MemBalloon.cBalloonChunks <= pDevExt->MemBalloon.cMaxBalloonChunks);
 
 end:
@@ -752 +752 @@
             if (!pDevExt->MemBalloon.paMdlMemBalloon)
             {
-                pDevExt->MemBalloon.cMaxBalloons = req->u32PhysMemSize;
-                pDevExt->MemBalloon.paMdlMemBalloon = (PMDL *)ExAllocatePool(PagedPool, req->u32PhysMemSize * sizeof(PMDL));
+                pDevExt->MemBalloon.cMaxBalloonChunks = req->cPhysMemChunks;
+                pDevExt->MemBalloon.paMdlMemBalloon = (PMDL *)ExAllocatePool(PagedPool, req->cPhysMemChunks * sizeof(PMDL));
                 Assert(pDevExt->MemBalloon.paMdlMemBalloon);
                 if (!pDevExt->MemBalloon.paMdlMemBalloon)
                     return VERR_NO_MEMORY;
             }
-            Assert(pDevExt->MemBalloon.cMaxBalloons == req->u32PhysMemSize);
-
-            rc = VBoxGuestSetBalloonSize(pDevExt, req->u32BalloonSize);
+            Assert(pDevExt->MemBalloon.cMaxBalloonChunks == req->cPhysMemChunks);
+
+            rc = VBoxGuestSetBalloonSize(pDevExt, req->cBalloonChunks);
             /* ignore out of memory failures */
             if (rc == VERR_NO_MEMORY)
@@ -766 +766 @@
 
             if (pMemBalloonSize)
-                *pMemBalloonSize = pDevExt->MemBalloon.cBalloons;
+                *pMemBalloonSize = pDevExt->MemBalloon.cBalloonChunks;
         }
 
@@ -780 +780 @@
     ULONG dummy;
 
-    pDevExt->MemBalloon.cBalloons       = 0;
-    pDevExt->MemBalloon.cMaxBalloons    = 0;
+    pDevExt->MemBalloon.cBalloonChunks = 0;
+    pDevExt->MemBalloon.cMaxBalloonChunks = 0;
     pDevExt->MemBalloon.paMdlMemBalloon = NULL;
 
@@ -798 +798 @@
         pDevExt->MemBalloon.paMdlMemBalloon = NULL;
     }
-    Assert(pDevExt->MemBalloon.cBalloons == 0);
+    Assert(pDevExt->MemBalloon.cBalloonChunks == 0);
 #endif
 }
@@ -1382 +1382 @@
         case VBOXGUEST_IOCTL_CHECK_BALLOON:
         {
-            ULONG *pMemBalloonSize = (ULONG *) pBuf;
+            VBoxGuestCheckBalloonInfo *pInfo = (VBoxGuestCheckBalloonInfo *)pBuf;
 
             if (pStack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(ULONG))
@@ -1392 +1392 @@
             }
 
-            int rc = VBoxGuestQueryMemoryBalloon(pDevExt, pMemBalloonSize);
+            ULONG cMemoryBalloonChunks;
+            int rc = VBoxGuestQueryMemoryBalloon(pDevExt, &cMemoryBalloonChunks);
             if (RT_FAILURE(rc))
             {
@@ -1401 +1402 @@
             {
                 cbOut = pStack->Parameters.DeviceIoControl.OutputBufferLength;
+                pInfo->cBalloonChunks = cMemoryBalloonChunks;
+                pInfo->fHandleInR3 = false;
             }
             break;

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest_Internal.h

@@ -216 +216 @@
     struct
     {
-        uint32_t     cBalloons;
-        uint32_t     cMaxBalloons;
+        uint32_t     cBalloonChunks;
+        uint32_t     cMaxBalloonChunks;
         PMDL        *paMdlMemBalloon;
     } MemBalloon;