Changeset 44720 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Feb 15, 2013 5:52:37 PM (12 years ago)

Author:

vboxsync

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

83821

Message:

VMMDev: More cleanups.

File:

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

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

@@ -2630 +2630 @@
 
 
-/* -=-=-=-=-=- IVMMDevPort -=-=-=-=-=- */
+/* -=-=-=-=-=- PDMIVMMDEVPORT (VMMDEV::IPort) -=-=-=-=-=- */
 
 /** Converts a VMMDev port interface pointer to a VMMDev state pointer. */
@@ -2641 +2641 @@
 static DECLCALLBACK(int) vmmdevIPort_QueryAbsoluteMouse(PPDMIVMMDEVPORT pInterface, int32_t *pxAbs, int32_t *pyAbs)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
+
     if (pxAbs)
         *pxAbs = ASMAtomicReadS32(&pThis->mouseXAbs); /* why the atomic read? */
@@ -2654 +2655 @@
 static DECLCALLBACK(int) vmmdevIPort_SetAbsoluteMouse(PPDMIVMMDEVPORT pInterface, int32_t xAbs, int32_t yAbs)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
-    if (pThis->mouseXAbs == xAbs && pThis->mouseYAbs == yAbs)
-    {
-        PDMCritSectLeave(&pThis->CritSect);
-        return VINF_SUCCESS;
-    }
-    Log2(("vmmdevIPort_SetAbsoluteMouse : settings absolute position to x = %d, y = %d\n", xAbs, yAbs));
-    pThis->mouseXAbs = xAbs;
-    pThis->mouseYAbs = yAbs;
-    VMMDevNotifyGuest(pThis, VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
+    if (   pThis->mouseXAbs != xAbs
+        || pThis->mouseYAbs != yAbs)
+    {
+        Log2(("vmmdevIPort_SetAbsoluteMouse : settings absolute position to x = %d, y = %d\n", xAbs, yAbs));
+        pThis->mouseXAbs = xAbs;
+        pThis->mouseYAbs = yAbs;
+        VMMDevNotifyGuest(pThis, VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
+    }
+
     PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;
@@ -2675 +2676 @@
 static DECLCALLBACK(int) vmmdevIPort_QueryMouseCapabilities(PPDMIVMMDEVPORT pInterface, uint32_t *pfCapabilities)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
-    if (!pfCapabilities)
-        return VERR_INVALID_PARAMETER;
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
+    AssertPtrReturn(pfCapabilities, VERR_INVALID_PARAMETER);
+
     *pfCapabilities = pThis->mouseCapabilities;
     return VINF_SUCCESS;
@@ -2685 +2686 @@
  * @interface_method_impl{PDMIVMMDEVPORT, pfnUpdateMouseCapabilities}
  */
-static DECLCALLBACK(int) vmmdevIPort_UpdateMouseCapabilities(PPDMIVMMDEVPORT pInterface, uint32_t fCapsAdded, uint32_t fCapsRemoved)
-{
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+static DECLCALLBACK(int)
+vmmdevIPort_UpdateMouseCapabilities(PPDMIVMMDEVPORT pInterface, uint32_t fCapsAdded, uint32_t fCapsRemoved)
+{
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
     uint32_t fOldCaps = pThis->mouseCapabilities;
     pThis->mouseCapabilities &= ~(fCapsRemoved & VMMDEV_MOUSE_HOST_MASK);
-    pThis->mouseCapabilities |=   (fCapsAdded & VMMDEV_MOUSE_HOST_MASK)
-                                | VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR;
+    pThis->mouseCapabilities |= (fCapsAdded & VMMDEV_MOUSE_HOST_MASK)
+                              | VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR;
     bool fNotify = fOldCaps != pThis->mouseCapabilities;
 
-    LogRelFlowFunc(("fCapsAdded=0x%x, fCapsRemoved=0x%x, fNotify %s\n",
-                    fCapsAdded, fCapsRemoved, fNotify ? "TRUE" : "FALSE"));
+    LogRelFlowFunc(("fCapsAdded=0x%x, fCapsRemoved=0x%x, fNotify=%RTbool\n", fCapsAdded, fCapsRemoved, fNotify));
 
     if (fNotify)
@@ -2713 +2714 @@
                                  uint32_t xOrigin, uint32_t yOrigin, bool fEnabled, bool fChangeOrigin)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
 
     if (idxDisplay >= RT_ELEMENTS(pThis->displayChangeData.aRequests))
@@ -2749 +2750 @@
     if (!fSameResolution)
     {
-        LogRel(("VMMDev::SetVideoModeHint: got a video mode hint (%dx%dx%d) at %d\n",
-                cx, cy, cBits, idxDisplay));
+        LogRel(("VMMDev::SetVideoModeHint: got a video mode hint (%dx%dx%d) at %d\n", cx, cy, cBits, idxDisplay));
 
         /* we could validate the information here but hey, the guest can do that as well! */
@@ -2777 +2777 @@
 static DECLCALLBACK(int) vmmdevIPort_RequestSeamlessChange(PPDMIVMMDEVPORT pInterface, bool fEnabled)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
@@ -2803 +2803 @@
 static DECLCALLBACK(int) vmmdevIPort_SetMemoryBalloon(PPDMIVMMDEVPORT pInterface, uint32_t cMbBalloon)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
@@ -2826 +2826 @@
 static DECLCALLBACK(int) vmmdevIPort_VRDPChange(PPDMIVMMDEVPORT pInterface, bool fVRDPEnabled, uint32_t uVRDPExperienceLevel)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
@@ -2850 +2850 @@
 static DECLCALLBACK(int) vmmdevIPort_SetStatisticsInterval(PPDMIVMMDEVPORT pInterface, uint32_t cSecsStatInterval)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
@@ -2877 +2877 @@
                                                     const char *pszPassword, const char *pszDomain, uint32_t fFlags)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
-    int          rc = VINF_SUCCESS;
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
+    AssertReturn(fFlags & (VMMDEV_SETCREDENTIALS_GUESTLOGON | VMMDEV_SETCREDENTIALS_JUDGE), VERR_INVALID_PARAMETER);
 
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
-    /* logon mode? */
+    /*
+     * Logon mode
+     */
     if (fFlags & VMMDEV_SETCREDENTIALS_GUESTLOGON)
     {
@@ -2891 +2893 @@
         pThis->pCredentials->Logon.fAllowInteractiveLogon = !(fFlags & VMMDEV_SETCREDENTIALS_NOLOCALLOGON);
     }
-    /* credentials verification mode? */
-    else if (fFlags & VMMDEV_SETCREDENTIALS_JUDGE)
+    /*
+     * Credentials verification mode?
+     */
+    else
     {
         /* memorize the data */
@@ -2901 +2905 @@
         VMMDevNotifyGuest(pThis, VMMDEV_EVENT_JUDGE_CREDENTIALS);
     }
-    else
-        rc = VERR_INVALID_PARAMETER;
 
     PDMCritSectLeave(&pThis->CritSect);
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -2916 +2918 @@
 static DECLCALLBACK(void) vmmdevIPort_VBVAChange(PPDMIVMMDEVPORT pInterface, bool fEnabled)
 {
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
 
     Log(("vmmdevIPort_VBVAChange: fEnabled = %d\n", fEnabled));
@@ -2933 +2935 @@
 {
     int rc = VINF_SUCCESS;
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
 
     Log(("vmmdevIPort_CpuHotUnplug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));
@@ -2959 +2961 @@
 {
     int rc = VINF_SUCCESS;
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDEV, IPort);
 
     Log(("vmmdevCpuPlug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));