Changeset 29087 in vbox for trunk

Timestamp:

May 5, 2010 2:20:30 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61143

Message:

Main/OVF: support LsiLogicSas controller import & export; remove obsolete ifdefs

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (5 diffs)
• ApplianceImplImport.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/ovfreader.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -174 +174 @@
 
         ComPtr<IStorageController> pIDEController;
-#ifdef VBOX_WITH_AHCI
         ComPtr<IStorageController> pSATAController;
-#endif /* VBOX_WITH_AHCI */
-#ifdef VBOX_WITH_LSILOGIC
         ComPtr<IStorageController> pSCSIController;
-#endif /* VBOX_WITH_LSILOGIC */
+        ComPtr<IStorageController> pSASController;
         for (size_t j = 0; j < nwControllers.size(); ++j)
         {
@@ -188 +185 @@
                 && pIDEController.isNull())
                 pIDEController = nwControllers[j];
-#ifdef VBOX_WITH_AHCI
             else if (   eType == StorageBus_SATA
                      && pSATAController.isNull())
                 pSATAController = nwControllers[j];
-#endif /* VBOX_WITH_AHCI */
-#ifdef VBOX_WITH_LSILOGIC
             else if (   eType == StorageBus_SCSI
                      && pSATAController.isNull())
                 pSCSIController = nwControllers[j];
-#endif /* VBOX_WITH_LSILOGIC */
+            else if (   eType == StorageBus_SAS
+                     && pSASController.isNull())
+                pSASController = nwControllers[j];
         }
 
@@ -229 +225 @@
         }
 
-#ifdef VBOX_WITH_AHCI
 //     <const name="HardDiskControllerSATA" value="7" />
         if (!pSATAController.isNull())
@@ -240 +235 @@
                                strVbox);
         }
-#endif // VBOX_WITH_AHCI
-
-#ifdef VBOX_WITH_LSILOGIC
+
 //     <const name="HardDiskControllerSCSI" value="8" />
         if (!pSCSIController.isNull())
@@ -265 +258 @@
                 throw rc;
         }
-#endif // VBOX_WITH_LSILOGIC
+
+        if (!pSASController.isNull())
+        {
+            // VirtualBox considers the SAS controller a class of its own but in OVF
+            // it should be a SCSI controller
+            Utf8Str strVbox = "LsiLogicSas";
+            lSCSIControllerIndex = (int32_t)pNewDesc->m->llDescriptions.size();
+            pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
+                               Utf8StrFmt("%d", lSCSIControllerIndex),
+                               strVbox,
+                               strVbox);
+        }
 
 //     <const name="HardDiskImage" value="9" />

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -416 +416 @@
 
                     case ovf::HardDiskController::SATA:
+                        /* Check for the constrains */
+                        if (cSATAused < 1)
                         {
-#ifdef VBOX_WITH_AHCI
-                            /* Check for the constrains */
-                            if (cSATAused < 1)
-                            {
-                                // @todo: figure out the SATA types
-                                /* We only support a plain AHCI controller, so use them always */
-                                pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSATA,
-                                                   strControllerID,
-                                                   hdc.strControllerType,
-                                                   "AHCI");
-                            }
-                            else
-                            {
-                                /* Warn only once */
-                                if (cSATAused == 1)
-                                    addWarning(tr("The virtual system \"%s\" requests support for more than one SATA controller, but VirtualBox has support for only one"),
-                                               vsysThis.strName.c_str());
-
-                            }
-                            ++cSATAused;
-                            break;
-#else /* !VBOX_WITH_AHCI */
-                            addWarning(tr("The virtual system \"%s\" requests at least one SATA controller but this version of VirtualBox does not provide a SATA controller emulation"),
-                                      vsysThis.strName.c_str());
-#endif /* !VBOX_WITH_AHCI */
+                            // @todo: figure out the SATA types
+                            /* We only support a plain AHCI controller, so use them always */
+                            pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSATA,
+                                                strControllerID,
+                                                hdc.strControllerType,
+                                                "AHCI");
                         }
+                        else
+                        {
+                            /* Warn only once */
+                            if (cSATAused == 1)
+                                addWarning(tr("The virtual system \"%s\" requests support for more than one SATA controller, but VirtualBox has support for only one"),
+                                            vsysThis.strName.c_str());
+
+                        }
+                        ++cSATAused;
+                    break;
 
                     case ovf::HardDiskController::SCSI:
+                        /* Check for the constrains */
+                        if (cSCSIused < 1)
                         {
-#ifdef VBOX_WITH_LSILOGIC
-                            /* Check for the constrains */
-                            if (cSCSIused < 1)
-                            {
-                                Utf8Str hdcController = "LsiLogic";
-                                if (!hdc.strControllerType.compare("BusLogic", Utf8Str::CaseInsensitive))
-                                    hdcController = "BusLogic";
-                                pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
-                                                   strControllerID,
-                                                   hdc.strControllerType,
-                                                   hdcController);
-                            }
-                            else
-                                addWarning(tr("The virtual system \"%s\" requests support for an additional SCSI controller of type \"%s\" with ID %s, but VirtualBox presently supports only one SCSI controller."),
-                                           vsysThis.strName.c_str(),
-                                           hdc.strControllerType.c_str(),
-                                           strControllerID.c_str());
-                            ++cSCSIused;
-                            break;
-#else /* !VBOX_WITH_LSILOGIC */
-                            addWarning(tr("The virtual system \"%s\" requests at least one SATA controller but this version of VirtualBox does not provide a SCSI controller emulation"),
-                                       vsysThis.strName.c_str());
-#endif /* !VBOX_WITH_LSILOGIC */
+                            Utf8Str hdcController = "LsiLogic";
+                            if (!hdc.strControllerType.compare("lsilogicsas", Utf8Str::CaseInsensitive))
+                                hdcController = "LsiLogicSas";
+                            else if (!hdc.strControllerType.compare("BusLogic", Utf8Str::CaseInsensitive))
+                                hdcController = "BusLogic";
+                            pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
+                                                strControllerID,
+                                                hdc.strControllerType,
+                                                hdcController);
                         }
+                        else
+                            addWarning(tr("The virtual system \"%s\" requests support for an additional SCSI controller of type \"%s\" with ID %s, but VirtualBox presently supports only one SCSI controller."),
+                                        vsysThis.strName.c_str(),
+                                        hdc.strControllerType.c_str(),
+                                        strControllerID.c_str());
+                        ++cSCSIused;
+                    break;
                 }
             }
@@ -1647 +1635 @@
         if (FAILED(rc)) throw rc;
     }
-#ifdef VBOX_WITH_AHCI
+
     /* Hard disk controller SATA */
     std::list<VirtualSystemDescriptionEntry*> vsdeHDCSATA = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskControllerSATA);
@@ -1667 +1655 @@
                            hdcVBox.c_str());
     }
-#endif /* VBOX_WITH_AHCI */
-
-#ifdef VBOX_WITH_LSILOGIC
+
     /* Hard disk controller SCSI */
     std::list<VirtualSystemDescriptionEntry*> vsdeHDCSCSI = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
@@ -1678 +1664 @@
     {
         ComPtr<IStorageController> pController;
+        Bstr bstrName(L"SCSI Controller");
+        StorageBus_T busType = StorageBus_SCSI;
         StorageControllerType_T controllerType;
         const Utf8Str &hdcVBox = vsdeHDCSCSI.front()->strVbox;
         if (hdcVBox == "LsiLogic")
             controllerType = StorageControllerType_LsiLogic;
+        else if (hdcVBox == "LsiLogicSas")
+        {
+            // OVF treats LsiLogicSas as a SCSI controller but VBox considers it a class of its own
+            bstrName = L"SAS Controller";
+            busType = StorageBus_SAS;
+            controllerType = StorageControllerType_LsiLogic;
+        }
         else if (hdcVBox == "BusLogic")
             controllerType = StorageControllerType_BusLogic;
@@ -1689 +1684 @@
                            hdcVBox.c_str());
 
-        rc = pNewMachine->AddStorageController(Bstr("SCSI Controller"), StorageBus_SCSI, pController.asOutParam());
+        rc = pNewMachine->AddStorageController(bstrName, busType, pController.asOutParam());
         if (FAILED(rc)) throw rc;
         rc = pController->COMSETTER(ControllerType)(controllerType);
         if (FAILED(rc)) throw rc;
     }
-#endif /* VBOX_WITH_LSILOGIC */
 
     /* Now its time to register the machine before we add any hard disks */

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

@@ -3599 +3599 @@
       <li>
         "HardDiskControllerSCSI": a SCSI hard disk controller. There can be at most one such item.
-        The items in @a aOvfValues[] and @a aVBoxValues[] will either be "LsiLogic" or "BusLogic".
+        The items in @a aOvfValues[] and @a aVBoxValues[] will either be "LsiLogic", "BusLogic" or
+        "LsiLogicSas". (Note that in OVF, the LsiLogicSas controller is treated as a SCSI controller
+        whereas VirtualBox considers it a class of storage controllers of its own; see
+        <link to="StorageControllerType" />).
         The matching item in the @a aRefs[] array will be used as with IDE controllers (see above).
       </li>

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

@@ -257 +257 @@
     ControllerSystemType    system;             // one of IDE, SATA, SCSI
 
-    iprt::MiniString        strControllerType;  // controller subtype (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
+    iprt::MiniString        strControllerType;
+            // controller subtype (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
+            // note that we treat LsiLogicSAS as a SCSI controller (system == SCSI) even though VirtualBox
+            // treats it as a fourth class besides IDE, SATA, SCSI
 
     uint32_t                ulAddress;          // controller index; this is determined heuristically by the OVF reader and will