Changeset 93858 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 20, 2022 7:47:37 AM (3 years ago)

Author:

vboxsync

Message:

Main: Restored bwGroups[i]->COMGETTER(Name)(strName.asOutParam()); accidentally removed by r150070; Corrected bogus AssertLogRelMsgRCReturn; various cleanups. bugref:10053

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -784 +784 @@
     typedef struct LEDSET *PLEDSET;
     PPDMLED *i_getLedSet(uint32_t iLedSet);
-    PLEDSET i_allocateDriverLeds(uint32_t cLeds, DeviceType_T enmType, DeviceType_T **ppSubTypes);
+    uint32_t i_allocateDriverLeds(uint32_t cLeds, DeviceType_T enmType, DeviceType_T **ppSubTypes);
     void i_attachStatusDriver(PCFGMNODE pCtlInst, DeviceType_T enmType,
                               uint32_t uFirst, uint32_t uLast,

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

@@ -4001 +4001 @@
             pVMM->pfnCFGMR3RemoveNode(pLunL0);
 
-            Utf8Str devicePath = Utf8StrFmt("%s/%u/LUN#%u", pcszDevice, uInstance, uLUN);
+            Utf8StrFmt devicePath("%s/%u/LUN#%u", pcszDevice, uInstance, uLUN);
             pThis->mapMediumAttachments.erase(devicePath);
 
@@ -11237 +11237 @@
     pThis->pDrvIns                          = pDrvIns;
     pThis->pConsole                         = pConsole;
-    pThis->pmapMediumAttachments            = &pConsole->mapMediumAttachments;
+    pThis->pmapMediumAttachments            = NULL;
     pThis->papLeds                          = pConsole->i_getLedSet(iLedSet);
     pThis->pszDeviceInstance                = NULL;
@@ -11244 +11244 @@
      * Read config.
      */
-    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);
+    bool fHasMediumAttachments;
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "HasMediumAttachments", &fHasMediumAttachments, false);
+    AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"HasMediumAttachments\" value! rc=%Rrc\n", rc), rc);
 
     if (fHasMediumAttachments)
     {
+        pThis->pmapMediumAttachments = &pConsole->mapMediumAttachments;
         rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "DeviceInstance", &pThis->pszDeviceInstance);
         AssertLogRelMsgRCReturn(rc, ("Configuration error: Failed to query the \"DeviceInstance\" value! rc=%Rrc\n", rc), rc);

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

@@ -645 +645 @@
  * This grabs a maLedSets entry and populates it with @a cLeds.
  *
- * @param  cLeds        The number of LEDs in the set.
- * @param  enmType      The device type.
- * @param  ppaSubTypes  When not NULL, subtypes for each LED and return the array pointer here.
- * @throws HRESULT or ConfigError on trouble
+ * @returns Index into maLedSets.
+ * @param   cLeds        The number of LEDs in the set.
+ * @param   enmType      The device type.
+ * @param   ppaSubTypes  When not NULL, subtypes for each LED and return the
+ *                       array pointer here.
  */
-Console::PLEDSET Console::i_allocateDriverLeds(uint32_t cLeds, DeviceType_T enmType, DeviceType_T **ppaSubTypes)
+uint32_t Console::i_allocateDriverLeds(uint32_t cLeds, DeviceType_T enmType, DeviceType_T **ppaSubTypes)
 {
     Assert(cLeds > 0);
@@ -659 +660 @@
     AssertStmt(mcLedSets < RT_ELEMENTS(maLedSets),
                throw ConfigError("AllocateDriverPapLeds", VERR_OUT_OF_RANGE, "Too many LED sets"));
-    PLEDSET pLS = &maLedSets[mcLedSets++];
+    uint32_t const idxLedSet = mcLedSets++;
+    PLEDSET pLS = &maLedSets[idxLedSet];
     pLS->papLeds = (PPDMLED *)RTMemAllocZ(sizeof(PPDMLED) * cLeds);
     AssertStmt(pLS->papLeds, throw E_OUTOFMEMORY);
@@ -674 +676 @@
     }
 
-    LogRel(("mcLedSets = %d, RT_ELEMENTS(maLedSets) = %d\n", mcLedSets, RT_ELEMENTS(maLedSets)));
-    return pLS;
+    LogRel2(("mcLedSets = %d, RT_ELEMENTS(maLedSets) = %d\n", mcLedSets, RT_ELEMENTS(maLedSets)));
+    return idxLedSet;
 }
 
@@ -687 +689 @@
 {
     Assert(uFirst <= uLast);
-    PCFGMNODE pLunL0, pCfg;
+    PCFGMNODE pLunL0;
     InsertConfigNode(pCtlInst,  "LUN#999", &pLunL0);
     InsertConfigString(pLunL0,  "Driver",               "MainStatus");
+    PCFGMNODE pCfg;
     InsertConfigNode(pLunL0,    "Config", &pCfg);
-    InsertConfigInteger(pCfg,   "iLedSet", mcLedSets);
-    (void) i_allocateDriverLeds(uLast - uFirst + 1, enmType, ppaSubTypes);
-
+    uint32_t const iLedSet = i_allocateDriverLeds(uLast - uFirst + 1, enmType, ppaSubTypes);
+    InsertConfigInteger(pCfg,   "iLedSet", iLedSet);
+
+    InsertConfigInteger(pCfg,   "HasMediumAttachments", pmapMediumAttachments != NULL);
     if (pmapMediumAttachments)
     {
-        InsertConfigInteger(pCfg,   "HasMediumAttachments", 1);
         AssertPtr(pcszDevice);
-        Utf8Str deviceInstance = Utf8StrFmt("%s/%u", pcszDevice, uInstance);
+        Utf8StrFmt deviceInstance("%s/%u", pcszDevice, uInstance);
         InsertConfigString(pCfg,    "DeviceInstance", deviceInstance.c_str());
     }
@@ -1487 +1490 @@
         {
             Bstr strName;
+            hrc = bwGroups[i]->COMGETTER(Name)(strName.asOutParam());                       H();
             if (strName.isEmpty())
                 return pVMM->pfnVMR3SetError(pUVM, VERR_CFGM_NO_NODE, RT_SRC_POS, N_("No bandwidth group name specified"));
@@ -1494 +1498 @@
             LONG64 cMaxBytesPerSec = 0;
             hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
+
             if (enmType == BandwidthGroupType_Disk)
             {
@@ -4864 +4869 @@
             *ppLunL0 = pLunL0;
 
-        Utf8Str devicePath = Utf8StrFmt("%s/%u/LUN#%u", pcszDevice, uInstance, uLUN);
+        Utf8StrFmt devicePath("%s/%u/LUN#%u", pcszDevice, uInstance, uLUN);
         mapMediumAttachments[devicePath] = pMediumAtt;