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

Timestamp:

Feb 15, 2013 6:22:23 PM (12 years ago)

Author:

vboxsync

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

83824

Message:

pVMMDevState -> pThis, like most other devs/drvs do by now.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (6 diffs)
• VMMDevHGCM.cpp (modified) (76 diffs)

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

@@ -129 +129 @@
  */
 
-static void vmmdevSetIRQ_Legacy_EMT(VMMDevState *pVMMDevState)
-{
-    if (!pVMMDevState->fu32AdditionsOk)
+static void vmmdevSetIRQ_Legacy_EMT(VMMDevState *pThis)
+{
+    if (!pThis->fu32AdditionsOk)
     {
         Log(("vmmdevSetIRQ: IRQ is not generated, guest has not yet reported to us.\n"));
@@ -141 +141 @@
     /* Filter unsupported events */
     uint32_t u32EventFlags =
-        pVMMDevState->u32HostEventFlags
-        & pVMMDevState->pVMMDevRAMR3->V.V1_03.u32GuestEventMask;
+        pThis->u32HostEventFlags
+        & pThis->pVMMDevRAMR3->V.V1_03.u32GuestEventMask;
 
     Log(("vmmdevSetIRQ: u32EventFlags = 0x%08X, "
-         "pVMMDevState->u32HostEventFlags = 0x%08X, "
-         "pVMMDevState->pVMMDevRAMR3->u32GuestEventMask = 0x%08X\n",
+         "pThis->u32HostEventFlags = 0x%08X, "
+         "pThis->pVMMDevRAMR3->u32GuestEventMask = 0x%08X\n",
          u32EventFlags,
-         pVMMDevState->u32HostEventFlags,
-         pVMMDevState->pVMMDevRAMR3->V.V1_03.u32GuestEventMask));
+         pThis->u32HostEventFlags,
+         pThis->pVMMDevRAMR3->V.V1_03.u32GuestEventMask));
 
     /* Move event flags to VMMDev RAM */
-    pVMMDevState->pVMMDevRAMR3->V.V1_03.u32HostEvents = u32EventFlags;
+    pThis->pVMMDevRAMR3->V.V1_03.u32HostEvents = u32EventFlags;
 
     if (u32EventFlags)
     {
         /* Clear host flags which will be delivered to guest. */
-        pVMMDevState->u32HostEventFlags &= ~u32EventFlags;
-        Log(("vmmdevSetIRQ: pVMMDevState->u32HostEventFlags = 0x%08X\n",
-             pVMMDevState->u32HostEventFlags));
+        pThis->u32HostEventFlags &= ~u32EventFlags;
+        Log(("vmmdevSetIRQ: pThis->u32HostEventFlags = 0x%08X\n",
+             pThis->u32HostEventFlags));
         u32IRQLevel = 1;
     }
@@ -165 +165 @@
     /* Set IRQ level for pin 0 */
     /** @todo make IRQ pin configurable, at least a symbolic constant */
-    PPDMDEVINS pDevIns = pVMMDevState->pDevIns;
+    PPDMDEVINS pDevIns = pThis->pDevIns;
     PDMDevHlpPCISetIrqNoWait(pDevIns, 0, u32IRQLevel);
     Log(("vmmdevSetIRQ: IRQ set %d\n", u32IRQLevel));
 }
 
-static void vmmdevMaybeSetIRQ_EMT(VMMDevState *pVMMDevState)
+static void vmmdevMaybeSetIRQ_EMT(VMMDevState *pThis)
 {
     Log3(("vmmdevMaybeSetIRQ_EMT: u32HostEventFlags = 0x%08X, u32GuestFilterMask = 0x%08X.\n",
-          pVMMDevState->u32HostEventFlags, pVMMDevState->u32GuestFilterMask));
-
-    if (pVMMDevState->u32HostEventFlags & pVMMDevState->u32GuestFilterMask)
-    {
-        pVMMDevState->pVMMDevRAMR3->V.V1_04.fHaveEvents = true;
-        PDMDevHlpPCISetIrqNoWait(pVMMDevState->pDevIns, 0, 1);
+          pThis->u32HostEventFlags, pThis->u32GuestFilterMask));
+
+    if (pThis->u32HostEventFlags & pThis->u32GuestFilterMask)
+    {
+        pThis->pVMMDevRAMR3->V.V1_04.fHaveEvents = true;
+        PDMDevHlpPCISetIrqNoWait(pThis->pDevIns, 0, 1);
         Log3(("vmmdevMaybeSetIRQ_EMT: IRQ set.\n"));
     }
 }
 
-static void vmmdevNotifyGuest_EMT(VMMDevState *pVMMDevState, uint32_t u32EventMask)
+static void vmmdevNotifyGuest_EMT(VMMDevState *pThis, uint32_t u32EventMask)
 {
     Log3(("VMMDevNotifyGuest_EMT: u32EventMask = 0x%08X.\n", u32EventMask));
 
-    if (VBOX_GUEST_INTERFACE_VERSION_1_03(pVMMDevState))
+    if (VBOX_GUEST_INTERFACE_VERSION_1_03(pThis))
     {
         Log3(("VMMDevNotifyGuest_EMT: Old additions detected.\n"));
 
-        pVMMDevState->u32HostEventFlags |= u32EventMask;
-        vmmdevSetIRQ_Legacy_EMT(pVMMDevState);
+        pThis->u32HostEventFlags |= u32EventMask;
+        vmmdevSetIRQ_Legacy_EMT(pThis);
     }
     else
@@ -198 +198 @@
         Log3(("VMMDevNotifyGuest_EMT: New additions detected.\n"));
 
-        if (!pVMMDevState->fu32AdditionsOk)
-        {
-            pVMMDevState->u32HostEventFlags |= u32EventMask;
+        if (!pThis->fu32AdditionsOk)
+        {
+            pThis->u32HostEventFlags |= u32EventMask;
             Log(("vmmdevNotifyGuest_EMT: IRQ is not generated, guest has not yet reported to us.\n"));
             return;
@@ -206 +206 @@
 
         const bool fHadEvents =
-            (pVMMDevState->u32HostEventFlags & pVMMDevState->u32GuestFilterMask) != 0;
+            (pThis->u32HostEventFlags & pThis->u32GuestFilterMask) != 0;
 
         Log3(("VMMDevNotifyGuest_EMT: fHadEvents = %d, u32HostEventFlags = 0x%08X, u32GuestFilterMask = 0x%08X.\n",
-              fHadEvents, pVMMDevState->u32HostEventFlags, pVMMDevState->u32GuestFilterMask));
-
-        pVMMDevState->u32HostEventFlags |= u32EventMask;
+              fHadEvents, pThis->u32HostEventFlags, pThis->u32GuestFilterMask));
+
+        pThis->u32HostEventFlags |= u32EventMask;
 
         if (!fHadEvents)
-            vmmdevMaybeSetIRQ_EMT (pVMMDevState);
-    }
-}
-
-void VMMDevCtlSetGuestFilterMask (VMMDevState *pVMMDevState,
+            vmmdevMaybeSetIRQ_EMT (pThis);
+    }
+}
+
+void VMMDevCtlSetGuestFilterMask (VMMDevState *pThis,
                                   uint32_t u32OrMask,
                                   uint32_t u32NotMask)
 {
-    PDMCritSectEnter(&pVMMDevState->CritSect, VERR_SEM_BUSY);
+    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
     const bool fHadEvents =
-        (pVMMDevState->u32HostEventFlags & pVMMDevState->u32GuestFilterMask) != 0;
+        (pThis->u32HostEventFlags & pThis->u32GuestFilterMask) != 0;
 
     Log(("VMMDevCtlSetGuestFilterMask: u32OrMask = 0x%08X, u32NotMask = 0x%08X, fHadEvents = %d.\n", u32OrMask, u32NotMask, fHadEvents));
     if (fHadEvents)
     {
-        if (!pVMMDevState->fNewGuestFilterMask)
-            pVMMDevState->u32NewGuestFilterMask = pVMMDevState->u32GuestFilterMask;
-
-        pVMMDevState->u32NewGuestFilterMask |= u32OrMask;
-        pVMMDevState->u32NewGuestFilterMask &= ~u32NotMask;
-        pVMMDevState->fNewGuestFilterMask = true;
+        if (!pThis->fNewGuestFilterMask)
+            pThis->u32NewGuestFilterMask = pThis->u32GuestFilterMask;
+
+        pThis->u32NewGuestFilterMask |= u32OrMask;
+        pThis->u32NewGuestFilterMask &= ~u32NotMask;
+        pThis->fNewGuestFilterMask = true;
     }
     else
     {
-        pVMMDevState->u32GuestFilterMask |= u32OrMask;
-        pVMMDevState->u32GuestFilterMask &= ~u32NotMask;
-        vmmdevMaybeSetIRQ_EMT (pVMMDevState);
-    }
-    PDMCritSectLeave(&pVMMDevState->CritSect);
-}
-
-void VMMDevNotifyGuest (VMMDevState *pVMMDevState, uint32_t u32EventMask)
-{
-    PPDMDEVINS pDevIns = pVMMDevState->pDevIns;
+        pThis->u32GuestFilterMask |= u32OrMask;
+        pThis->u32GuestFilterMask &= ~u32NotMask;
+        vmmdevMaybeSetIRQ_EMT (pThis);
+    }
+    PDMCritSectLeave(&pThis->CritSect);
+}
+
+void VMMDevNotifyGuest (VMMDevState *pThis, uint32_t u32EventMask)
+{
+    PPDMDEVINS pDevIns = pThis->pDevIns;
 
     Log3(("VMMDevNotifyGuest: u32EventMask = 0x%08X.\n", u32EventMask));
@@ -260 +260 @@
         return;
 
-    PDMCritSectEnter(&pVMMDevState->CritSect, VERR_SEM_BUSY);
+    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     /* No need to wait for the completion of this request. It is a notification
      * about something, which has already happened.
      */
-    vmmdevNotifyGuest_EMT(pVMMDevState, u32EventMask);
-    PDMCritSectLeave(&pVMMDevState->CritSect);
+    vmmdevNotifyGuest_EMT(pThis, u32EventMask);
+    PDMCritSectLeave(&pThis->CritSect);
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_VMM
 #include <iprt/alloc.h>
@@ -40 +43 @@
 #endif
 
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
 typedef enum _VBOXHGCMCMDTYPE
 {
@@ -49 +56 @@
 } VBOXHGCMCMDTYPE;
 
-/* Information about a linear ptr parameter. */
+/**
+ * Information about a linear ptr parameter.
+ */
 typedef struct _VBOXHGCMLINPTR
 {
-    /* Index of the parameter. */
+    /** Index of the parameter. */
     uint32_t iParm;
 
-    /* Offset in the first physical page of the region. */
+    /** Offset in the first physical page of the region. */
     uint32_t offFirstPage;
 
-    /* How many pages. */
+    /** How many pages. */
     uint32_t cPages;
 
-    /* Pointer to array of the GC physical addresses for these pages.
-     * It is assumed that the physical address of the locked resident
-     * guest page does not change.
+    /** Pointer to array of the GC physical addresses for these pages.
+     * It is assumed that the physical address of the locked resident guest page
+     * does not change.
      */
     RTGCPHYS *paPages;
@@ -71 +80 @@
 struct VBOXHGCMCMD
 {
-    /* Active commands, list is protected by critsectHGCMCmdList. */
+    /** Active commands, list is protected by critsectHGCMCmdList. */
     struct VBOXHGCMCMD *pNext;
     struct VBOXHGCMCMD *pPrev;
 
-    /* The type of the command. */
+    /** The type of the command. */
     VBOXHGCMCMDTYPE enmCmdType;
 
-    /* Whether the command was cancelled by the guest. */
+    /** Whether the command was cancelled by the guest. */
     bool fCancelled;
 
-    /* Whether the command is in the active commands list. */
+    /** Whether the command is in the active commands list. */
     bool fInList;
 
-    /* Whether the command was saved. */
+    /** Whether the command was saved. */
     bool fSaved;
 
-    /* GC physical address of the guest request. */
+    /** GC physical address of the guest request. */
     RTGCPHYS        GCPhys;
 
-    /* Request packet size */
+    /** Request packet size */
     uint32_t        cbSize;
 
-    /* Pointer to converted host parameters in case of a Call request.
+    /** Pointer to converted host parameters in case of a Call request.
      * Parameters follow this structure in the same memory block.
      */
     VBOXHGCMSVCPARM *paHostParms;
 
-    /* Linear pointer parameters information. */
+    /** Linear pointer parameters information. */
     int cLinPtrs;
 
-    /* How many pages for all linptrs of this command.
+    /** How many pages for all linptrs of this command.
      * Only valid if cLinPtrs > 0. This field simplifies loading of saved state.
      */
     int cLinPtrPages;
 
-    /* Pointer to descriptions of linear pointers.  */
+    /** Pointer to descriptions of linear pointers.  */
     VBOXHGCMLINPTR *paLinPtrs;
 };
 
-static int vmmdevHGCMCmdListLock (VMMDevState *pVMMDevState)
-{
-    int rc = RTCritSectEnter (&pVMMDevState->critsectHGCMCmdList);
+static int vmmdevHGCMCmdListLock (VMMDevState *pThis)
+{
+    int rc = RTCritSectEnter (&pThis->critsectHGCMCmdList);
     AssertRC (rc);
     return rc;
 }
 
-static void vmmdevHGCMCmdListUnlock (VMMDevState *pVMMDevState)
-{
-    int rc = RTCritSectLeave (&pVMMDevState->critsectHGCMCmdList);
+static void vmmdevHGCMCmdListUnlock (VMMDevState *pThis)
+{
+    int rc = RTCritSectLeave (&pThis->critsectHGCMCmdList);
     AssertRC (rc);
 }
 
-static int vmmdevHGCMAddCommand (VMMDevState *pVMMDevState, PVBOXHGCMCMD pCmd, RTGCPHYS GCPhys, uint32_t cbSize, VBOXHGCMCMDTYPE enmCmdType)
-{
-    /* PPDMDEVINS pDevIns = pVMMDevState->pDevIns; */
-
-    int rc = vmmdevHGCMCmdListLock (pVMMDevState);
+static int vmmdevHGCMAddCommand (VMMDevState *pThis, PVBOXHGCMCMD pCmd, RTGCPHYS GCPhys, uint32_t cbSize, VBOXHGCMCMDTYPE enmCmdType)
+{
+    /* PPDMDEVINS pDevIns = pThis->pDevIns; */
+
+    int rc = vmmdevHGCMCmdListLock (pThis);
 
     if (RT_SUCCESS (rc))
@@ -134 +143 @@
 
         /* Insert at the head of the list. The vmmdevHGCMLoadStateDone depends on this. */
-        pCmd->pNext = pVMMDevState->pHGCMCmdList;
+        pCmd->pNext = pThis->pHGCMCmdList;
         pCmd->pPrev = NULL;
 
-        if (pVMMDevState->pHGCMCmdList)
-        {
-            pVMMDevState->pHGCMCmdList->pPrev = pCmd;
-        }
-
-        pVMMDevState->pHGCMCmdList = pCmd;
+        if (pThis->pHGCMCmdList)
+        {
+            pThis->pHGCMCmdList->pPrev = pCmd;
+        }
+
+        pThis->pHGCMCmdList = pCmd;
 
         pCmd->fInList = true;
@@ -159 +168 @@
             || enmCmdType == VBOXHGCMCMDTYPE_CALL)
         {
-            Log(("vmmdevHGCMAddCommand: u32HGCMEnabled = %d\n", pVMMDevState->u32HGCMEnabled));
-            if (ASMAtomicCmpXchgU32(&pVMMDevState->u32HGCMEnabled, 1, 0))
+            Log(("vmmdevHGCMAddCommand: u32HGCMEnabled = %d\n", pThis->u32HGCMEnabled));
+            if (ASMAtomicCmpXchgU32(&pThis->u32HGCMEnabled, 1, 0))
             {
-                 VMMDevCtlSetGuestFilterMask (pVMMDevState, VMMDEV_EVENT_HGCM, 0);
+                 VMMDevCtlSetGuestFilterMask (pThis, VMMDEV_EVENT_HGCM, 0);
             }
         }
 
-        vmmdevHGCMCmdListUnlock (pVMMDevState);
+        vmmdevHGCMCmdListUnlock (pThis);
     }
 
@@ -172 +181 @@
 }
 
-static int vmmdevHGCMRemoveCommand (VMMDevState *pVMMDevState, PVBOXHGCMCMD pCmd)
-{
-    /* PPDMDEVINS pDevIns = pVMMDevState->pDevIns; */
-
-    int rc = vmmdevHGCMCmdListLock (pVMMDevState);
+static int vmmdevHGCMRemoveCommand (VMMDevState *pThis, PVBOXHGCMCMD pCmd)
+{
+    /* PPDMDEVINS pDevIns = pThis->pDevIns; */
+
+    int rc = vmmdevHGCMCmdListLock (pThis);
 
     if (RT_SUCCESS (rc))
@@ -185 +194 @@
         {
             LogFlowFunc(("%p not in the list\n", pCmd));
-            vmmdevHGCMCmdListUnlock (pVMMDevState);
+            vmmdevHGCMCmdListUnlock (pThis);
             return VINF_SUCCESS;
         }
@@ -204 +213 @@
         else
         {
-            pVMMDevState->pHGCMCmdList = pCmd->pNext;
+            pThis->pHGCMCmdList = pCmd->pNext;
         }
 
@@ -211 +220 @@
         pCmd->fInList = false;
 
-        vmmdevHGCMCmdListUnlock (pVMMDevState);
+        vmmdevHGCMCmdListUnlock (pThis);
     }
 
@@ -474 +483 @@
 }
 
-int vmmdevHGCMConnect (VMMDevState *pVMMDevState, VMMDevHGCMConnect *pHGCMConnect, RTGCPHYS GCPhys)
+int vmmdevHGCMConnect (VMMDevState *pThis, VMMDevHGCMConnect *pHGCMConnect, RTGCPHYS GCPhys)
 {
     int rc = VINF_SUCCESS;
@@ -486 +495 @@
         VMMDevHGCMConnect *pHGCMConnectCopy = (VMMDevHGCMConnect *)(pCmd+1);
 
-        vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMConnect->header.header.size, VBOXHGCMCMDTYPE_CONNECT);
+        vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMConnect->header.header.size, VBOXHGCMCMDTYPE_CONNECT);
 
         memcpy(pHGCMConnectCopy, pHGCMConnect, pHGCMConnect->header.header.size);
@@ -498 +507 @@
         pHGCMConnectCopy->loc.type = VMMDevHGCMLoc_LocalHost_Existing;
 
-        rc = pVMMDevState->pHGCMDrv->pfnConnect (pVMMDevState->pHGCMDrv, pCmd, &pHGCMConnectCopy->loc, &pHGCMConnectCopy->u32ClientID);
+        rc = pThis->pHGCMDrv->pfnConnect (pThis->pHGCMDrv, pCmd, &pHGCMConnectCopy->loc, &pHGCMConnectCopy->u32ClientID);
     }
     else
@@ -508 +517 @@
 }
 
-static int vmmdevHGCMConnectSaved (VMMDevState *pVMMDevState, VMMDevHGCMConnect *pHGCMConnect, RTGCPHYS GCPhys, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
+static int vmmdevHGCMConnectSaved (VMMDevState *pThis, VMMDevHGCMConnect *pHGCMConnect, RTGCPHYS GCPhys, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
 {
     int rc = VINF_SUCCESS;
@@ -524 +533 @@
         VMMDevHGCMConnect *pHGCMConnectCopy = (VMMDevHGCMConnect *)(pCmd+1);
 
-        vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMConnect->header.header.size, VBOXHGCMCMDTYPE_CONNECT);
+        vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMConnect->header.header.size, VBOXHGCMCMDTYPE_CONNECT);
 
         memcpy(pHGCMConnectCopy, pHGCMConnect, pHGCMConnect->header.header.size);
@@ -532 +541 @@
         pHGCMConnectCopy->loc.type = VMMDevHGCMLoc_LocalHost_Existing;
 
-        rc = pVMMDevState->pHGCMDrv->pfnConnect (pVMMDevState->pHGCMDrv, pCmd, &pHGCMConnectCopy->loc, &pHGCMConnectCopy->u32ClientID);
+        rc = pThis->pHGCMDrv->pfnConnect (pThis->pHGCMDrv, pCmd, &pHGCMConnectCopy->loc, &pHGCMConnectCopy->u32ClientID);
 
         if (RT_SUCCESS (rc))
@@ -547 +556 @@
 }
 
-int vmmdevHGCMDisconnect (VMMDevState *pVMMDevState, VMMDevHGCMDisconnect *pHGCMDisconnect, RTGCPHYS GCPhys)
+int vmmdevHGCMDisconnect (VMMDevState *pThis, VMMDevHGCMDisconnect *pHGCMDisconnect, RTGCPHYS GCPhys)
 {
     int rc = VINF_SUCCESS;
@@ -557 +566 @@
     if (pCmd)
     {
-        vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMDisconnect->header.header.size, VBOXHGCMCMDTYPE_DISCONNECT);
+        vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMDisconnect->header.header.size, VBOXHGCMCMDTYPE_DISCONNECT);
 
         pCmd->paHostParms = NULL;
@@ -563 +572 @@
         pCmd->paLinPtrs = NULL;
 
-        rc = pVMMDevState->pHGCMDrv->pfnDisconnect (pVMMDevState->pHGCMDrv, pCmd, pHGCMDisconnect->u32ClientID);
+        rc = pThis->pHGCMDrv->pfnDisconnect (pThis->pHGCMDrv, pCmd, pHGCMDisconnect->u32ClientID);
     }
     else
@@ -573 +582 @@
 }
 
-static int vmmdevHGCMDisconnectSaved (VMMDevState *pVMMDevState, VMMDevHGCMDisconnect *pHGCMDisconnect, RTGCPHYS GCPhys, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
+static int vmmdevHGCMDisconnectSaved (VMMDevState *pThis, VMMDevHGCMDisconnect *pHGCMDisconnect, RTGCPHYS GCPhys, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
 {
     int rc = VINF_SUCCESS;
@@ -586 +595 @@
         *ppCmd = pCmd;
 
-        vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMDisconnect->header.header.size, VBOXHGCMCMDTYPE_DISCONNECT);
+        vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMDisconnect->header.header.size, VBOXHGCMCMDTYPE_DISCONNECT);
 
         pCmd->paHostParms = NULL;
@@ -592 +601 @@
         pCmd->paLinPtrs = NULL;
 
-        rc = pVMMDevState->pHGCMDrv->pfnDisconnect (pVMMDevState->pHGCMDrv, pCmd, pHGCMDisconnect->u32ClientID);
+        rc = pThis->pHGCMDrv->pfnDisconnect (pThis->pHGCMDrv, pCmd, pHGCMDisconnect->u32ClientID);
 
         if (RT_SUCCESS (rc))
@@ -607 +616 @@
 }
 
-int vmmdevHGCMCall (VMMDevState *pVMMDevState, VMMDevHGCMCall *pHGCMCall, uint32_t cbHGCMCall, RTGCPHYS GCPhys, bool f64Bits)
+int vmmdevHGCMCall (VMMDevState *pThis, VMMDevHGCMCall *pHGCMCall, uint32_t cbHGCMCall, RTGCPHYS GCPhys, bool f64Bits)
 {
     int rc = VINF_SUCCESS;
@@ -850 +859 @@
                              /* Don't overdo it */
                              if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_Out)
-                                 rc = PDMDevHlpPhysReadGCVirt(pVMMDevState->pDevIns, pcBuf, linearAddr, size);
+                                 rc = PDMDevHlpPhysReadGCVirt(pThis->pDevIns, pcBuf, linearAddr, size);
                              else
                                  rc = VINF_SUCCESS;
@@ -862 +871 @@
                                   * Do it for all linear pointers because load state will require In pointer info too.
                                   */
-                                 rc = vmmdevHGCMSaveLinPtr (pVMMDevState->pDevIns, i, linearAddr, size, iLinPtr, pCmd->paLinPtrs, &pPages);
+                                 rc = vmmdevHGCMSaveLinPtr (pThis->pDevIns, i, linearAddr, size, iLinPtr, pCmd->paLinPtrs, &pPages);
 
                                  iLinPtr++;
@@ -912 +921 @@
                              {
                                  /* Copy pages to the pcBuf[size]. */
-                                 rc = vmmdevHGCMPageListRead(pVMMDevState->pDevIns, pcBuf, size, pPageListInfo);
+                                 rc = vmmdevHGCMPageListRead(pThis->pDevIns, pcBuf, size, pPageListInfo);
                              }
                              else
@@ -991 +1000 @@
                              /* Don't overdo it */
                              if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_Out)
-                                 rc = PDMDevHlpPhysReadGCVirt(pVMMDevState->pDevIns, pcBuf, linearAddr, size);
+                                 rc = PDMDevHlpPhysReadGCVirt(pThis->pDevIns, pcBuf, linearAddr, size);
                              else
                                  rc = VINF_SUCCESS;
@@ -1003 +1012 @@
                                   * Do it for all linear pointers because load state will require In pointer info too.
                                   */
-                                 rc = vmmdevHGCMSaveLinPtr (pVMMDevState->pDevIns, i, linearAddr, size, iLinPtr, pCmd->paLinPtrs, &pPages);
+                                 rc = vmmdevHGCMSaveLinPtr (pThis->pDevIns, i, linearAddr, size, iLinPtr, pCmd->paLinPtrs, &pPages);
 
                                  iLinPtr++;
@@ -1053 +1062 @@
                              {
                                  /* Copy pages to the pcBuf[size]. */
-                                 rc = vmmdevHGCMPageListRead(pVMMDevState->pDevIns, pcBuf, size, pPageListInfo);
+                                 rc = vmmdevHGCMPageListRead(pThis->pDevIns, pcBuf, size, pPageListInfo);
                              }
                              else
@@ -1080 +1089 @@
     if (RT_SUCCESS (rc))
     {
-        vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMCall->header.header.size, VBOXHGCMCMDTYPE_CALL);
+        vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMCall->header.header.size, VBOXHGCMCMDTYPE_CALL);
 
         /* Pass the function call to HGCM connector for actual processing */
-        rc = pVMMDevState->pHGCMDrv->pfnCall (pVMMDevState->pHGCMDrv, pCmd, pHGCMCall->u32ClientID,
+        rc = pThis->pHGCMDrv->pfnCall (pThis->pHGCMDrv, pCmd, pHGCMCall->u32ClientID,
                                               pHGCMCall->u32Function, cParms, pCmd->paHostParms);
 
@@ -1089 +1098 @@
         {
             Log(("vmmdevHGCMCall: pfnCall failed rc = %Rrc\n", rc));
-            vmmdevHGCMRemoveCommand (pVMMDevState, pCmd);
+            vmmdevHGCMRemoveCommand (pThis, pCmd);
         }
     }
@@ -1119 +1128 @@
 
 
-static int vmmdevHGCMCallSaved (VMMDevState *pVMMDevState, VMMDevHGCMCall *pHGCMCall, RTGCPHYS GCPhys, uint32_t cbHGCMCall, bool f64Bits, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
+static int vmmdevHGCMCallSaved (VMMDevState *pThis, VMMDevHGCMCall *pHGCMCall, RTGCPHYS GCPhys, uint32_t cbHGCMCall, bool f64Bits, bool *pfHGCMCalled, VBOXHGCMCMD *pSavedCmd, VBOXHGCMCMD **ppCmd)
 {
     int rc = VINF_SUCCESS;
@@ -1275 +1284 @@
     *ppCmd = pCmd;
 
-    vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMCall->header.header.size, VBOXHGCMCMDTYPE_CALL);
+    vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, pHGCMCall->header.header.size, VBOXHGCMCMDTYPE_CALL);
 
     /* Process parameters, changing them to host context pointers for easy
@@ -1383 +1392 @@
                                          }
 
-                                         rc = PDMDevHlpPhysRead(pVMMDevState->pDevIns,
+                                         rc = PDMDevHlpPhysRead(pThis->pDevIns,
                                                                 pLinPtr->paPages[iPage] + offPage,
                                                                 pu8Dst, cbChunk);
@@ -1452 +1461 @@
                              {
                                  /* Copy pages to the pcBuf[size]. */
-                                 rc = vmmdevHGCMPageListRead(pVMMDevState->pDevIns, pu8Buf, size, pPageListInfo);
+                                 rc = vmmdevHGCMPageListRead(pThis->pDevIns, pu8Buf, size, pPageListInfo);
                              }
                              else
@@ -1563 +1572 @@
                                          }
 
-                                         rc = PDMDevHlpPhysRead(pVMMDevState->pDevIns,
+                                         rc = PDMDevHlpPhysRead(pThis->pDevIns,
                                                                 pLinPtr->paPages[iPage] + offPage,
                                                                 pu8Dst, cbChunk);
@@ -1632 +1641 @@
                              {
                                  /* Copy pages to the pcBuf[size]. */
-                                 rc = vmmdevHGCMPageListRead(pVMMDevState->pDevIns, pu8Buf, size, pPageListInfo);
+                                 rc = vmmdevHGCMPageListRead(pThis->pDevIns, pu8Buf, size, pPageListInfo);
                              }
                              else
@@ -1660 +1669 @@
     {
         /* Pass the function call to HGCM connector for actual processing */
-        rc = pVMMDevState->pHGCMDrv->pfnCall (pVMMDevState->pHGCMDrv, pCmd, pHGCMCall->u32ClientID, pHGCMCall->u32Function, cParms, pCmd->paHostParms);
+        rc = pThis->pHGCMDrv->pfnCall (pThis->pHGCMDrv, pCmd, pHGCMCall->u32ClientID, pHGCMCall->u32Function, cParms, pCmd->paHostParms);
         if (RT_SUCCESS (rc))
         {
@@ -1675 +1684 @@
  * @thread EMT
  */
-int vmmdevHGCMCancel (VMMDevState *pVMMDevState, VMMDevHGCMCancel *pHGCMCancel, RTGCPHYS GCPhys)
+int vmmdevHGCMCancel (VMMDevState *pThis, VMMDevHGCMCancel *pHGCMCancel, RTGCPHYS GCPhys)
 {
     NOREF(pHGCMCancel);
-    int rc = vmmdevHGCMCancel2(pVMMDevState, GCPhys);
+    int rc = vmmdevHGCMCancel2(pThis, GCPhys);
     return rc == VERR_NOT_FOUND ? VERR_INVALID_PARAMETER : rc;
 }
@@ -1763 +1772 @@
 DECLCALLBACK(void) hgcmCompletedWorker (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
 {
-    VMMDevState *pVMMDevState = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+    VMMDevState *pThis = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
 #ifdef VBOX_WITH_DTRACE
     uint32_t idFunction = 0;
@@ -1791 +1800 @@
      */
     VBOXDD_HGCMCALL_COMPLETED_EMT(pCmd, result);
-    vmmdevHGCMRemoveCommand (pVMMDevState, pCmd);
+    vmmdevHGCMRemoveCommand (pThis, pCmd);
 
     if (pCmd->fCancelled || pCmd->fSaved)
@@ -1831 +1840 @@
          * 3.0 blocker.)
          */
-        /** @todo s/pVMMDevState/pThis/g */
+        /** @todo s/pThis/pThis/g */
         /** @todo It would be faster if this interface would use MMIO2 memory and we
          *        didn't have to mess around with PDMDevHlpPhysRead/Write. We're
          *        reading the header 3 times now and writing the request back twice. */
 
-        PDMCritSectEnter(&pVMMDevState->CritSect, VERR_SEM_BUSY);
-        PDMCritSectLeave(&pVMMDevState->CritSect);
-
-        PDMDevHlpPhysRead(pVMMDevState->pDevIns, pCmd->GCPhys, pHeader, pCmd->cbSize);
+        PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+        PDMCritSectLeave(&pThis->CritSect);
+
+        PDMDevHlpPhysRead(pThis->pDevIns, pCmd->GCPhys, pHeader, pCmd->cbSize);
 
         /* Setup return codes. */
@@ -1893 +1902 @@
                                 {
                                     /* Use the saved page list to write data back to the guest RAM. */
-                                    rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr,
+                                    rc = vmmdevHGCMWriteLinPtr (pThis->pDevIns, i, pHostParm->u.pointer.addr,
                                                                 size, iLinPtr, pCmd->paLinPtrs);
                                     AssertReleaseRC(rc);
@@ -1934 +1943 @@
                                 {
                                     /* Copy pHostParm->u.pointer.addr[pHostParm->u.pointer.size] to pages. */
-                                    rc = vmmdevHGCMPageListWrite(pVMMDevState->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
+                                    rc = vmmdevHGCMPageListWrite(pThis->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
                                 }
                                 else
@@ -1996 +2005 @@
                                 {
                                     /* Use the saved page list to write data back to the guest RAM. */
-                                    rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
+                                    rc = vmmdevHGCMWriteLinPtr (pThis->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
                                     AssertReleaseRC(rc);
                                 }
@@ -2036 +2045 @@
                                 {
                                     /* Copy pHostParm->u.pointer.addr[pHostParm->u.pointer.size] to pages. */
-                                    rc = vmmdevHGCMPageListWrite(pVMMDevState->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
+                                    rc = vmmdevHGCMPageListWrite(pThis->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
                                 }
                                 else
@@ -2098 +2107 @@
                                 {
                                     /* Use the saved page list to write data back to the guest RAM. */
-                                    rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
+                                    rc = vmmdevHGCMWriteLinPtr (pThis->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
                                     AssertReleaseRC(rc);
                                 }
@@ -2138 +2147 @@
                                 {
                                     /* Copy pHostParm->u.pointer.addr[pHostParm->u.pointer.size] to pages. */
-                                    rc = vmmdevHGCMPageListWrite(pVMMDevState->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
+                                    rc = vmmdevHGCMPageListWrite(pThis->pDevIns, pPageListInfo, pHostParm->u.pointer.addr, size);
                                 }
                                 else
@@ -2186 +2195 @@
 
         /* Write back the request */
-        PDMDevHlpPhysWrite(pVMMDevState->pDevIns, pCmd->GCPhys, pHeader, pCmd->cbSize);
+        PDMDevHlpPhysWrite(pThis->pDevIns, pCmd->GCPhys, pHeader, pCmd->cbSize);
 
         /* Now, when the command was removed from the internal list, notify the guest. */
-        VMMDevNotifyGuest (pVMMDevState, VMMDEV_EVENT_HGCM);
+        VMMDevNotifyGuest (pThis, VMMDEV_EVENT_HGCM);
 
         if ((uint8_t *)pHeader != &au8Prealloc[0])
@@ -2212 +2221 @@
 DECLCALLBACK(void) hgcmCompleted (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
 {
-    VMMDevState *pVMMDevState = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+    VMMDevState *pThis = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
 
     VBOXDD_HGCMCALL_COMPLETED_REQ(pCmd, result);
@@ -2219 +2228 @@
  *        efficient...? */
     /* Not safe to execute asynchronously; forward to EMT */
-    int rc = VMR3ReqCallVoidNoWait(PDMDevHlpGetVM(pVMMDevState->pDevIns), VMCPUID_ANY,
+    int rc = VMR3ReqCallVoidNoWait(PDMDevHlpGetVM(pThis->pDevIns), VMCPUID_ANY,
                                    (PFNRT)hgcmCompletedWorker, 3, pInterface, result, pCmd);
     AssertRC(rc);
@@ -2225 +2234 @@
 
 /* @thread EMT */
-int vmmdevHGCMSaveState(VMMDevState *pVMMDevState, PSSMHANDLE pSSM)
+int vmmdevHGCMSaveState(VMMDevState *pThis, PSSMHANDLE pSSM)
 {
     /* Save information about pending requests.
@@ -2237 +2246 @@
     uint32_t cCmds = 0;
 
-    PVBOXHGCMCMD pIter = pVMMDevState->pHGCMCmdList;
+    PVBOXHGCMCMD pIter = pThis->pHGCMCmdList;
 
     while (pIter)
@@ -2254 +2263 @@
     if (cCmds > 0)
     {
-        pIter = pVMMDevState->pHGCMCmdList;
+        pIter = pThis->pHGCMCmdList;
 
         while (pIter)
@@ -2331 +2340 @@
              */
             pIter->fSaved = true;
-            vmmdevHGCMRemoveCommand (pVMMDevState, pIter);
+            vmmdevHGCMRemoveCommand (pThis, pIter);
 
             pIter = pNext;
@@ -2345 +2354 @@
 
 /** @thread EMT(0) */
-int vmmdevHGCMLoadState(VMMDevState *pVMMDevState, PSSMHANDLE pSSM, uint32_t uVersion)
+int vmmdevHGCMLoadState(VMMDevState *pThis, PSSMHANDLE pSSM, uint32_t uVersion)
 {
     int rc = VINF_SUCCESS;
@@ -2379 +2388 @@
             pCmd->enmCmdType = VBOXHGCMCMDTYPE_LOADSTATE; /* This marks the "old" saved command. */
 
-            vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, cbSize, VBOXHGCMCMDTYPE_LOADSTATE);
+            vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, cbSize, VBOXHGCMCMDTYPE_LOADSTATE);
         }
     }
@@ -2501 +2510 @@
             AssertRCReturn(rc, rc);
 
-            vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, cbSize, VBOXHGCMCMDTYPE_LOADSTATE);
+            vmmdevHGCMAddCommand (pThis, pCmd, GCPhys, cbSize, VBOXHGCMCMDTYPE_LOADSTATE);
         }
 
@@ -2513 +2522 @@
 
 /* @thread EMT */
-int vmmdevHGCMLoadStateDone(VMMDevState *pVMMDevState, PSSMHANDLE pSSM)
+int vmmdevHGCMLoadStateDone(VMMDevState *pThis, PSSMHANDLE pSSM)
 {
     LogFlowFunc(("\n"));
 
     /* Reissue pending requests. */
-    PPDMDEVINS pDevIns = pVMMDevState->pDevIns;
-
-    int rc = vmmdevHGCMCmdListLock (pVMMDevState);
+    PPDMDEVINS pDevIns = pThis->pDevIns;
+
+    int rc = vmmdevHGCMCmdListLock (pThis);
 
     if (RT_SUCCESS (rc))
@@ -2534 +2543 @@
          *       New commands will be inserted to the list.
          */
-        PVBOXHGCMCMD pIter = pVMMDevState->pHGCMCmdList;
-
-        pVMMDevState->pHGCMCmdList = NULL; /* Reset the list. Saved commands will be processed and deallocated. */
+        PVBOXHGCMCMD pIter = pThis->pHGCMCmdList;
+
+        pThis->pHGCMCmdList = NULL; /* Reset the list. Saved commands will be processed and deallocated. */
 
         while (pIter)
@@ -2584 +2593 @@
                                 requestHeader->header.rc = VERR_INVALID_PARAMETER;
                             }
-                            else if (!pVMMDevState->pHGCMDrv)
+                            else if (!pThis->pHGCMDrv)
                             {
                                 Log(("VMMDevReq_HGCMConnect HGCM Connector is NULL!\n"));
@@ -2595 +2604 @@
                                 Log(("VMMDevReq_HGCMConnect\n"));
 
-                                requestHeader->header.rc = vmmdevHGCMConnectSaved (pVMMDevState, pHGCMConnect, pIter->GCPhys, &fHGCMCalled, pIter, &pCmd);
+                                requestHeader->header.rc = vmmdevHGCMConnectSaved (pThis, pHGCMConnect, pIter->GCPhys, &fHGCMCalled, pIter, &pCmd);
                             }
                             break;
@@ -2607 +2616 @@
                                 requestHeader->header.rc = VERR_INVALID_PARAMETER;
                             }
-                            else if (!pVMMDevState->pHGCMDrv)
+                            else if (!pThis->pHGCMDrv)
                             {
                                 Log(("VMMDevReq_HGCMDisconnect HGCM Connector is NULL!\n"));
@@ -2617 +2626 @@
 
                                 Log(("VMMDevReq_VMMDevHGCMDisconnect\n"));
-                                requestHeader->header.rc = vmmdevHGCMDisconnectSaved (pVMMDevState, pHGCMDisconnect, pIter->GCPhys, &fHGCMCalled, pIter, &pCmd);
+                                requestHeader->header.rc = vmmdevHGCMDisconnectSaved (pThis, pHGCMDisconnect, pIter->GCPhys, &fHGCMCalled, pIter, &pCmd);
                             }
                             break;
@@ -2629 +2638 @@
                                 requestHeader->header.rc = VERR_INVALID_PARAMETER;
                             }
-                            else if (!pVMMDevState->pHGCMDrv)
+                            else if (!pThis->pHGCMDrv)
                             {
                                 Log(("VMMDevReq_HGCMCall HGCM Connector is NULL!\n"));
@@ -2647 +2656 @@
                                 bool f64Bits = false;
 #endif /* VBOX_WITH_64_BITS_GUESTS */
-                                requestHeader->header.rc = vmmdevHGCMCallSaved (pVMMDevState, pHGCMCall, pIter->GCPhys, requestHeader->header.size, f64Bits, &fHGCMCalled, pIter, &pCmd);
+                                requestHeader->header.rc = vmmdevHGCMCallSaved (pThis, pHGCMCall, pIter->GCPhys, requestHeader->header.size, f64Bits, &fHGCMCalled, pIter, &pCmd);
                             }
                             break;
@@ -2663 +2672 @@
                                         requestHeader->header.rc = VERR_INVALID_PARAMETER;
                                     }
-                                    else if (!pVMMDevState->pHGCMDrv)
+                                    else if (!pThis->pHGCMDrv)
                                     {
                                         Log(("VMMDevReq_HGCMConnect HGCM Connector is NULL!\n"));
@@ -2674 +2683 @@
                                         Log(("VMMDevReq_HGCMConnect\n"));
 
-                                        requestHeader->header.rc = vmmdevHGCMConnect (pVMMDevState, pHGCMConnect, pIter->GCPhys);
+                                        requestHeader->header.rc = vmmdevHGCMConnect (pThis, pHGCMConnect, pIter->GCPhys);
                                     }
                                     break;
@@ -2686 +2695 @@
                                         requestHeader->header.rc = VERR_INVALID_PARAMETER;
                                     }
-                                    else if (!pVMMDevState->pHGCMDrv)
+                                    else if (!pThis->pHGCMDrv)
                                     {
                                         Log(("VMMDevReq_HGCMDisconnect HGCM Connector is NULL!\n"));
@@ -2696 +2705 @@
 
                                         Log(("VMMDevReq_VMMDevHGCMDisconnect\n"));
-                                        requestHeader->header.rc = vmmdevHGCMDisconnect (pVMMDevState, pHGCMDisconnect, pIter->GCPhys);
+                                        requestHeader->header.rc = vmmdevHGCMDisconnect (pThis, pHGCMDisconnect, pIter->GCPhys);
                                     }
                                     break;
@@ -2713 +2722 @@
                                         requestHeader->header.rc = VERR_INVALID_PARAMETER;
                                     }
-                                    else if (!pVMMDevState->pHGCMDrv)
+                                    else if (!pThis->pHGCMDrv)
                                     {
                                         Log(("VMMDevReq_HGCMCall HGCM Connector is NULL!\n"));
@@ -2731 +2740 @@
                                         bool f64Bits = false;
 #endif /* VBOX_WITH_64_BITS_GUESTS */
-                                        requestHeader->header.rc = vmmdevHGCMCall (pVMMDevState, pHGCMCall, requestHeader->header.size, pIter->GCPhys, f64Bits);
+                                        requestHeader->header.rc = vmmdevHGCMCall (pThis, pHGCMCall, requestHeader->header.size, pIter->GCPhys, f64Bits);
                                     }
                                     break;
@@ -2776 +2785 @@
                    if (pCmd)
                    {
-                       vmmdevHGCMRemoveCommand (pVMMDevState, pCmd);
+                       vmmdevHGCMRemoveCommand (pThis, pCmd);
 
                        if (pCmd->paLinPtrs != NULL)
@@ -2787 +2796 @@
                    }
 
-                   VMMDevNotifyGuest (pVMMDevState, VMMDEV_EVENT_HGCM);
+                   VMMDevNotifyGuest (pThis, VMMDEV_EVENT_HGCM);
                 }
             }
@@ -2802 +2811 @@
         }
 
-        vmmdevHGCMCmdListUnlock (pVMMDevState);
+        vmmdevHGCMCmdListUnlock (pThis);
     }