Changeset 24250 in vbox

Timestamp:

Nov 2, 2009 1:00:58 PM (15 years ago)

Author:

vboxsync

Message:

StorageController: added support for Instance number

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)
• src/VBox/Main/StorageControllerImpl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (3 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/include/StorageControllerImpl.h (modified) (5 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -477 +477 @@
           controllerType(StorageControllerType_PIIX3),
           ulPortCount(2),
+          ulInstance(0),
           lIDE0MasterEmulationPort(0),
           lIDE0SlaveEmulationPort(0),
@@ -487 +488 @@
     StorageControllerType_T controllerType;
     uint32_t            ulPortCount;
+    uint32_t            ulInstance;
 
     // only for when controllerType == StorageControllerType_IntelAhci:

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] = {};
     hrc = pMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls));   H();
 
@@ -775 +776 @@
         bool                    fSCSI = false;
         Bstr                    controllerName;
+        ULONG                   ulInstance;
 
         rc = ctrls[i]->COMGETTER(ControllerType)(&enmCtrlType);                     H();
         rc = ctrls[i]->COMGETTER(Bus)(&enmBus);                                     H();
         rc = ctrls[i]->COMGETTER(Name)(controllerName.asOutParam());                H();
+        rc = ctrls[i]->COMGETTER(Instance)(&ulInstance);                            H();
 
         const char *pszCtrlDev = pConsole->controllerTypeToDev(enmCtrlType);
 
-        rc = CFGMR3InsertNode(pDevices, pszCtrlDev, &pDev);                         RC_CHECK();
-        /** @todo support multiple instances of a controller */
-        rc = CFGMR3InsertNode(pDev,     "0", &pCtlInst);                            RC_CHECK();
+        if (!afNodePresent[enmCtrlType])
+        {
+            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();
+        }
+        rc = CFGMR3InsertNodeF(pDev, &pCtlInst, "%u", ulInstance);                  RC_CHECK();
 
         switch (enmCtrlType)
@@ -924 +936 @@
                 AssertMsgFailedReturn(("invalid storage controller type: %d\n", enmCtrlType), VERR_GENERAL_FAILURE);
         }
-
-        /* At the moment we only support one controller per type. So the instance id is always 0. */
-        rc = ctrls[i]->COMSETTER(Instance)(0);                                  H();
 
         /* Attach the hard disks. */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3593 +3593 @@
 
     ctrl.createObject();
-    rc = ctrl->init (this, aName, aConnectionType);
+
+    /* get a new instance number for the storage controller */
+    ULONG ulInstance = 0;
+    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+         it != mStorageControllers->end();
+         ++it)
+    {
+        if ((*it)->storageBus() == aConnectionType)
+        {
+            ULONG ulCurInst = (*it)->instance();
+
+            if (ulCurInst > ulInstance)
+                ulInstance = ulCurInst;
+        }
+    }
+    ulInstance++;
+
+    rc = ctrl->init(this, aName, aConnectionType, ulInstance);
     CheckComRCReturnRC(rc);
 
@@ -3625 +3642 @@
 
     return rc;
+}
+
+STDMETHODIMP Machine::GetStorageControllerByInstance(ULONG aInstance,
+                                                     IStorageController **aStorageController)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+         it != mStorageControllers->end();
+         ++it)
+    {
+        if ((*it)->instance() == aInstance)
+        {
+            (*it).queryInterfaceTo(aStorageController);
+            return S_OK;
+        }
+    }
+
+    return setError(VBOX_E_OBJECT_NOT_FOUND,
+                    tr("Could not find a storage controller with instance number '%lu'"),
+                    aInstance);
 }
 
@@ -5506 +5547 @@
         rc = pCtl->init(this,
                         ctlData.strName,
-                        ctlData.storageBus);
+                        ctlData.storageBus,
+                        ctlData.ulInstance);
         CheckComRCReturnRC (rc);
 
@@ -6455 +6497 @@
         ctl.controllerType = pCtl->controllerType();
         ctl.storageBus = pCtl->storageBus();
+        ctl.ulInstance = pCtl->instance();
 
         /* Save the port count. */

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -62 +62 @@
  * @param aParent       Pointer to our parent object.
  * @param aName         Name of the storage controller.
+ * @param aInstance     Instance number of the storage controller.
  */
 HRESULT StorageController::init(Machine *aParent,
                                 const Utf8Str &aName,
-                                StorageBus_T aStorageBus)
-{
-    LogFlowThisFunc(("aParent=%p aName=\"%s\"\n", aParent, aName.raw()));
+                                StorageBus_T aStorageBus,
+                                ULONG aInstance)
+{
+    LogFlowThisFunc(("aParent=%p aName=\"%s\" aInstance=%u\n",
+                     aParent, aName.raw(), aInstance));
 
     ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);
@@ -89 +92 @@
 
     mData->strName = aName;
+    mData->mInstance = aInstance;
     mData->mStorageBus = aStorageBus;
 
@@ -501 +505 @@
     AutoReadLock alock(this);
 
-    *aInstance = mInstance;
+    *aInstance = mData->mInstance;
 
     return S_OK;
@@ -515 +519 @@
     AutoWriteLock alock(this);
 
-    mInstance = aInstance;
+    mData->mInstance = aInstance;
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4059 +4059 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="37642E74-969A-4590-BD52-390E541F904D"
+     uuid="59080235-41e1-41ca-aa28-33f6992d1646"
      wsmap="managed"
      >
@@ -4931 +4931 @@
         @a name identifies the controller for subsequent calls such as
         <link to="#getStorageControllerByName" />,
+        <link to="#getStorageControllerByInstance" />,
         <link to="#removeStorageController" />,
         <link to="#attachDevice" /> or <link to="#mountMedium" />.
@@ -4961 +4962 @@
     </method>
 
-    <method name="removeStorageController">
+    <method name="getStorageControllerByInstance" const="yes">
+      <desc>
+        Returns a storage controller with the given instance number.
+
+        <result name="VBOX_E_OBJECT_NOT_FOUND">
+          A storage controller with given instance number doesn't exist.
+        </result>
+      </desc>
+      <param name="instance" type="unsigned long" dir="in"/>
+      <param name="storageController" type="IStorageController" dir="return"/>
+    </method>
+
+   <method name="removeStorageController">
       <desc>
         Removes a storage controller from the machine.

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);

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

@@ -617 +617 @@
     STDMETHOD(RemoveStorageController(IN_BSTR aName));
     STDMETHOD(GetStorageControllerByName(IN_BSTR aName, IStorageController **storageController));
+    STDMETHOD(GetStorageControllerByInstance(ULONG aInstance, IStorageController **storageController));
     STDMETHOD(COMGETTER(FirmwareType)) (FirmwareType_T *aFirmware);
     STDMETHOD(COMSETTER(FirmwareType)) (FirmwareType_T  aFirmware);

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

@@ -44 +44 @@
         Data() : mStorageBus (StorageBus_IDE),
                  mStorageControllerType (StorageControllerType_PIIX4),
+                 mInstance (0),
                  mPortCount (2),
                  mPortIde0Master (0),
@@ -68 +69 @@
         /** Type of the Storage controller. */
         StorageControllerType_T mStorageControllerType;
+        /** Instance number of the storage controller. */
+        ULONG mInstance;
         /** Number of usable ports. */
         ULONG mPortCount;
@@ -104 +107 @@
     HRESULT init(Machine *aParent,
                  const Utf8Str &aName,
-                 StorageBus_T aBus);
+                 StorageBus_T aBus,
+                 ULONG aInstance);
     HRESULT init(Machine *aParent,
                  StorageController *aThat,
@@ -134 +138 @@
     StorageControllerType_T controllerType() const { return mData->mStorageControllerType; }
     StorageBus_T storageBus() const { return mData->mStorageBus; }
+    ULONG instance() const { return mData->mInstance; }
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }
@@ -164 +169 @@
     /** Data. */
     Backupable<Data> mData;
-
-    /* Instance number of the device in the running VM. */
-    ULONG mInstance;
 };
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1862 +1862 @@
                 sctl.strName = "SATA Controller";
         }
+
+        if (!pelmController->getAttributeValue("Instance", sctl.ulInstance))
+            sctl.ulInstance = 0;
+
         Utf8Str strType;
         if (!pelmController->getAttributeValue("type", strType))
@@ -2735 +2739 @@
         pelmController->setAttribute("PortCount", sc.ulPortCount);
 
+        pelmController->setAttribute("Instance", sc.ulInstance);
+
         if (sc.controllerType == StorageControllerType_IntelAhci)
         {