Changeset 17669 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Mar 11, 2009 9:56:29 AM (16 years ago)

Author:

vboxsync

Message:

Main: Rework storage controller handling to allow an arbitrary number of different storage controllers and remove code duplication:

• XML format changed
• New StorageController class
• Removed SATAController (obsolete)
• Removed the IDE controller code from BIOSSettings, handled in StorageController now

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3310 +3310 @@
 
 /**
+ *  Called by IInternalSessionControl::OnStorageControllerChange().
+ *
+ *  @note Locks this object for writing.
+ */
+HRESULT Console::onStorageControllerChange ()
+{
+    LogFlowThisFunc (("\n"));
+
+    AutoCaller autoCaller (this);
+    AssertComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    /* Don't do anything if the VM isn't running */
+    if (!mpVM)
+        return S_OK;
+
+    HRESULT rc = S_OK;
+
+    /* protect mpVM */
+    AutoVMCaller autoVMCaller (this);
+    CheckComRCReturnRC (autoVMCaller.rc());
+
+    /* nothing to do so far */
+
+    /* notify console callbacks on success */
+    if (SUCCEEDED (rc))
+    {
+        CallbackList::iterator it = mCallbacks.begin();
+        while (it != mCallbacks.end())
+            (*it++)->OnStorageControllerChange ();
+    }
+
+    LogFlowThisFunc (("Leaving rc=%#x\n", rc));
+    return rc;
+}
+
+/**
  *  Called by IInternalSessionControl::OnVRDPServerChange().
  *
@@ -6544 +6582 @@
  *  Reconfigures a VDI.
  *
- *  @param   pVM     The VM handle.
- *  @param   hda     The harddisk attachment.
- *  @param   phrc    Where to store com error - only valid if we return VERR_GENERAL_FAILURE.
+ *  @param   pVM           The VM handle.
+ *  @param   lInstance     The instance of the controller.
+ *  @param   enmController The type of the controller.
+ *  @param   hda           The harddisk attachment.
+ *  @param   phrc          Where to store com error - only valid if we return VERR_GENERAL_FAILURE.
  *  @return  VBox status code.
  */
-static DECLCALLBACK(int) reconfigureHardDisks(PVM pVM, IHardDiskAttachment *hda,
+static DECLCALLBACK(int) reconfigureHardDisks(PVM pVM, ULONG lInstance,
+                                              StorageControllerType_T enmController,
+                                              IHardDiskAttachment *hda,
                                               HRESULT *phrc)
 {
@@ -6566 +6608 @@
     ComPtr<IHardDisk> hardDisk;
     hrc = hda->COMGETTER(HardDisk)(hardDisk.asOutParam());                      H();
-    StorageBus_T enmBus;
-    hrc = hda->COMGETTER(Bus)(&enmBus);                                         H();
     LONG lDev;
     hrc = hda->COMGETTER(Device)(&lDev);                                        H();
-    LONG lChannel;
-    hrc = hda->COMGETTER(Channel)(&lChannel);                                   H();
+    LONG lPort;
+    hrc = hda->COMGETTER(Port)(&lPort);                                         H();
 
     int         iLUN;
     const char *pcszDevice = NULL;
-
-    switch (enmBus)
-    {
-        case StorageBus_IDE:
-        {
-            if (lChannel >= 2 || lChannel < 0)
+    bool        fSCSI = false;
+
+    switch (enmController)
+    {
+        case StorageControllerType_PIIX3:
+        case StorageControllerType_PIIX4:
+        case StorageControllerType_ICH6:
+        {
+            if (lPort >= 2 || lPort < 0)
             {
-                AssertMsgFailed(("invalid controller channel number: %d\n", lChannel));
+                AssertMsgFailed(("invalid controller channel number: %d\n", lPort));
                 return VERR_GENERAL_FAILURE;
             }
@@ -6592 +6635 @@
             }
 
-            iLUN = 2*lChannel + lDev;
+            iLUN = 2*lPort + lDev;
             pcszDevice = "piix3ide";
             break;
         }
-        case StorageBus_SATA:
-        {
-            iLUN = lChannel;
+        case StorageControllerType_IntelAhci:
+        {
+            iLUN = lPort;
             pcszDevice = "ahci";
             break;
         }
+        case StorageControllerType_BusLogic:
+        {
+            iLUN = lPort;
+            pcszDevice = "buslogic";
+            fSCSI = true;
+            break;
+        }
+        case StorageControllerType_LsiLogic:
+        {
+            iLUN = lPort;
+            pcszDevice = "lsilogicscsi";
+            fSCSI = true;
+            break;
+        }
         default:
         {
-            AssertMsgFailed(("invalid disk controller type: %d\n", enmBus));
+            AssertMsgFailed(("invalid disk controller type: %d\n", enmController));
             return VERR_GENERAL_FAILURE;
         }
@@ -6620 +6677 @@
     PCFGMNODE pLunL2;
 
-    pLunL1 = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/0/LUN#%d/AttachedDriver/", pcszDevice, iLUN);
+    /* SCSI has an extra driver between the device and the block driver. */
+    if (fSCSI)
+        pLunL1 = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/%u/LUN#%d/AttachedDriver/AttachedDriver/", pcszDevice, lInstance, iLUN);
+    else
+        pLunL1 = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/%u/LUN#%d/AttachedDriver/", pcszDevice, lInstance, iLUN);
 
     if (!pLunL1)
     {
-        PCFGMNODE pInst = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/0/", pcszDevice);
+        PCFGMNODE pInst = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/%u/", pcszDevice, lInstance);
         AssertReturn(pInst, VERR_INTERNAL_ERROR);
 
         PCFGMNODE pLunL0;
         rc = CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%d", iLUN);                     RC_CHECK();
+
+        if (fSCSI)
+        {
+            rc = CFGMR3InsertString(pLunL0, "Driver",              "SCSI");             RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
+
+            rc = CFGMR3InsertNode(pLunL0,   "AttachedDriver", &pLunL0);                 RC_CHECK();
+        }
+
         rc = CFGMR3InsertString(pLunL0, "Driver",              "Block");            RC_CHECK();
         rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
@@ -6859 +6929 @@
             {
                 PVMREQ pReq;
+                ComPtr<IStorageController> controller;
+                BSTR controllerName;
+                ULONG lInstance;
+                StorageControllerType_T enmController;
+
+                /*
+                 * We can't pass a storage controller object directly
+                 * (g++ complains about not being able to pass non POD types through '...')
+                 * so we have to query needed values here and pass them.
+                 */
+                rc = atts[i]->COMGETTER(Controller)(&controllerName);
+                if (FAILED (rc))
+                    break;
+
+                rc = that->mMachine->GetStorageControllerByName(controllerName, controller.asOutParam());
+                if (FAILED (rc))
+                    break;
+
+                rc = controller->COMGETTER(ControllerType)(&enmController);
+                rc = controller->COMGETTER(Instance)(&lInstance);
                 /*
                  *  don't leave the lock since reconfigureHardDisks isn't going
@@ -6864 +6954 @@
                  */
                 int vrc = VMR3ReqCall (that->mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
-                                       (PFNRT)reconfigureHardDisks, 3, that->mpVM,
-                                       atts [i], &rc);
+                                       (PFNRT)reconfigureHardDisks, 5, that->mpVM, lInstance,
+                                       enmController, atts [i], &rc);
                 if (VBOX_SUCCESS (rc))
                     rc = pReq->iStatus;