Changeset 27823 in vbox

Timestamp:

Mar 30, 2010 1:11:16 PM (15 years ago)

Author:

vboxsync

Message:

More cleanup

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -625 +625 @@
 
     uint32_t            ulMemoryBalloonSize;
-    uint32_t            ulStatisticsUpdateInterval;
 
     GuestPropertiesList llGuestProperties;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -159 +159 @@
     mCPUHotPlugEnabled = false;
     mMemoryBalloonSize = 0;
-    mStatisticsUpdateInterval = 0;
     mVRAMSize = 8;
     mAccelerate3DEnabled = false;
@@ -1275 +1274 @@
     return S_OK;
 }
-
-/** @todo this method should not be public */
-STDMETHODIMP Machine::COMGETTER(StatisticsUpdateInterval)(ULONG *statisticsUpdateInterval)
-{
-    if (!statisticsUpdateInterval)
-        return E_POINTER;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *statisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
-
-    return S_OK;
-}
-
-/** @todo this method should not be public */
-STDMETHODIMP Machine::COMSETTER(StatisticsUpdateInterval)(ULONG statisticsUpdateInterval)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = checkStateDependency(MutableStateDep);
-    if (FAILED(rc)) return rc;
-
-    setModified(IsModified_MachineData);
-    mHWData.backup();
-    mHWData->mStatisticsUpdateInterval = statisticsUpdateInterval;
-
-    return S_OK;
-}
-
 
 STDMETHODIMP Machine::COMGETTER(Accelerate3DEnabled)(BOOL *enabled)
@@ -6687 +6651 @@
         // guest settings
         mHWData->mMemoryBalloonSize = data.ulMemoryBalloonSize;
-        mHWData->mStatisticsUpdateInterval = data.ulStatisticsUpdateInterval;
 
         // IO settings
@@ -7726 +7689 @@
         /* Guest */
         data.ulMemoryBalloonSize = mHWData->mMemoryBalloonSize;
-        data.ulStatisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
 
         // IO settings

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

@@ -273 +273 @@
         ULONG                mMemorySize;
         ULONG                mMemoryBalloonSize;
-        ULONG                mStatisticsUpdateInterval;
         ULONG                mVRAMSize;
         ULONG                mMonitorCount;
@@ -392 +391 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize))(ULONG *memoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize))(ULONG memoryBalloonSize);
-    STDMETHOD(COMGETTER(StatisticsUpdateInterval))(ULONG *statisticsUpdateInterval);
-    STDMETHOD(COMSETTER(StatisticsUpdateInterval))(ULONG statisticsUpdateInterval);
     STDMETHOD(COMGETTER(VRAMSize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(VRAMSize))(ULONG memorySize);

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1477 +1477 @@
           keyboardHidType(KeyboardHidType_PS2Keyboard),
           clipboardMode(ClipboardMode_Bidirectional),
-          ulMemoryBalloonSize(0),
-          ulStatisticsUpdateInterval(0)
+          ulMemoryBalloonSize(0)
 {
     mapBootOrder[0] = DeviceType_Floppy;
@@ -1534 +1533 @@
                   && (clipboardMode             == h.clipboardMode)
                   && (ulMemoryBalloonSize       == h.ulMemoryBalloonSize)
-                  && (ulStatisticsUpdateInterval == h.ulStatisticsUpdateInterval)
                   && (llGuestProperties         == h.llGuestProperties)
                   && (strNotificationPatterns   == h.strNotificationPatterns)
@@ -2377 +2375 @@
             if (!pelmHwChild->getAttributeValue("memoryBalloonSize", hw.ulMemoryBalloonSize))
                 pelmHwChild->getAttributeValue("MemoryBalloonSize", hw.ulMemoryBalloonSize);            // used before 1.3
-            if (!pelmHwChild->getAttributeValue("statisticsUpdateInterval", hw.ulStatisticsUpdateInterval))
-                pelmHwChild->getAttributeValue("StatisticsUpdateInterval", hw.ulStatisticsUpdateInterval);
         }
         else if (pelmHwChild->nameEquals("GuestProperties"))
@@ -3405 +3401 @@
     xml::ElementNode *pelmGuest = pelmHardware->createChild("Guest");
     pelmGuest->setAttribute("memoryBalloonSize", hw.ulMemoryBalloonSize);
-    pelmGuest->setAttribute("statisticsUpdateInterval", hw.ulStatisticsUpdateInterval);
 
     xml::ElementNode *pelmGuestProps = pelmHardware->createChild("GuestProperties");