Changeset 106384 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

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

165197

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/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -250 +250 @@
     MODIFYVM_GUEST_DEBUG_ADDRESS,
     MODIFYVM_GUEST_DEBUG_PORT,
+
+    /*
+     * Stuff common between x86 and ARM.
+     */
+    MODIFYVM_NESTED_HW_VIRT,
+
     /*
      * x86-specific stuff.
@@ -267 +273 @@
     MODIFYVM_X86_MDS_CLEAR_ON_SCHED,
     MODIFYVM_X86_MDS_CLEAR_ON_VM_ENTRY,
-    MODIFYVM_X86_NESTED_HW_VIRT,
     MODIFYVM_X86_NESTEDPAGING,
     MODIFYVM_X86_PAE,
@@ -516 +521 @@
     OPT1("--x86-mds-clear-on-vm-entry",                                 MODIFYVM_X86_MDS_CLEAR_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF),
     OPT1("--mds-clear-on-vm-entry",                                     MODIFYVM_X86_MDS_CLEAR_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF),
-    OPT1("--x86-nested-hw-virt",                                        MODIFYVM_X86_NESTED_HW_VIRT,        RTGETOPT_REQ_BOOL_ONOFF),
-    OPT1("--nested-hw-virt",                                            MODIFYVM_X86_NESTED_HW_VIRT,        RTGETOPT_REQ_BOOL_ONOFF),
+    OPT1("--x86-nested-hw-virt",                                        MODIFYVM_NESTED_HW_VIRT,            RTGETOPT_REQ_BOOL_ONOFF),
+    OPT1("--nested-hw-virt",                                            MODIFYVM_NESTED_HW_VIRT,            RTGETOPT_REQ_BOOL_ONOFF),
     OPT1("--x86-nested-paging",                                         MODIFYVM_X86_NESTEDPAGING,          RTGETOPT_REQ_BOOL_ONOFF),
     OPT2("--nested-paging",                 "--nestedpaging",           MODIFYVM_X86_NESTEDPAGING,          RTGETOPT_REQ_BOOL_ONOFF),
@@ -792 +797 @@
             break;
 
-        case MODIFYVM_X86_NESTED_HW_VIRT:
+        case MODIFYVM_NESTED_HW_VIRT:
             CHECK_ERROR(platformX86, SetCPUProperty(CPUPropertyTypeX86_HWVirt, pValueUnion->f));
             break;
@@ -825 +830 @@
 }
 
+/**
+ * Handles the x86-specific modifyvm options.
+ *
+ * @returns HRESULT
+ * @retval  E_INVALIDARG if handed-in option was not being handled.
+ * @param   pGetOptState        Pointer to GetOpt state to use.
+ * @param   c                   Current GetOpt value (short form).
+ * @param   pValueUnion         Pointer to current value union.
+ * @param   sessionMachine      Session machine to use.
+ * @param   platformARM         ARM-specific platform object to use.
+ */
+static HRESULT handleModifyVM_ARM(PRTGETOPTSTATE pGetOptState, int c, PRTGETOPTUNION pValueUnion,
+                                  ComPtr<IMachine> &sessionMachine, ComPtr<IPlatformARM> &platformARM)
+{
+    RT_NOREF(pGetOptState, sessionMachine);
+
+    HRESULT hrc = S_OK;
+
+    switch (c)
+    {
+        case MODIFYVM_NESTED_HW_VIRT:
+            CHECK_ERROR(platformARM, SetCPUProperty(CPUPropertyTypeARM_HWVirt, pValueUnion->f));
+            break;
+
+        default:
+            hrc = E_INVALIDARG;
+            break;
+    }
+
+    return hrc;
+}
+
 RTEXITCODE handleModifyVM(HandlerArg *a)
 {
@@ -857 +894 @@
     ComPtr<IPlatform> platform;
     CHECK_ERROR_RET(sessionMachine, COMGETTER(Platform)(platform.asOutParam()), RTEXITCODE_FAILURE);
-
-    /* For the x86-based options we need the x86-specific platform object. */
-    ComPtr<IPlatformX86> platformX86;
-    platform->COMGETTER(X86)(platformX86.asOutParam());
 
     ComPtr<IGraphicsAdapter> pGraphicsAdapter;
@@ -3739 +3772 @@
             default:
             {
-                hrc = handleModifyVM_x86(&GetOptState, c, &ValueUnion, sessionMachine, platformX86);
+                PlatformArchitecture_T enmArch;
+                CHECK_ERROR_RET(platform, COMGETTER(Architecture)(&enmArch), RTEXITCODE_FAILURE);
+
+                if (enmArch == PlatformArchitecture_x86)
+                {
+                    /* For the x86-based options we need the x86-specific platform object. */
+                    ComPtr<IPlatformX86> platformX86;
+                    CHECK_ERROR_RET(platform, COMGETTER(X86)(platformX86.asOutParam()), RTEXITCODE_FAILURE);
+
+                    hrc = handleModifyVM_x86(&GetOptState, c, &ValueUnion, sessionMachine, platformX86);
+                }
+                else if (enmArch == PlatformArchitecture_ARM)
+                {
+                    /* For the ARM-based options we need the x86-specific platform object. */
+                    ComPtr<IPlatformARM> platformARM;
+                    CHECK_ERROR_RET(platform, COMGETTER(ARM)(platformARM.asOutParam()), RTEXITCODE_FAILURE);
+
+                    hrc = handleModifyVM_ARM(&GetOptState, c, &ValueUnion, sessionMachine, platformARM);
+                }
+                else
+                {
+                    errorArgument(ModifyVM::tr("Invalid platform architecture returned for VM"));
+                    hrc = E_FAIL;
+                }
+
                 if (FAILED(hrc))
                     errorGetOpt(c, &ValueUnion);