Changeset 26290 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 5, 2010 2:27:19 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57359

Message:

Statistics interval controllable from within the guest from now on.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (4 diffs)

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

@@ -1392 +1392 @@
         }
 
-        case VMMDevReq_GetStatisticsChangeRequest:
-        {
-            Log(("VMMDevReq_GetStatisticsChangeRequest\n"));
-            if (pRequestHeader->size != sizeof(VMMDevGetStatisticsChangeRequest))
-            {
-                AssertFailed();
-                pRequestHeader->rc = VERR_INVALID_PARAMETER;
-            }
-            else
-            {
-                VMMDevGetStatisticsChangeRequest *statIntervalChangeRequest = (VMMDevGetStatisticsChangeRequest*)pRequestHeader;
-                /* just pass on the information */
-                Log(("VMMDev: returning statistics interval %d seconds\n", pThis->u32StatIntervalSize));
-                statIntervalChangeRequest->u32StatInterval = pThis->u32StatIntervalSize;
-
-                if (statIntervalChangeRequest->eventAck == VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST)
-                {
-                    /* Remember which mode the client has queried. */
-                    pThis->u32LastStatIntervalSize= pThis->u32StatIntervalSize;
-                }
-
-                pRequestHeader->rc = VINF_SUCCESS;
-            }
-            break;
-        }
-
         case VMMDevReq_ReportGuestStats:
         {
@@ -2069 +2043 @@
 }
 
-static DECLCALLBACK(int) vmmdevSetStatisticsInterval(PPDMIVMMDEVPORT pInterface, uint32_t ulStatInterval)
-{
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
-    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-
-    /* Verify that the new resolution is different and that guest does not yet know about it. */
-    bool fSame = (pThis->u32LastStatIntervalSize == ulStatInterval);
-
-    Log(("vmmdevSetStatisticsInterval: old=%d. new=%d\n", pThis->u32LastStatIntervalSize, ulStatInterval));
-
-    if (!fSame)
-    {
-        /* we could validate the information here but hey, the guest can do that as well! */
-        pThis->u32StatIntervalSize = ulStatInterval;
-
-        /* IRQ so the guest knows what's going on */
-        VMMDevNotifyGuest (pThis, VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST);
-    }
-
-    PDMCritSectLeave(&pThis->CritSect);
-    return VINF_SUCCESS;
-}
-
 
 static DECLCALLBACK(int) vmmdevSetCredentials(PPDMIVMMDEVPORT pInterface, const char *pszUsername,
@@ -2479 +2430 @@
     /* disabled memory ballooning */
     pThis->u32LastMemoryBalloonSize = 0;
-
-    /* disabled statistics updating */
-    pThis->u32LastStatIntervalSize = 0;
 
     /* Clear the "HGCM event enabled" flag so the event can be automatically reenabled.  */
@@ -2593 +2541 @@
     pThis->IPort.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
     pThis->IPort.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
-    pThis->IPort.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
     pThis->IPort.pfnVRDPChange             = vmmdevVRDPChange;
     pThis->IPort.pfnCpuHotUnplug           = vmmdevCpuHotUnplug;