Changeset 34010 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Nov 11, 2010 8:17:47 PM (14 years ago)

Author:

vboxsync

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

67675

Message:

Main, FE/VBoxManage: Make it possible to mark specific controllers as bootable which means that the BIOS can access devices attached to the controller to boot from it

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

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

@@ -2814 +2814 @@
             // default from constructor is 0
 
+        pelmController->getAttributeValue("Bootable", sctl.fBootable);
+            // default from constructor is true which is true
+            // for settings below version 1.11 because they allowed only
+            // one controller per type.
+
         Utf8Str strType;
         if (!pelmController->getAttributeValue("type", strType))
@@ -3993 +3998 @@
             pelmController->setAttribute("useHostIOCache", sc.fUseHostIOCache);
 
+        if (m->sv >= SettingsVersion_v1_11)
+            pelmController->setAttribute("Bootable", sc.fBootable);
+
         if (sc.controllerType == StorageControllerType_IntelAhci)
         {
@@ -4390 +4398 @@
     }
 
+    // Settings version 1.11 is required if more than one controller of each type
+    // is present.
+    if (m->sv < SettingsVersion_v1_11)
+    {
+        size_t cSata = 0;
+        size_t cScsiLsi = 0;
+        size_t cScsiBuslogic = 0;
+        size_t cSas = 0;
+        size_t cIde = 0;
+        size_t cFloppy = 0;
+
+        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+             it != storageMachine.llStorageControllers.end();
+             ++it)
+        {
+            switch ((*it).storageBus)
+            {
+                case StorageBus_IDE:
+                    cIde++;
+                    break;
+                case StorageBus_SATA:
+                    cSata++;
+                    break;
+                case StorageBus_SAS:
+                    cSas++;
+                    break;
+                case StorageBus_SCSI:
+                    if ((*it).controllerType == StorageControllerType_LsiLogic)
+                        cScsiLsi++;
+                    else
+                        cScsiBuslogic++;
+                    break;
+                case StorageBus_Floppy:
+                    cFloppy++;
+                    break;
+                default:
+                    // Do nothing
+                    break;
+            }
+
+            if (   cSata > 1
+                || cScsiLsi > 1
+                || cScsiBuslogic > 1
+                || cSas > 1
+                || cIde > 1
+                || cFloppy > 1)
+                m->sv = SettingsVersion_v1_11;
+        }
+    }
+
     // settings version 1.9 is required if there is not exactly one DVD
     // or more than one floppy drive present or the DVD is not at the secondary