Changeset 87258 in vbox

Timestamp:

Jan 15, 2021 11:10:26 AM (4 years ago)

Author:

vboxsync

Message:

Main: Adjustments for bugref:9898.

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (6 diffs)

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

@@ -139 +139 @@
 #endif
 
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #ifdef RT_OS_SOLARIS
 # include <iprt/ctype.h>
@@ -329 +331 @@
     m->fRecheckVTSupported = false;
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     if (ASMHasCpuId())
     {
@@ -348 +351 @@
                                  && (fExtFeaturesEdx & X86_CPUID_EXT_FEATURE_EDX_LONG_MODE);
 
-#if defined(RT_OS_DARWIN) && ARCH_BITS == 32 /* darwin.x86 has some optimizations of 64-bit on 32-bit. */
+# if defined(RT_OS_DARWIN) && ARCH_BITS == 32 /* darwin.x86 has some optimizations of 64-bit on 32-bit. */
             int     f64bitCapable = 0;
             size_t  cbParameter   = sizeof(f64bitCapable);
             if (sysctlbyname("hw.cpu64bit_capable", &f64bitCapable, &cbParameter, NULL, NULL) != -1)
                 m->fLongModeSupported = f64bitCapable != 0;
-#endif
+# endif
 
             /* VT-x? */
@@ -398 +401 @@
         }
     }
+#endif /* defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) */
+
 
     /* Check with SUPDrv if VT-x and AMD-V are really supported (may fail). */
@@ -1310 +1315 @@
              : setError(E_FAIL, tr("CPU no.%u is not online"), aCpuId);
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     uint32_t uEAX, uEBX, uECX, uEDX;
     ASMCpuId_Idx_ECX(aLeaf, aSubLeaf, &uEAX, &uEBX, &uECX, &uEDX);
@@ -1316 +1322 @@
     *aValECX = uECX;
     *aValEDX = uEDX;
+#else
+    *aValEAX = 0;
+    *aValEBX = 0;
+    *aValECX = 0;
+    *aValEDX = 0;
+#endif
 
     return S_OK;