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

Timestamp:

Jan 13, 2021 3:56:05 PM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Main/API: AMD IOMMU support.

File:

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

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

@@ -411 +411 @@
             else if (uMinor == 18)
                 sv = SettingsVersion_v1_18;
-            else if (uMinor > 18)
+            else if (uMinor == 19)
+                sv = SettingsVersion_v1_19;
+            else if (uMinor > 19)
                 sv = SettingsVersion_Future;
         }
@@ -1043 +1045 @@
             break;
 
+        case SettingsVersion_v1_19:
+            pcszVersion = "1.19";
+            break;
+
         default:
             // catch human error: the assertion below will trigger in debug
@@ -1065 +1071 @@
                 // but as it's an omission of someone who changed this file
                 // it's the only generic possibility.
-                pcszVersion = "1.18";
-                m->sv = SettingsVersion_v1_18;
+                pcszVersion = "1.19";
+                m->sv = SettingsVersion_v1_19;
             }
             break;
@@ -3362 +3368 @@
     keyboardHIDType(KeyboardHIDType_PS2Keyboard),
     chipsetType(ChipsetType_PIIX3),
+    iommuType(IommuType_None),
     paravirtProvider(ParavirtProvider_Legacy), // default for old VMs, for new ones it's ParavirtProvider_Default
     strParavirtDebug(""),
@@ -3486 +3493 @@
             && keyboardHIDType                == h.keyboardHIDType
             && chipsetType                    == h.chipsetType
+            && iommuType                      == h.iommuType
             && paravirtProvider               == h.paravirtProvider
             && strParavirtDebug               == h.strParavirtDebug
@@ -4601 +4609 @@
                                           N_("Invalid value '%s' in Chipset/@type"),
                                           strChipsetType.c_str());
+            }
+        }
+        else if (pelmHwChild->nameEquals("Iommu"))
+        {
+            Utf8Str strIommuType;
+            if (pelmHwChild->getAttributeValue("type", strIommuType))
+            {
+                if (strIommuType == "None")
+                    hw.iommuType = IommuType_None;
+                else if (strIommuType == "Automatic")
+                    hw.iommuType = IommuType_Automatic;
+                else if (strIommuType == "AMD")
+                    hw.iommuType = IommuType_AMD;
+                else
+                    throw ConfigFileError(this,
+                                          pelmHwChild,
+                                          N_("Invalid value '%s' in Iommu/@type"),
+                                          strIommuType.c_str());
             }
         }
@@ -6092 +6118 @@
             && hw.strParavirtDebug.isNotEmpty())
             pelmParavirt->setAttribute("debug", hw.strParavirtDebug);
+    }
+
+    if (   m->sv >= SettingsVersion_v1_19
+        && hw.iommuType != IommuType_None)
+    {
+        const char *pcszIommuType;
+        switch (hw.iommuType)
+        {
+            case IommuType_None:         pcszIommuType = "None";        break;
+            case IommuType_Automatic:    pcszIommuType = "Automatic";   break;
+            case IommuType_AMD:          pcszIommuType = "AMD";         break;
+            default:     Assert(false);  pcszIommuType = "None";        break;
+        }
+
+        xml::ElementNode *pelmIommu = pelmHardware->createChild("Iommu");
+        pelmIommu->setAttribute("type", pcszIommuType);
     }
 
@@ -7631 +7673 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_19)
+    {
+        // VirtualBox 6.2 adds iommu device.
+        if (hardwareMachine.iommuType != IommuType_None)
+        {
+            m->sv = SettingsVersion_v1_19;
+            return;
+        }
+    }
+
     if (m->sv < SettingsVersion_v1_18)
     {