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

Timestamp:

May 14, 2019 3:16:21 PM (6 years ago)

Author:

vboxsync

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

130549

Message:

Main/Machine+StorageController+SystemProperties+Console: Add basic support for virtio-scsi storage controller.

File:

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

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

@@ -411 +411 @@
             else if (ulMinor == 17)
                 sv = SettingsVersion_v1_17;
-            else if (ulMinor > 17)
+            else if (ulMinor == 18)
+                sv = SettingsVersion_v1_18;
+            else if (ulMinor > 18)
                 sv = SettingsVersion_Future;
         }
@@ -1040 +1042 @@
             break;
 
+        case SettingsVersion_v1_18:
+            pcszVersion = "1.18";
+            break;
+
         default:
             // catch human error: the assertion below will trigger in debug
@@ -1062 +1068 @@
                 // but as it's an omission of someone who changed this file
                 // it's the only generic possibility.
-                pcszVersion = "1.17";
-                m->sv = SettingsVersion_v1_17;
+                pcszVersion = "1.18";
+                m->sv = SettingsVersion_v1_18;
             }
             break;
@@ -5035 +5041 @@
             sctl.controllerType = StorageControllerType_NVMe;
         }
+        else if (strType == "VirtioSCSI")
+        {
+            sctl.storageBus = StorageBus_VirtioSCSI;
+            sctl.controllerType = StorageControllerType_VirtioSCSI;
+        }
         else
             throw ConfigFileError(this, pelmController, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
@@ -6868 +6879 @@
             case StorageControllerType_USB: pcszType = "USB"; break;
             case StorageControllerType_NVMe: pcszType = "NVMe"; break;
+            case StorageControllerType_VirtioSCSI: pcszType = "VirtioSCSI"; break;
             default: /*case StorageControllerType_PIIX3:*/ pcszType = "PIIX3"; break;
         }
@@ -7360 +7372 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_18)
+    {
+        // VirtualBox 6.1 adds a virtio-scsi storage controller.
+        for (StorageControllersList::const_iterator it = hardwareMachine.storage.llStorageControllers.begin();
+             it != hardwareMachine.storage.llStorageControllers.end();
+             ++it)
+        {
+            const StorageController &sctl = *it;
+
+            if (sctl.controllerType == StorageControllerType_VirtioSCSI)
+            {
+                m->sv = SettingsVersion_v1_18;
+                return;
+            }
+        }
+    }
+
     if (m->sv < SettingsVersion_v1_17)
     {