Changeset 91942 in vbox for trunk/src

Timestamp:

Oct 21, 2021 12:59:54 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics/HGSMIHost: Eliminate usage of VMMGetCpu(), bugref:10074

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA_VBVA.cpp (modified) (1 diff)
• HGSMI/HGSMIHost.cpp (modified) (8 diffs)
• HGSMI/HGSMIHost.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2828 +2828 @@
 int VBVAInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)
 {
-    PVM pVM = PDMDevHlpGetVM(pDevIns);
-
     int rc = HGSMICreate(&pThisCC->pHGSMI,
-                         pVM,
+                         pDevIns,
                          "VBVA",
                          0,

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -162 +162 @@
 typedef struct HGSMIINSTANCE
 {
-    PVM pVM;                           /**< The VM. */
+    PPDMDEVINS  pDevIns;               /**< The device instance. */
 
     const char *pszName;               /**< A name for the instance. Mostyl used in the log. */
@@ -328 +328 @@
     AssertPtr(pIns);
 
-    Assert(VMMGetCpu(pIns->pVM) != NULL);
+    Assert(PDMDevHlpGetVMCPU(pIns->pDevIns) != NULL);
 
 #ifndef VBOX_WITH_WDDM
@@ -345 +345 @@
 static bool hgsmiProcessHostCmdCompletion(HGSMIINSTANCE *pIns, HGSMIOFFSET offBuffer, bool fCompleteFirst)
 {
-    Assert(VMMGetCpu(pIns->pVM) != NULL);
+    Assert(PDMDevHlpGetVMCPU(pIns->pDevIns) != NULL);
 
     int rc = hgsmiFIFOLock(pIns);
@@ -415 +415 @@
     LogFlowFunc(("pIns %p\n", pIns));
 
-    Assert(VMMGetCpu(pIns->pVM) != NULL);
+    Assert(PDMDevHlpGetVMCPU(pIns->pDevIns) != NULL);
 
     AssertPtrReturn(pIns->pHGFlags, HGSMIOFFSET_VOID);
@@ -1514 +1514 @@
 
 int HGSMICreate(PHGSMIINSTANCE *ppIns,
-                PVM             pVM,
+                PPDMDEVINS      pDevIns,
                 const char     *pszName,
                 HGSMIOFFSET     offBase,
@@ -1523 +1523 @@
                 size_t          cbContext)
 {
-    LogFlowFunc(("ppIns = %p, pVM = %p, pszName = [%s], offBase = 0x%08X, pu8MemBase = %p, cbMem = 0x%08X, "
+    LogFlowFunc(("ppIns = %p, pDevIns = %p, pszName = [%s], offBase = 0x%08X, pu8MemBase = %p, cbMem = 0x%08X, "
                  "pfnNotifyGuest = %p, pvNotifyGuest = %p, cbContext = %d\n",
                  ppIns,
-                 pVM,
+                 pDevIns,
                  pszName,
                  offBase,
@@ -1537 +1537 @@
 
     AssertPtrReturn(ppIns, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pVM, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pDevIns, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pu8MemBase, VERR_INVALID_PARAMETER);
 
@@ -1553 +1553 @@
         if (RT_SUCCESS (rc))
         {
-            pIns->pVM            = pVM;
+            pIns->pDevIns        = pDevIns;
             pIns->pszName        = RT_VALID_PTR(pszName) ? pszName : "";
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -38 +38 @@
 
 int   HGSMICreate(PHGSMIINSTANCE *ppIns,
-                  PVM             pVM,
+                  PPDMDEVINS      pDevIns,
                   const char     *pszName,
                   HGSMIOFFSET     offBase,