Changeset 29589 in vbox for trunk/src/VBox

Timestamp:

May 18, 2010 6:55:00 AM (15 years ago)

Author:

vboxsync

Message:

Connect page fusion state

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (2 diffs)
• VMMDevInterface.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -84 +84 @@
         mMemoryBalloonSize = 0;                     /* Default is no ballooning */
 
+    BOOL fPageFusionEnabled;
+    ret = mParent->machine()->COMGETTER(PageFusionEnabled)(&fPageFusionEnabled);
+    if (ret == S_OK)
+        mfPageFusionEnabled = fPageFusionEnabled;
+    else
+        mfPageFusionEnabled = false;                /* Default is no page fusion*/
+
     mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
 
@@ -204 +211 @@
 
     *aSupportsGraphics = mData.mSupportsGraphics;
+
+    return S_OK;
+}
+
+STDMETHODIMP Guest::COMGETTER(PageFusionEnabled) (BOOL *aPageFusionEnabled)
+{
+    CheckComArgOutPointerValid(aPageFusionEnabled);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aPageFusionEnabled = mfPageFusionEnabled;
 
     return S_OK;

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -490 +490 @@
     guest->COMGETTER(MemoryBalloonSize)(&val);
     *pcbBalloon = val;
+    return VINF_SUCCESS;
+}
+
+/**
+ * Query the current page fusion setting
+ *
+ * @returns VBox status code.
+ * @param   pInterface          Pointer to this interface.
+ * @param   pfPageFusionEnabled Pointer to boolean
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(int) vmmdevIsPageFusionEnabled(PPDMIVMMDEVCONNECTOR pInterface, bool *pfPageFusionEnabled)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+    BOOL           val = 0;
+
+    if (!pfPageFusionEnabled)
+        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(PageFusionEnabled)(&val);
+    *pfPageFusionEnabled = !!val;
     return VINF_SUCCESS;
 }
@@ -749 +776 @@
     pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
     pData->Connector.pfnQueryBalloonSize              = vmmdevQueryBalloonSize;
+    pData->Connector.pfnIsPageFusionEnabled           = vmmdevIsPageFusionEnabled;
 
 #ifdef VBOX_WITH_HGCM

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

@@ -8403 +8403 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="8aa950f6-668c-4388-b251-3809b404e862"
+    uuid="e3f6727e-a09b-41ea-a824-864a176472f3"
     wsmap="struct"
   >
@@ -8560 +8560 @@
     <attribute name="memoryBalloonSize" type="unsigned long">
       <desc>Guest system memory balloon size in megabytes (transient property).</desc>
+    </attribute>
+
+    <attribute name="pageFusionEnabled" type="boolean" readonly="yes">
+      <desc>Flag whether page fusion is enabled or not.</desc>
     </attribute>
 

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

@@ -82 +82 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
+    STDMETHOD(COMGETTER(PageFusionEnabled)) (BOOL *aPageFusionEnabled);
     STDMETHOD(COMGETTER(StatisticsUpdateInterval)) (ULONG *aUpdateInterval);
     STDMETHOD(COMSETTER(StatisticsUpdateInterval)) (ULONG aUpdateInterval);
@@ -169 +170 @@
     ULONG mStatUpdateInterval;
     ULONG mCurrentGuestStat[GUESTSTATTYPE_MAX];
+    BOOL  mfPageFusionEnabled;
 
     Console *mParent;