Changeset 105455 in vbox

Timestamp:

Jul 23, 2024 7:02:30 PM (6 months ago)

Author:

vboxsync

Message:

Main: Special API tweak for ARM host disabling x86-on-arm by default (set global VBoxInternal2/EnableX86OnArm extradata to 1 to enable).

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-server/SystemPropertiesImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -565 +565 @@
         {
             case PlatformArchitecture_x86:
+#ifdef VBOX_WITH_VIRT_ARMV8
+                {
+                    ComPtr<IVirtualBox> pVirtualBox;
+                    hrc = mMachine->COMGETTER(Parent)(pVirtualBox.asOutParam());
+                    if (SUCCEEDED(hrc))
+                    {
+                        Bstr bstrEnableX86OnArm;
+                        hrc = pVirtualBox->GetExtraData(Bstr("VBoxInternal2/EnableX86OnArm").raw(), bstrEnableX86OnArm.asOutParam());
+                        if (FAILED(hrc) || !bstrEnableX86OnArm.equals("1"))
+                        {
+                            hrc = VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED;
+                            break;
+                        }
+                    }
+                }
+#endif
                 pszVMM = "VBoxVMM";
                 break;

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -1063 +1063 @@
     };
     MY_VECTOR_ASSIGN_ARRAY(aSupportedPlatformArchitectures, s_aPlatformArchitectures);
+
+#ifdef VBOX_WITH_VIRT_ARMV8
+    Bstr bstrEnableX86OnArm;
+    HRESULT hrc =mParent->GetExtraData(Bstr("VBoxInternal2/EnableX86OnArm").raw(), bstrEnableX86OnArm.asOutParam());
+    if (FAILED(hrc) || !bstrEnableX86OnArm.equals("1"))
+    {
+        Assert(aSupportedPlatformArchitectures[0] == PlatformArchitecture_x86);
+        if (aSupportedPlatformArchitectures[0] == PlatformArchitecture_x86)
+            aSupportedPlatformArchitectures.erase(aSupportedPlatformArchitectures.begin());
+    }
+#endif
     return S_OK;
 }