Changeset 107116 in vbox

Timestamp:

Nov 22, 2024 11:16:37 AM (8 weeks ago)

Author:

vboxsync

Message:

/Config.kmk,Main: Added VBOX_WITH_X86_ON_ARM_ENABLED to the build system so the feature can be enabled via LocalConfig.kmk. jiraref:VBP-1466

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/SystemPropertiesImpl.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -572 +572 @@
  VBOX_WITH_VIRT_ARMV8 = 1
 endif
+# Makes x86 emulation on ARM hosts available in the GUI.
+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), )
+ VBOX_WITH_X86_ON_ARM_ENABLED = 1
+endif
+
 if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), linux.amd64)
  ifdef VBOX_WITH_R0_MODULES

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

@@ -565 +565 @@
         {
             case PlatformArchitecture_x86:
-#ifdef VBOX_WITH_VIRT_ARMV8
+#if !defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_X86_ON_ARM_ENABLED)
                 {
                     ComPtr<IVirtualBox> pVirtualBox;

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

@@ -1039 +1039 @@
     RT_CPP_VECTOR_ASSIGN_ARRAY(aSupportedPlatformArchitectures, s_aPlatformArchitectures);
 
-#ifdef VBOX_WITH_VIRT_ARMV8
+#if !defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_X86_ON_ARM_ENABLED)
     Bstr bstrEnableX86OnArm;
     HRESULT hrc = mParent->GetExtraData(Bstr("VBoxInternal2/EnableX86OnArm").raw(), bstrEnableX86OnArm.asOutParam());