Changeset 87255 in vbox

Timestamp:

Jan 14, 2021 11:20:17 PM (4 years ago)

Author:

vboxsync

Message:

VMM: Adjustments for bugref:9898.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUMR3Db.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -32 +32 @@
 #include <iprt/x86.h>
 #include <VBox/types.h>
-#ifdef RT_ARCH_AMD64
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64)
 # include <VBox/vmm/cpumctx.h>
 #endif

trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp

@@ -27 +27 @@
 
 #include <VBox/err.h>
-#include <iprt/asm-amd64-x86.h>
+#if !defined(RT_ARCH_ARM64)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/mem.h>
 #include <iprt/string.h>
@@ -895 +897 @@
 
     if (!strcmp(pszName, "host"))
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     {
         /*
@@ -991 +994 @@
     }
     else
+#else
+        pszName = g_apCpumDbEntries[0]->pszName; /* Just pick the first entry for non-x86 hosts. */
+#endif
     {
         /*