Changeset 94321 in vbox

Timestamp:

Mar 22, 2022 11:27:12 AM (3 years ago)

Author:

vboxsync

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

150615

Message:

Main/UsbCardReader: Drop passing pointers through CFGM in favor of using VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

Location:

trunk/src/VBox/Main

Files:

• include/UsbCardReader.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/UsbCardReader.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/UsbCardReader.h

@@ -25 +25 @@
 #include <VBox/vmm/pdmcardreaderinfs.h>
 #include <VBox/vmm/pdmdrv.h>
+
+#define USBCARDREADER_OID "46225eac-10c9-4b57-92b6-e59efd48009f"
 
 class Console;

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

@@ -10946 +10946 @@
         return pConsole->m_pVMMDev;
 
+    if (UuidCopy == USBCARDREADER_OID)
+        return pConsole->mUsbCardReader;
+
     if (UuidCopy == COM_IIDOF(ISnapshot))
         return ((MYVMM2USERMETHODS *)pThis)->pISnapshot;

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

@@ -2242 +2242 @@
                 InsertConfigString(pLunL0, "Driver", "UsbCardReader");
                 InsertConfigNode(pLunL0,   "Config", &pCfg);
-                InsertConfigInteger(pCfg,  "Object", (uintptr_t)mUsbCardReader);
 # endif
              }

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

@@ -1886 +1886 @@
     AssertMsgRCReturn(rc, ("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc), rc);
 
-    pThis->pUsbCardReader = (UsbCardReader *)pv;
+    com::Guid uuid(USBCARDREADER_OID);
+    pThis->pUsbCardReader = (UsbCardReader *)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    AssertMsgReturn(RT_VALID_PTR(pThis->pUsbCardReader), ("Configuration error: No/bad USB card reader object value!\n"), VERR_NOT_FOUND);
+
     pThis->pUsbCardReader->mpDrv = pThis;
     pThis->pDrvIns = pDrvIns;