Changeset 103196 in vbox for trunk/src/VBox/ValidationKit/testboxscript

Timestamp:

Feb 5, 2024 9:40:14 AM (14 months ago)

Author:

vboxsync

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

161463

Message:

ValKit/TestBoxHelper.cpp: longmode -> 64bitguest. bugref:10592

File:

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

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

@@ -668 +668 @@
 
 
-/** Print the 'true' if long mode guests are supported, 'false' if not and
+/** Print the 'true' if 64-bits guests are supported, 'false' if not and
  * 'dunno' if we cannot tell. */
-static RTEXITCODE handlerCpuLongMode(int argc, char **argv)
+static RTEXITCODE handlerCpu64BitGuest(int argc, char **argv)
 {
     NOREF(argc); NOREF(argv);
-    HWVIRTTYPE  enmHwVirt  = isHwVirtSupported();
-    bool        fNativeApi = isNativeApiSupported();
-    int         fSupported = 0;
-
-    if (   enmHwVirt != HWVIRTTYPE_NONE
-        || fNativeApi)
-    {
-#if defined(RT_ARCH_AMD64)
-        fSupported = 1; /* We're running long mode, so it must be supported. */
+    int fSupported = 0;
+
+    if (   isHwVirtSupported() != HWVIRTTYPE_NONE
+        || isNativeApiSupported())
+    {
+#if ARCH_BITS == 64
+        fSupported = 1; /* We're running in 64-bit mode, so it must be supported. */
 
 #elif defined(RT_ARCH_X86)
@@ -716 +714 @@
             }
         }
-#elif defined(RT_ARCH_ARM64)
-        fSupported = 1; /** @todo LongMode is a misnomer here but in general means 64-bit guest capable. */
 #endif
     }
@@ -817 +813 @@
         { "cpuhwvirt",      handlerCpuHwVirt,       true },
         { "nestedpaging",   handlerCpuNestedPaging, true },
-        { "longmode",       handlerCpuLongMode,     true },
+        { "64bitguest",     handlerCpu64BitGuest,   true },
+        { "longmode",       handlerCpu64BitGuest,   true }, /* legacy name */
         { "nativeapi",      handlerNativeApi,       true },
         { "memsize",        handlerMemSize,         true },