Changeset 26350 in vbox

Timestamp:

Feb 9, 2010 9:21:38 AM (15 years ago)

Author:

vboxsync

Message:

Removed the balloon interface from Main's VMM device. Directly call PGMR3PhysFreeRamPages in VMMDev.

Location:

trunk

Files:

• include/VBox/pdmifs.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)
• src/VBox/Main/VMMDevInterface.cpp (modified) (2 diffs)

trunk/include/VBox/pdmifs.h

@@ -2082 +2082 @@
     DECLR3CALLBACKMEMBER(int, pfnReportStatistics,(PPDMIVMMDEVCONNECTOR pInterface, struct VBoxGuestStatistics *pGuestStats));
 
-    /**
-     * Inflate or deflate the memory balloon
-     *
-     * @returns VBox status code.
-     * @param   pInterface          Pointer to this interface.
-     * @param   fInflate            Inflate or deflate
-     * @param   cPages              Number of physical pages (must be 256 as we allocate in 1 MB chunks)
-     * @param   aPhysPage           Array of physical page addresses
-     * @thread  The emulation thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnChangeMemoryBalloon, (PPDMIVMMDEVCONNECTOR pInterface, bool fInflate, uint32_t cPages, RTGCPHYS *aPhysPage));
-
 } PDMIVMMDEVCONNECTOR;
 /** PDMIVMMDEVCONNECTOR interface ID. */
-#define PDMIVMMDEVCONNECTOR_IID                 "38b96194-ee83-489e-b92e-73ee28a29439"
+#define PDMIVMMDEVCONNECTOR_IID                 "5c35e324-2b02-49b7-a613-119fbf3320a9"
 
 

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1387 +1387 @@
             else
             {
-                pRequestHeader->rc = pThis->pDrv->pfnChangeMemoryBalloon(pThis->pDrv, !!memBalloonChange->fInflate, memBalloonChange->cPages, memBalloonChange->aPhysPage);
+                if (memBalloonChange->fInflate)
+                    pRequestHeader->rc = PGMR3PhysFreeRamPages(PDMDevHlpGetVM(pDevIns), memBalloonChange->cPages, memBalloonChange->aPhysPage);
+                else
+                    pRequestHeader->rc = VINF_SUCCESS;      /* deflating the balloon doesn't require any action; when the reacquired memory is touched, it will be paged back in. */
             }
             break;

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -512 +512 @@
         guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_SampleNumber, sample+1);
 
-    return VINF_SUCCESS;
-}
-
-/**
- * Inflate or deflate the memory balloon
- *
- * @returns VBox status code.
- * @param   pInterface          Pointer to this interface.
- * @param   fInflate            Inflate or deflate
- * @param   cPages              Number of physical pages (must be 256 as we allocate in 1 MB chunks)
- * @param   aPhysPage           Array of physical page addresses
- * @thread  The emulation thread.
- */
-DECLCALLBACK(int) vmmdevChangeMemoryBalloon(PPDMIVMMDEVCONNECTOR pInterface, bool fInflate, uint32_t cPages, RTGCPHYS *aPhysPage)
-{
-    if (    cPages != VMMDEV_MEMORY_BALLOON_CHUNK_PAGES
-        ||  !aPhysPage)
-        return VERR_INVALID_PARAMETER;
-
-    Log(("vmmdevChangeMemoryBalloon @todo\n"));
     return VINF_SUCCESS;
 }
@@ -737 +717 @@
     pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
     pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
-    pData->Connector.pfnChangeMemoryBalloon           = vmmdevChangeMemoryBalloon;
 
 #ifdef VBOX_WITH_HGCM