Changeset 101672 in vbox for trunk

Timestamp:

Oct 31, 2023 9:22:10 AM (16 months ago)

Author:

vboxsync

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

159763

Message:

ValidationKit/TestBoxHelper: Some fixes for ARM, bugref:10542

File:

• trunk/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp (modified) (8 diffs)

trunk/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp

@@ -381 +381 @@
     }
     RTPrintf("\n");
+#else
+#endif
 
     /*
@@ -406 +408 @@
     }
     RTPrintf("\n");
-
-#else
-#endif
 
     /*
@@ -471 +470 @@
 }
 
-typedef enum { HWVIRTTYPE_NONE, HWVIRTTYPE_VTX, HWVIRTTYPE_AMDV } HWVIRTTYPE;
+typedef enum { HWVIRTTYPE_NONE, HWVIRTTYPE_VTX, HWVIRTTYPE_AMDV, HVIRTTYPE_ARMV8 } HWVIRTTYPE;
 static HWVIRTTYPE isHwVirtSupported(void)
 {
@@ -494 +493 @@
             return HWVIRTTYPE_AMDV;
     }
+#elif defined(RT_ARCH_ARM64)
+# if defined(RT_OS_DARWIN)
+    /*
+     * The kern.hv_support parameter indicates support for the hypervisor API in the
+     * kernel, which is the only way for virtualization on macOS on Apple Silicon.
+     */
+    int32_t fHvSupport = 0;
+    size_t  cbOld = sizeof(fHvSupport);
+    if (sysctlbyname("kern.hv_support", &fHvSupport, &cbOld, NULL, 0) == 0)
+    {
+        if (fHvSupport != 0)
+            return HVIRTTYPE_ARMV8;
+    }
+# endif
 #endif
 
@@ -515 +528 @@
     int         fSupported = -1;
 
+    HWVIRTTYPE  enmHwVirt  = isHwVirtSupported();
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-    HWVIRTTYPE  enmHwVirt  = isHwVirtSupported();
     if (enmHwVirt == HWVIRTTYPE_AMDV)
     {
@@ -595 +608 @@
     }
 # endif
+#elif defined(RT_ARCH_ARM64)
+    /* On ARM nested paging is always supported if virtualization is there. */
+    if (enmHwVirt == HVIRTTYPE_ARMV8)
+        fSupported = 1;
 #endif
 
@@ -648 +665 @@
             }
         }
+#elif defined(RT_ARCH_ARM64)
+        fSupported = 1; /** @todo LongMode is a misnomer here but in general means 64-bit guest capable. */
 #endif
     }
@@ -708 +727 @@
     ASMCpuId(0, &uEax, &uEbx, &uEcx, &uEdx);
     int cch = RTPrintf("%.04s%.04s%.04s\n", &uEbx, &uEdx, &uEcx);
+#elif defined(RT_ARCH_ARM64) && defined(RT_OS_DARWIN)
+    /*
+     * There is machdep.cpu.brand_string we could query but that identifies
+     * the whole CPU and not just the vendor.
+     *
+     * Running on macOS using the arm64 architecture is a pretty safe bet that
+     * we are also running on Apple Silicon (there is the possibility that
+     * this runs in a macOS VM on some other hardware but this is highly unlikely).
+     */
+    int cch = RTPrintf("Apple\n");
 #else
     int cch = RTPrintf("%s\n", RTBldCfgTargetArch());