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

Timestamp:

Aug 25, 2015 10:20:15 AM (9 years ago)

Author:

vboxsync

Message:

Main: NVMe integration

File:

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

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

@@ -3589 +3589 @@
             sctl.controllerType = StorageControllerType_USB;
         }
+        else if (strType == "NVMe")
+        {
+            sctl.storageBus = StorageBus_PCIe;
+            sctl.controllerType = StorageControllerType_NVMe;
+        }
         else
             throw ConfigFileError(this, pelmController, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
@@ -5097 +5102 @@
             case StorageControllerType_LsiLogicSas: pcszType = "LsiLogicSas"; break;
             case StorageControllerType_USB: pcszType = "USB"; break;
+            case StorageControllerType_NVMe: pcszType = "NVMe"; break;
             default: /*case StorageControllerType_PIIX3:*/ pcszType = "PIIX3"; break;
         }
@@ -5580 +5586 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_16)
+    {
+        // VirtualBox 5.1 adds a NVMe storage controller.
+        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+             it != storageMachine.llStorageControllers.end();
+             ++it)
+        {
+            const StorageController &sctl = *it;
+
+            if (sctl.controllerType == StorageControllerType_NVMe)
+            {
+                m->sv = SettingsVersion_v1_16;
+                return;
+            }
+        }
+    }
+
     if (m->sv < SettingsVersion_v1_15)
     {