Changeset 101468 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 17, 2023 10:13:30 AM (16 months ago)

Author:

vboxsync

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

159537

Message:

Main: Allow running x86 VMs (via IEM) on ARM hosts again. Running ARM VMs on x86 is not supported though. bugref:10384

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImplConfigArmV8.cpp (modified) (2 diffs)
• ConsoleImplConfigX86.cpp (modified) (2 diffs)

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

@@ -131 +131 @@
     hrc = virtualBox->COMGETTER(Host)(host.asOutParam());                                   H();
 
+    PlatformArchitecture_T platformArchHost;
+    hrc = host->COMGETTER(Architecture)(&platformArchHost);                                 H();
+
     ComPtr<ISystemProperties> systemProperties;
     hrc = virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam());           H();
@@ -149 +152 @@
     uint64_t const cbRam   = cRamMBs * (uint64_t)_1M;
 
-    ComPtr<IPlatform> pPlatform;
-    hrc = pMachine->COMGETTER(Platform)(pPlatform.asOutParam());                            H();
+    ComPtr<IPlatform> platform;
+    hrc = pMachine->COMGETTER(Platform)(platform.asOutParam());                             H();
+
+    /* Note: Should be guarded by VBOX_WITH_VIRT_ARMV8, but we check this anyway here. */
+#if 1 /* For now we only support running ARM VMs on ARM hosts. */
+    PlatformArchitecture_T platformArchMachine;
+    hrc = platform->COMGETTER(Architecture)(&platformArchMachine);                          H();
+    if (platformArchMachine != platformArchHost)
+        return pVMM->pfnVMR3SetError(pUVM, VERR_PLATFORM_ARCH_NOT_SUPPORTED, RT_SRC_POS,
+                                     N_("VM platform architecture (%s) not supported on this host (%s)."),
+                                     Global::stringifyPlatformArchitecture(platformArchMachine),
+                                     Global::stringifyPlatformArchitecture(platformArchHost));
+#endif
 
     ComPtr<IPlatformProperties> pPlatformProperties;
-    hrc = pPlatform->COMGETTER(Properties)(pPlatformProperties.asOutParam());               H();
+    hrc = platform->COMGETTER(Properties)(pPlatformProperties.asOutParam());                H();
 
     ChipsetType_T chipsetType;
-    hrc = pPlatform->COMGETTER(ChipsetType)(&chipsetType);                                  H();
+    hrc = platform->COMGETTER(ChipsetType)(&chipsetType);                                   H();
 
     ULONG cCpus = 1;

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

@@ -465 +465 @@
     hrc = virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam());           H();
 
-    PlatformArchitecture_T platformArchHost;
-    hrc = host->COMGETTER(Architecture)(&platformArchHost);                                 H();
-
     ComPtr<IFirmwareSettings> firmwareSettings;
     hrc = pMachine->COMGETTER(FirmwareSettings)(firmwareSettings.asOutParam());             H();
@@ -502 +499 @@
     ComPtr<IPlatform> platform;
     pMachine->COMGETTER(Platform)(platform.asOutParam());                                   H();
-
-#if 0 /* For now we only support running same-same architectures (e.g. x86 VMs on x86 hosts). */
-    PlatformArchitecture_T platformArchMachine;
-    hrc = platform->COMGETTER(Architecture)(&platformArchMachine);                          H();
-    if (platformArchMachine != platformArchHost)
-        return pVMM->pfnVMR3SetError(pUVM, VERR_PLATFORM_ARCH_NOT_SUPPORTED, RT_SRC_POS,
-                                     N_("VM platform architecture (%s) not supported on this host (%s)."),
-                                     Global::stringifyPlatformArchitecture(platformArchMachine),
-                                     Global::stringifyPlatformArchitecture(platformArchHost));
-#endif
 
     ChipsetType_T chipsetType;