Changeset 24255 in vbox for trunk/src

Timestamp:

Nov 2, 2009 2:04:08 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl: don't need controllerDevToBool() anymore

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2655 +2655 @@
         default:
             return NULL;
-    }
-}
-
-void Console::controllerDevToBool(const char *pszCtrlDev, bool *afBool)
-{
-    if (!strcmp("lsilogicscsi", pszCtrlDev))
-    {
-        afBool[StorageControllerType_LsiLogic] = true;
-    }
-    else if (!strcmp("buslogic", pszCtrlDev))
-    {
-        afBool[StorageControllerType_BusLogic] = true;
-    }
-    else if (!strcmp("ahci", pszCtrlDev))
-    {
-        afBool[StorageControllerType_IntelAhci] = true;
-    }
-    else if (!strcmp("piix3ide", pszCtrlDev))
-    {
-        afBool[StorageControllerType_PIIX3] = true;
-        afBool[StorageControllerType_PIIX4] = true;
-        afBool[StorageControllerType_ICH6]  = true;
-    }
-    else if (!strcmp("i82078", pszCtrlDev))
-    {
-        afBool[StorageControllerType_I82078] = true;
     }
 }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -766 +766 @@
      */
     com::SafeIfaceArray<IStorageController> ctrls;
-    bool afNodePresent[StorageControllerType_I82078 + 1] = {};
+    PCFGMNODE aCtrlNodes[StorageControllerType_I82078 + 1] = {};
     hrc = pMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls));   H();
 
@@ -785 +785 @@
         const char *pszCtrlDev = pConsole->controllerTypeToDev(enmCtrlType);
 
-        if (!afNodePresent[enmCtrlType])
+        if (aCtrlNodes[enmCtrlType])
+            pDev = aCtrlNodes[enmCtrlType];
+        else
         {
             rc = CFGMR3InsertNode(pDevices, pszCtrlDev, &pDev);                     RC_CHECK();
-            pConsole->controllerDevToBool(pszCtrlDev, afNodePresent);
-        }
-        else
-        {
-            pDev = CFGMR3GetChildF(pDevices, pszCtrlDev);
-            if (!pDev)
-                rc = VERR_CFGM_CHILD_NOT_FOUND;                                     RC_CHECK();
-        }
+
+            if (   (enmCtrlType == StorageControllerType_PIIX3)
+                || (enmCtrlType == StorageControllerType_PIIX4)
+                || (enmCtrlType == StorageControllerType_ICH6))
+            {
+                aCtrlNodes[StorageControllerType_PIIX3] = pDev;
+                aCtrlNodes[StorageControllerType_PIIX4] = pDev;
+                aCtrlNodes[StorageControllerType_ICH6]  = pDev;
+            }
+            else
+                aCtrlNodes[enmCtrlType] = pDev;
+        }
+
         rc = CFGMR3InsertNodeF(pDev, &pCtlInst, "%u", ulInstance);                  RC_CHECK();
 

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

@@ -443 +443 @@
                                           const char *pszFormat, bool fPassthrough);
     const char *controllerTypeToDev(StorageControllerType_T enmCtrlType);
-    void controllerDevToBool(const char *pszCtrlDev, bool *afBool);
     HRESULT convertBusPortDeviceToLun(StorageBus_T enmBus, LONG port, LONG device, unsigned &uLun);
     HRESULT doMediumChange(IMediumAttachment *aMediumAttachment);