Changeset 4513 in vbox for trunk/src/VBox

Timestamp:

Sep 4, 2007 11:41:37 AM (17 years ago)

Author:

vboxsync

Message:

Reapplied fixed 24093.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (6 diffs)
• VMMDevInterface.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -174 +174 @@
 STDMETHODIMP Guest::COMSETTER(MemoryBalloonSize) (ULONG aMemoryBalloonSize)
 {
-    /** @todo fail if larger than physical memory */
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReaderLock alock (this);
-
-    mMemoryBalloonSize = aMemoryBalloonSize;
-
-    return S_OK;
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    HRESULT ret = mParent->machine()->COMSETTER(MemoryBalloonSize)(aMemoryBalloonSize);
+    if (ret == S_OK)
+    {
+        mMemoryBalloonSize = aMemoryBalloonSize;
+        /* forward the information to the VMM device */
+        VMMDev *vmmDev = mParent->getVMMDev();
+        if (vmmDev)
+            vmmDev->getVMMDevPort()->pfnSetMemoryBalloon(vmmDev->getVMMDevPort(), aMemoryBalloonSize);
+    }
+
+    return ret;
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -41 +41 @@
 #include "GuestOSTypeImpl.h"
 #include "VirtualBoxErrorInfoImpl.h"
+#include "GuestImpl.h"
 
 #include "USBProxyService.h"
@@ -164 +165 @@
     /* default values for a newly created machine */
     mMemorySize = 128;
+    mMemoryBalloonSize = 0;
     mVRAMSize = 8;
     mMonitorCount = 1;
@@ -188 +190 @@
 
     if (mMemorySize != that.mMemorySize ||
+        mMemoryBalloonSize != that.mMemoryBalloonSize ||
         mVRAMSize != that.mVRAMSize ||
         mMonitorCount != that.mMonitorCount ||
@@ -977 +980 @@
     return S_OK;
 }
+
+
+STDMETHODIMP Machine::COMGETTER(MemoryBalloonSize) (ULONG *memoryBalloonSize)
+{
+    if (!memoryBalloonSize)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *memoryBalloonSize = mHWData->mMemoryBalloonSize;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(MemoryBalloonSize) (ULONG memoryBalloonSize)
+{
+    /* check limits */
+    if (memoryBalloonSize >= VMMDEV_MAX_MEMORY_BALLOON(mHWData->mMemorySize))
+        return setError (E_INVALIDARG,
+            tr ("Invalid memory balloon size: %lu MB (must be in range [%lu, %lu] MB)"),
+                memoryBalloonSize, 0, VMMDEV_MAX_MEMORY_BALLOON(mHWData->mMemorySize));
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    mHWData.backup();
+    mHWData->mMemoryBalloonSize = memoryBalloonSize;
+
+    return S_OK;
+}
+
 
 STDMETHODIMP Machine::COMGETTER(MonitorCount) (ULONG *monitorCount)
@@ -3721 +3763 @@
         }
 
+        /* Guest node (optional) */
+        {
+            CFGNODE GuestNode = 0;
+            CFGLDRGetChildNode (machineNode, "Guest", 0, &GuestNode);
+            if (GuestNode)
+            {
+                uint32_t memoryBalloonSize = 0;
+                CFGLDRQueryUInt32 (GuestNode, "MemoryBalloonSize", &memoryBalloonSize);
+                mHWData->mMemoryBalloonSize = memoryBalloonSize;
+
+                CFGLDRReleaseNode (GuestNode);
+            }
+        }
+
         /*
          *  NOTE: the assignment below must be the last thing to do,
@@ -5386 +5442 @@
             if (FAILED (rc))
                 break;
+        }
+
+        /* Guest node (optional) */
+        {
+            CFGNODE GuestNode = 0;
+            CFGLDRGetChildNode (machineNode, "Guest", 0, &GuestNode);
+            /* first, delete the entire node if exists */
+            if (GuestNode)
+                CFGLDRDeleteNode (GuestNode);
+            /* then recreate it */
+            GuestNode = 0;
+            CFGLDRCreateChildNode (machineNode, "Guest", &GuestNode);
+            if (GuestNode)
+            {
+                CFGLDRSetUInt32 (GuestNode, "MemoryBalloonSize", mHWData->mMemoryBalloonSize);
+                CFGLDRReleaseNode (GuestNode);
+            }
         }
 

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -351 +351 @@
         *pcRect = cRect;
     }
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Request the statistics interval
+ *
+ * @returns VBox status code.
+ * @param   pInterface          Pointer to this interface.
+ * @param   pulInterval         Pointer to interval in seconds
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(int) vmmdevQueryStatisticsInterval(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pulInterval)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+    ULONG          val = 0;
+
+    if (!pulInterval)
+        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(StatisticsUpdateInterval)(&val);
+    *pulInterval = val;
+    return VINF_SUCCESS;
+}
+
+/**
+ * Report new guest statistics
+ *
+ * @returns VBox status code.
+ * @param   pInterface          Pointer to this interface.
+ * @param   pGuestStats         Guest statistics
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(int) vmmdevReportStatistics(PPDMIVMMDEVCONNECTOR pInterface, VBoxGuestStatistics *pGuestStats)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    Assert(pGuestStats);
+    if (!pGuestStats)
+        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 */
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD)
+        guest->SetStatistic(GuestStatisticType_CPULoad, pGuestStats->u32CpuLoad);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_THREADS)
+        guest->SetStatistic(GuestStatisticType_Threads, pGuestStats->u32Threads);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PROCESSES)
+        guest->SetStatistic(GuestStatisticType_Processes, pGuestStats->u32Processes);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_TOTAL)
+        guest->SetStatistic(GuestStatisticType_PhysMemTotal, pGuestStats->u32PhysMemTotal);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_AVAIL)
+        guest->SetStatistic(GuestStatisticType_PhysMemAvailable, pGuestStats->u32PhysMemAvail);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_BALLOON)
+        guest->SetStatistic(GuestStatisticType_PhysMemBalloon, pGuestStats->u32PhysMemBalloon);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PAGE_FILE_SIZE)
+        guest->SetStatistic(GuestStatisticType_PageFileSize, pGuestStats->u32PageFileSize);
 
     return VINF_SUCCESS;
@@ -543 +616 @@
     pData->Connector.pfnSetVisibleRegion              = vmmdevSetVisibleRegion;
     pData->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
+    pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
+    pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
 
 #ifdef VBOX_HGCM

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -409 +409 @@
   <enum
      name="GuestStatisticType"
-     uuid="da89a1b7-e602-45ac-84b7-29c9d12b92d5"
+     uuid="a7cffd08-665f-4156-b2e9-2b3c64e213da"
      >
     <const name="CPULoad"              value="0">
@@ -436 +436 @@
       </desc>
     </const>
-    <const name="PageFileSize"         value="5">
+    <const name="PhysMemBalloon"       value="5">
+      <desc>
+        Ballooned physical memory in megabytes.
+      </desc>
+    </const>
+    <const name="PageFileSize"         value="6">
       <desc>
         Pagefile size in megabytes.
@@ -2016 +2021 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="31f7169f-14da-4c55-8cb6-a3665186e35e"
+     uuid="dcfb87c4-18a9-4a1e-9b1f-6f68f920535b"
      wsmap="managed"
      >
@@ -2163 +2168 @@
 
     <attribute name="memorySize" type="unsigned long">
-      <desc>Sytem memory size in megabytes.</desc>
+      <desc>System memory size in megabytes.</desc>
+    </attribute>
+
+    <attribute name="memoryBalloonSize" type="unsigned long">
+      <desc>Initial memory balloon size in megabytes.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/MachineImpl.h

@@ -221 +221 @@
 
         ULONG          mMemorySize;
+        ULONG          mMemoryBalloonSize;
         ULONG          mVRAMSize;
         ULONG          mMonitorCount;
@@ -441 +442 @@
     STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);
+    STDMETHOD(COMGETTER(MemoryBalloonSize))(ULONG *memoryBalloonSize);
+    STDMETHOD(COMSETTER(MemoryBalloonSize))(ULONG memoryBalloonSize);
     STDMETHOD(COMGETTER(VRAMSize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(VRAMSize))(ULONG memorySize);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -383 +383 @@
 </xsd:complexType>
 
+<xsd:complexType name="TGuest">
+  <xsd:attribute name="MemoryBalloonSize" type="xsd:unsignedInt" default="0"/>
+</xsd:complexType>
+
 <xsd:complexType name="TBoot">
   <xsd:sequence>
@@ -662 +666 @@
     <xsd:element name="ExtraData" type="TExtraData" minOccurs="0"/>
     <xsd:element name="Snapshot" type="TSnapshot" minOccurs="0"/>
+    <xsd:element name="Guest" type="TGuest" minOccurs="0"/>
   </xsd:all>
   <xsd:attribute name="name" type="TNonEmptyString" use="required"/>