Changeset 20211 in vbox

Timestamp:

Jun 3, 2009 8:04:57 AM (16 years ago)

Author:

vboxsync

Message:

OVF: better handling of missing SATA/SCSI device emulation in OSE

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (8 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1586 +1586 @@
             /* Hard disk Controller */
             uint16_t cIDEused = 0;
-            uint16_t cSATAused = 0;
-            uint16_t cSCSIused = 0;
+            uint16_t cSATAused = 0; NOREF(cSATAused);
+            uint16_t cSCSIused = 0; NOREF(cSCSIused);
             ControllersMap::const_iterator hdcIt;
             /* Iterate through all hard disk controllers */
@@ -1630 +1630 @@
                         }
 
-#ifdef VBOX_WITH_AHCI
                     case HardDiskController::SATA:
                         {
+#ifdef VBOX_WITH_AHCI
                             /* Check for the constrains */
                             if (cSATAused < 1)
@@ -1653 +1653 @@
                             ++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 */
                         }
-#endif /* VBOX_WITH_AHCI */
 
                     case HardDiskController::SCSI:
                         {
+#ifdef VBOX_WITH_LSILOGIC
                             /* Check for the constrains */
                             if (cSCSIused < 1)
@@ -1676 +1680 @@
                             ++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 */
                         }
                 }
@@ -2160 +2168 @@
 #endif /* VBOX_WITH_AHCI */
 
+#ifdef VBOX_WITH_LSILOGIC
             /* Hard disk controller SCSI */
             std::list<VirtualSystemDescriptionEntry*> vsdeHDCSCSI = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
@@ -2184 +2193 @@
                 if (FAILED(rc)) throw rc;
             }
+#endif /* VBOX_WITH_LSILOGIC */
 
             /* Now its time to register the machine before we add any hard disks */
@@ -4566 +4576 @@
 #endif // VBOX_WITH_AHCI
 
+#ifdef VBOX_WITH_LSILOGIC
 //     <const name="HardDiskControllerSCSI" value="8" />
         rc = GetStorageControllerByName(Bstr("SCSI"), pController.asOutParam());
@@ -4588 +4599 @@
                 throw rc;
         }
+#endif // VBOX_WITH_LSILOGIC
 
 //     <const name="HardDiskImage" value="9" />

trunk/src/VBox/Main/Makefile.kmk

@@ -215 +215 @@
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
         $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
+        $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
         $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,) \