Changeset 107100 in vbox for trunk/src/VBox

Timestamp:

Nov 22, 2024 2:22:42 AM (2 months ago)

Author:

vboxsync

Message:

FE/Qt,VBoxManage,VBoxHeadless: Refuse to run in WoW64 to prevent mixing up amd64 and arm64 builds in the out directory. jiraref:VBP-1466

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)
• VBoxManage/VBoxManage.cpp (modified) (3 diffs)
• VirtualBox/src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -43 +43 @@
 #include <VBox/log.h>
 #include <VBox/version.h>
+#include <iprt/arch.h>
 #include <iprt/buildconfig.h>
 #include <iprt/ctype.h>
@@ -55 +56 @@
 #include <iprt/errcore.h>
 #include <iprt/thread.h>
+#include <iprt/system.h>
 #include <VBoxVideo.h>
 
@@ -1152 +1154 @@
     }
 
+    /* Before we try to initialize COM, make sure we're not running inside
+       an emulator (these days, running amd64 code in an emulator on arm64). */
+    uint32_t const uNativeArch = RTSystemGetNativeArch();
+    if (uNativeArch != RT_ARCH_VAL && uNativeArch != 0)
+    {
+        RTMsgError("Binary (%s) doesn't match the host CPU (%s)!",
+                   RTArchValToString(RT_ARCH_VAL), RTArchValToString(uNativeArch));
+        return RTEXITCODE_FAILURE;
+    }
+
     HRESULT hrc;
     int vrc;

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

@@ -47 +47 @@
 #include <VBox/version.h>
 
+#include <iprt/arch.h>
 #include <iprt/asm.h>
 #include <iprt/buildconfig.h>
@@ -57 +58 @@
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 #include <signal.h>
@@ -787 +789 @@
     {
         /*
+         * Before we try to initialize COM, make sure we're not running inside
+         * an emulator (these days, running amd64 code in an emulator on arm64).
+         */
+        uint32_t const uNativeArch = RTSystemGetNativeArch();
+        if (uNativeArch != RT_ARCH_VAL && uNativeArch != 0)
+        {
+            RTMsgError("Binary (%s) doesn't match the host CPU (%s)!",
+                       RTArchValToString(RT_ARCH_VAL), RTArchValToString(uNativeArch));
+            return RTEXITCODE_FAILURE;
+        }
+
+        /*
          * Initialize COM.
          */

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -49 +49 @@
 
 /* Other VBox includes: */
+#include <iprt/arch.h>
 #include <iprt/buildconfig.h>
 #include <iprt/stream.h>
+#include <iprt/system.h>
 #include <VBox/err.h>
 #include <VBox/version.h>
@@ -554 +556 @@
 #endif /* VBOX_WS_NIX */
 
+        /* Make sure we're not running inside an emulator (these days,
+         * running amd64 code in an emulator on arm64). */
+        uint32_t const uNativeArch = RTSystemGetNativeArch();
+        if (uNativeArch != RT_ARCH_VAL && uNativeArch != 0)
+        {
+            QString strMsg = QApplication::tr("This VirtualBox application was built for a different CPU architecture (<b>%1</b>) than the host (<b>%2</b>). Please reinstall.")
+                                              .arg(RTArchValToString(RT_ARCH_VAL))
+                                              .arg(RTArchValToString(uNativeArch));
+            QMessageBox::critical(0, QApplication::tr("Mismatching CPU Architecture"),
+                                  strMsg, QMessageBox::Abort, QMessageBox::NoButton);
+            break;
+        }
+
         /* Create modal-window manager: */
         UIModalWindowManager::create();