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

Timestamp:

Oct 16, 2024 1:58:41 PM (3 months ago)

Author:

vboxsync

Message:

Main: Code for configuring and enabling nested virtualization support on ARM (M3 based hardware + macOS 15.0 aka Sequioa), bugref:10747

File:

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

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

@@ -3969 +3969 @@
 
 #ifdef VBOX_WITH_VIRT_ARMV8
-PlatformARM::PlatformARM()
+PlatformARM::PlatformARM() :
+    fNestedHWVirt(false)
 {
 }
@@ -3975 +3976 @@
 bool PlatformARM::operator==(const PlatformARM& h) const
 {
-    RT_NOREF(h);
-    return true;
+    return (this == &h)
+        || (fNestedHWVirt == h.fNestedHWVirt);
 }
 #endif /* VBOX_WITH_VIRT_ARMV8 */
@@ -5306 +5307 @@
 }
 
+#ifdef VBOX_WITH_VIRT_ARMV8
+/**
+ * Reads the ARM platform settings.
+ *
+ * For settings >= v1.20 these were stored under the "Platform/arm" node.
+ *
+ * @param elmPlatformARM  Platform/arm node to read from.
+ * @param platARM         Where to store the ARM platform settings.
+ */
+void MachineConfigFile::readPlatformARM(const xml::ElementNode &elmPlatformARM,
+                                        PlatformARM &platARM)
+{
+    xml::NodesLoop nl1(elmPlatformARM);
+
+    const xml::ElementNode *pelChild;
+    while ((pelChild = nl1.forAllNodes()))
+    {
+        if (pelChild->nameEquals("CPU"))
+        {
+            const xml::ElementNode *pelmCPUChild;
+            if ((pelmCPUChild = pelChild->findChildElement("NestedHWVirt")))
+                pelmCPUChild->getAttributeValue("enabled", platARM.fNestedHWVirt);
+        }
+    }
+}
+#endif
+
 /**
  * Reads the platform settings.
@@ -5443 +5471 @@
         case PlatformArchitecture_ARM:
         {
-            /* Nothing here yet -- add ARM-specific stuff as soon as we have it. */
+            const xml::ElementNode *pelmPlatformARM;
+
+            pelmPlatformARM = elmPlatformOrHardware.findChildElement("arm");
+            if (pelmPlatformARM)
+                readPlatformARM(*pelmPlatformARM, plat.arm);
             break;
         }
@@ -7350 +7382 @@
 }
 
+#ifdef VBOX_WITH_VIRT_ARMV8
+/**
+ * Writes ARM-specific platform settings out to the XML.
+ *
+ * For settings >= v1.20 this creates a \<arm\> node under elmParent.
+ * keys under that. Called for both the \<Machine\> node and for snapshots.
+ *
+ * @param elmParent                         Parent element.
+ *                                          For settings >= v1.20 this is the \<Platform\> element.
+ * @param elmCPU                            CPU element platform-generic settings.
+ *                                          For settings >= v1.20 this is the \<Platform/CPU\> element.
+ * @param platARM                           ARM-specific platform settings to use for building the XML.
+ */
+void MachineConfigFile::buildPlatformARMXML(xml::ElementNode &elmParent, const PlatformARM &platARM)
+{
+    xml::ElementNode *pelmARMRoot = elmParent.createChild("arm");
+    xml::ElementNode *pelmARMCPU  = pelmARMRoot->createChild("CPU");
+
+    if (platARM.fNestedHWVirt)
+        pelmARMCPU->createChild("NestedHWVirt")->setAttribute("enabled", platARM.fNestedHWVirt);
+}
+#endif /* VBOX_WITH_VIRT_ARMV8 */
+
+
 /**
  * Stores platform-generic and platform-specific data and then writes out the XML.
@@ -7465 +7521 @@
     if (plat.architectureType == PlatformArchitecture_x86)
         buildPlatformX86XML(*pelmPlatformOrHardware, *pelmCPU, plat.x86);
-    /** @todo Put ARM stuff here as soon as we have it. */
+#ifdef VBOX_WITH_VIRT_ARMV8
+    else if (plat.architectureType == PlatformArchitecture_ARM)
+    {
+        Assert(m->sv >= SettingsVersion_v1_20);
+        buildPlatformARMXML(*pelmPlatformOrHardware, plat.arm);
+    }
+#endif
 }