Changeset 31692 in vbox

Timestamp:

Aug 16, 2010 1:12:42 PM (14 years ago)

Author:

vboxsync

Message:

Cleaned up IGuest page fusion api

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -269 +269 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(PageFusionEnabled) (BOOL *aPageFusionEnabled)
-{
-    CheckComArgOutPointerValid(aPageFusionEnabled);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+BOOL Guest::isPageFusionEnabled()
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return false;
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aPageFusionEnabled = mfPageFusionEnabled;
-
-    return S_OK;
-}
-
-STDMETHODIMP Guest::COMSETTER(PageFusionEnabled) (BOOL aPageFusionEnabled)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /** todo; API complete, but not implemented */
-
-    return E_NOTIMPL;
+    return mfPageFusionEnabled;
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1525 +1525 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    /** @todo must support changes for running vms and keep this in sync with IGuest. */
     setModified(IsModified_MachineData);
     mHWData.backup();

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -588 +588 @@
         return VERR_INVALID_PARAMETER; /** @todo wrong error */
 
-    guest->COMGETTER(PageFusionEnabled)(&val);
-    *pfPageFusionEnabled = !!val;
+    *pfPageFusionEnabled = !!guest->isPageFusionEnabled();
     return VINF_SUCCESS;
 }

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

@@ -7593 +7593 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="d915dff1-ed38-495a-91f1-ab6c53932468"
+     uuid="506da00d-1ca5-4ccf-851d-8683253d0f5e"
      wsmap="managed"
      >
@@ -7654 +7654 @@
     <attribute name="memoryBalloonSize" type="unsigned long">
       <desc>Guest system memory balloon size in megabytes (transient property).</desc>
-    </attribute>
-
-    <attribute name="pageFusionEnabled" type="boolean">
-      <desc>Flag whether page fusion is enabled or not.</desc>
     </attribute>
 

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

@@ -90 +90 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
-    STDMETHOD(COMGETTER(PageFusionEnabled)) (BOOL *aPageFusionEnabled);
-    STDMETHOD(COMSETTER(PageFusionEnabled)) (BOOL aPageFusionEnabled);
     STDMETHOD(COMGETTER(StatisticsUpdateInterval)) (ULONG *aUpdateInterval);
     STDMETHOD(COMSETTER(StatisticsUpdateInterval)) (ULONG aUpdateInterval);
@@ -114 +112 @@
     void setSupportedFeatures(ULONG64 ulCaps, ULONG64 ulActive);
     HRESULT setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
+    BOOL isPageFusionEnabled();
 
 # ifdef VBOX_WITH_GUEST_CONTROL