Changeset 28051 in vbox

Timestamp:

Apr 7, 2010 2:09:14 PM (15 years ago)

Author:

vboxsync

Message:

Another attempt to initialize the balloon correct during startup

Location:

trunk

Files:

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

trunk/include/VBox/pdmifs.h

@@ -2197 +2197 @@
     DECLR3CALLBACKMEMBER(int, pfnReportStatistics,(PPDMIVMMDEVCONNECTOR pInterface, struct VBoxGuestStatistics *pGuestStats));
 
+    /**
+     * Query the current balloon size
+     *
+     * @returns VBox status code.
+     * @param   pInterface          Pointer to this interface.
+     * @param   pcbBalloon          Balloon size
+     * @thread  The emulation thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnQueryBalloonSize,(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcbBalloon));
+
 } PDMIVMMDEVCONNECTOR;
 /** PDMIVMMDEVCONNECTOR interface ID. */

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

@@ -2764 +2764 @@
         }
 #endif
+        /* Query the initial balloon size. */
+        rc = pThis->pDrv->pfnQueryBalloonSize(pThis->pDrv, &pThis->u32MemoryBalloonSize);
+        AssertRC(rc);
+        Log(("Initial balloon size %x\n", pThis->u32MemoryBalloonSize));
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -84 +84 @@
     HRESULT ret = mParent->machine()->COMGETTER(MemoryBalloonSize)(&aMemoryBalloonSize);
     if (ret == S_OK)
-    {
         mMemoryBalloonSize = aMemoryBalloonSize;
-
-        if (mMemoryBalloonSize)
-        {
-            /* forward the information to the VMM device */
-            VMMDev *vmmDev = mParent->getVMMDev();
-            if (vmmDev)
-                vmmDev->getVMMDevPort()->pfnSetMemoryBalloon(vmmDev->getVMMDevPort(), aMemoryBalloonSize);
-        }
-    }
     else
         mMemoryBalloonSize = 0;                     /* Default is no ballooning */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -433 +433 @@
     guest->COMGETTER(StatisticsUpdateInterval)(&val);
     *pulInterval = val;
+    return VINF_SUCCESS;
+}
+
+/**
+ * Query the current balloon size
+ *
+ * @returns VBox status code.
+ * @param   pInterface          Pointer to this interface.
+ * @param   pcbBalloon          Balloon size
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(int) vmmdevQueryBalloonSize(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcbBalloon)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+    ULONG          val = 0;
+
+    if (!pcbBalloon)
+        return VERR_INVALID_POINTER;
+
+    /* store that information in IGuest */
+    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
+    Assert(guest);
+    if (!guest)
+        return VERR_INVALID_PARAMETER; /** @todo wrong error */
+
+    guest->COMGETTER(MemoryBalloonSize)(&val);
+    *pcbBalloon = val;
     return VINF_SUCCESS;
 }
@@ -691 +718 @@
     pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
     pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
+    pData->Connector.pfnQueryBalloonSize              = vmmdevQueryBalloonSize;
 
 #ifdef VBOX_WITH_HGCM