Changeset 101461 in vbox

Timestamp:

Oct 17, 2023 8:37:28 AM (15 months ago)

Author:

vboxsync

Message:

Main: Allow creation of x86 VMs (based on guest OS type or the set architecture) on non-x86 hosts. bugref:10384

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImplConfigX86.cpp (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (3 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -483 +483 @@
     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();
@@ -517 +520 @@
     ComPtr<IPlatform> platform;
     pMachine->COMGETTER(Platform)(platform.asOutParam());                                   H();
+
+#if 1 /* 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;

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

@@ -317 +317 @@
  *  @param strName              Name for the machine.
  *  @param aArchitecture        Architecture to use for the machine.
+ *                              If a valid guest OS type is set via @aOsType, the guest OS' type will be used instead then.
  *  @param llGroups             list of groups for the machine.
  *  @param strOsType            OS Type string (stored as is if aOsType is NULL).
@@ -460 +461 @@
         AssertComRC(hrc);
 
+        /* Use the platform architecture which was handed-in by default. */
+        PlatformArchitecture_T enmPlatformArch = aArchitecture;
+
         if (aOsType)
         {
             /* Store OS type */
             mUserData->s.strOsType = aOsType->i_id();
+
+            /* Use the platform architecture of the found guest OS type. */
+            enmPlatformArch = aOsType->i_platformArchitecture();
         }
         else if (!strOsType.isEmpty())
@@ -472 +479 @@
 
         /* Set the platform architecture first before applying the defaults below. */
-        hrc = mPlatform->i_initArchitecture(aArchitecture);
+        hrc = mPlatform->i_initArchitecture(enmPlatformArch);
         if (FAILED(hrc)) return hrc;
 

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

@@ -2240 +2240 @@
                      aSettingsFile.c_str(), aName.c_str(), aArchitecture, aOsTypeId.c_str(), aFlags.c_str()));
 
-#if 1
-    /**
-     * We only allow same-same platform architectures (x86 VMs for x86 hosts, for instance) for now.
-     *
-     * This might change in the future, but for now we simply overwrite the architecture the caller handed-in
-     * with the host architecture.
-     */
-    aArchitecture = PlatformProperties::s_getHostPlatformArchitecture();
-#endif
-
     StringsList llGroups;
     HRESULT hrc = i_convertMachineGroups(aGroups, &llGroups);