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

Timestamp:

Feb 19, 2022 3:49:11 PM (3 years ago)

Author:

vboxsync

Message:

Main/Console: remove statements that write pointers for led set, console, and medium attachments from the console subsystem, completing more, but not all remaining similar pointer removal requested in bugref:10053

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (5 diffs)
• ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -10879 +10879 @@
 
 /**
+ * Internal function to get LED set off of Console instance
+ *
+ * @returns pointer to PDMLED object
+ *
+ * @param   pDevIns     The device insatnce data.
+ */
+PPDMLED *
+Console::i_getLedSet(uint32_t iLedSet)
+{
+    AssertReturn(iLedSet < RT_ELEMENTS(maLedSets), NULL);
+    return maLedSets[iLedSet].papLeds;
+}
+
+/**
  * @interface_method_impl{VMM2USERMETHODS,pfnQueryGenericObject}
  */
@@ -11191 +11205 @@
     LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
 
+    com::Guid uuid(COM_IIDOF(IConsole));
+    IConsole *pIConsole = (IConsole *)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    Console *pConsole = static_cast<Console *>(pIConsole);
+
     /*
      * Validate configuration.
      */
     PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns,
-                                  "papLeds|"
-                                  "pmapMediumAttachments|"
                                   "DeviceInstance|"
-                                  "pConsole|"
+                                  "iLedSet|"
+                                  "HasMediumAttachments|"
                                   "First|"
                                   "Last",
@@ -11205 +11222 @@
                     ("Configuration error: Not possible to attach anything to this driver!\n"),
                     VERR_PDM_DRVINS_NO_ATTACH);
+
+    PCPDMDRVHLPR3 const pHlp = pDrvIns->pHlpR3;
+
+    uint32_t iLedSet;
+    int rc = pHlp->pfnCFGMQueryU32Def(pCfg, "iLedSet", &iLedSet, 0);
+    AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"iLedSet\" value! rc=%Rrc\n", rc), rc);
 
     /*
@@ -11213 +11236 @@
     pThis->IMediaNotify.pfnEjected          = Console::i_drvStatus_MediumEjected;
     pThis->pDrvIns                          = pDrvIns;
+    pThis->pConsole                         = pConsole;
+    pThis->pmapMediumAttachments            = &pConsole->mapMediumAttachments;
+    pThis->papLeds                          = pConsole->i_getLedSet(iLedSet);
     pThis->pszDeviceInstance                = NULL;
 
@@ -11218 +11244 @@
      * Read config.
      */
-    PCPDMDRVHLPR3 const pHlp = pDrvIns->pHlpR3;
-    int rc = pHlp->pfnCFGMQueryPtr(pCfg, "papLeds", (void **)&pThis->papLeds);
-    AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"papLeds\" value! rc=%Rrc\n", rc), rc);
-
-    rc = pHlp->pfnCFGMQueryPtrDef(pCfg, "pmapMediumAttachments", (void **)&pThis->pmapMediumAttachments, NULL);
-    AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"pmapMediumAttachments\" value! rc=%Rrc\n", rc), rc);
-    if (pThis->pmapMediumAttachments)
+    uint32_t fHasMediumAttachments;
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "HasMediumAttachments", &fHasMediumAttachments, 0);
+    AssertLogRelMsgRCReturn(RT_SUCCESS(rc) || rc == VERR_CFGM_VALUE_NOT_FOUND,
+         ("Configuration error: Failed to query the \"HasMediumAttachments\" value! rc=%Rrc\n", rc), rc);
+
+    if (fHasMediumAttachments)
     {
         rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "DeviceInstance", &pThis->pszDeviceInstance);
         AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"DeviceInstance\" value! rc=%Rrc\n", rc), rc);
-        rc = pHlp->pfnCFGMQueryPtr(pCfg, "pConsole", (void **)&pThis->pConsole);
-        AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"pConsole\" value! rc=%Rrc\n", rc), rc);
-    }
-
+    }
     rc = pHlp->pfnCFGMQueryU32Def(pCfg, "First", &pThis->iFirstLUN, 0);
     AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"First\" value! rc=%Rrc\n", rc), rc);

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

@@ -691 +691 @@
     InsertConfigString(pLunL0,  "Driver",               "MainStatus");
     InsertConfigNode(pLunL0,    "Config", &pCfg);
-    PLEDSET pLS = i_allocateDriverLeds(uLast - uFirst + 1, enmType, ppaSubTypes);
-    InsertConfigInteger(pCfg,   "papLeds", (uintptr_t)pLS->papLeds);
+    InsertConfigInteger(pCfg,   "iLedSet", mcLedSets);
+    (void) i_allocateDriverLeds(uLast - uFirst + 1, enmType, ppaSubTypes);
+
     if (pmapMediumAttachments)
     {
-        InsertConfigInteger(pCfg,   "pmapMediumAttachments", (uintptr_t)pmapMediumAttachments);
-        InsertConfigInteger(pCfg,   "pConsole", (uintptr_t)this);
+        InsertConfigInteger(pCfg,   "HasMediumAttachments", 1);
         AssertPtr(pcszDevice);
         Utf8Str deviceInstance = Utf8StrFmt("%s/%u", pcszDevice, uInstance);
@@ -1464 +1464 @@
          * Bandwidth groups.
          */
+        PCFGMNODE pAc;
+        PCFGMNODE pAcFile;
+        PCFGMNODE pAcFileBwGroups;
         ComPtr<IBandwidthControl> bwCtrl;
+        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
+
         hrc = pMachine->COMGETTER(BandwidthControl)(bwCtrl.asOutParam());                   H();
 
-        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
         hrc = bwCtrl->GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups));              H();
 
-        PCFGMNODE pAc;
         InsertConfigNode(pPDM, "AsyncCompletion", &pAc);
-        PCFGMNODE pAcFile;
         InsertConfigNode(pAc,  "File", &pAcFile);
-        PCFGMNODE pAcFileBwGroups;
         InsertConfigNode(pAcFile,  "BwGroups", &pAcFileBwGroups);
 #ifdef VBOX_WITH_NETSHAPER
         PCFGMNODE pNetworkShaper;
+        PCFGMNODE pNetworkBwGroups;
+
         InsertConfigNode(pPDM, "NetworkShaper",  &pNetworkShaper);
-        PCFGMNODE pNetworkBwGroups;
         InsertConfigNode(pNetworkShaper, "BwGroups", &pNetworkBwGroups);
 #endif /* VBOX_WITH_NETSHAPER */
@@ -1486 +1488 @@
         {
             Bstr strName;
+            LONG64 cMaxBytesPerSec;
+            BandwidthGroupType_T enmType;
+
             hrc = bwGroups[i]->COMGETTER(Name)(strName.asOutParam());                       H();
+            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
+            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
+
             if (strName.isEmpty())
                 return pVMM->pfnVMR3SetError(pUVM, VERR_CFGM_NO_NODE, RT_SRC_POS, N_("No bandwidth group name specified"));
-            BandwidthGroupType_T enmType = BandwidthGroupType_Null;
-            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
-            LONG64 cMaxBytesPerSec = 0;
-            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
 
             if (enmType == BandwidthGroupType_Disk)