Changeset 89952 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jun 29, 2021 1:36:53 PM (4 years ago)

Author:

vboxsync

Message:

Main/{VMMDevInterface,ConsoleImpl): Drop passing pointers through CFGM in favor of using VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (1 diff)
• VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -10742 +10742 @@
     }
 
+    if (UuidCopy == VMMDEV_OID)
+        return pConsole->m_pVMMDev;
+
     if (UuidCopy == COM_IIDOF(ISnapshot))
         return ((MYVMM2USERMETHODS *)pThis)->pISnapshot;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2958 +2958 @@
         InsertConfigString(pLunL0, "Driver",               "HGCM");
         InsertConfigNode(pLunL0,   "Config", &pCfg);
-        InsertConfigInteger(pCfg,  "Object", (uintptr_t)pVMMDev);
 
         /*

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -1055 +1055 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, ""))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -1107 +1107 @@
      * Get the Console object pointer and update the mpDrv member.
      */
-    void *pv;
-    int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc));
-        return rc;
-    }
-
-    pThis->pVMMDev = (VMMDev*)pv;        /** @todo Check this cast! */
+    com::Guid uuid(VMMDEV_OID);
+    pThis->pVMMDev = (VMMDev*)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    if (!pThis->pVMMDev)
+    {
+        AssertMsgFailed(("Configuration error: No/bad VMMDev object!\n"));
+        return VERR_NOT_FOUND;
+    }
     pThis->pVMMDev->mpDrv = pThis;
 
+    int rc = VINF_SUCCESS;
 #ifdef VBOX_WITH_HGCM
     /*