VBox

Timestamp:

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

Author:

vboxsync

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

57438

Message:

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

Location:

trunk/src/VBox

Files:

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

-              r26295
+              r26350
             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;

-              r26295
+              r26350
         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;
+}
 …
     pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
     pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
-    pData->Connector.pfnChangeMemoryBalloon           = vmmdevChangeMemoryBalloon;
 #ifdef VBOX_WITH_HGCM

Note: See TracChangeset for help on using the changeset viewer.