Changeset 106761 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 28, 2024 8:57:07 PM (4 months ago)

Author:

vboxsync

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

165646

Message:

VMM/NEM-darwin/arm64: Translate the HV_xxxx status code to a string in the error message. Set error message should we fail to load the Hypervisor framework. Better logging wrt optional functions that aren't found. jiraref:VBP-1253

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -604 +604 @@
 
     return VERR_IPE_UNEXPECTED_STATUS;
+}
+
+
+/** Puts a name to a hypervisor framework status code. */
+static const char *nemR3DarwinHvStatusName(hv_return_t hrc)
+{
+    switch (hrc)
+    {
+        RT_CASE_RET_STR(HV_SUCCESS);
+        RT_CASE_RET_STR(HV_ERROR);
+        RT_CASE_RET_STR(HV_BUSY);
+        RT_CASE_RET_STR(HV_BAD_ARGUMENT);
+        RT_CASE_RET_STR(HV_ILLEGAL_GUEST_STATE);
+        RT_CASE_RET_STR(HV_NO_RESOURCES);
+        RT_CASE_RET_STR(HV_NO_DEVICE);
+        RT_CASE_RET_STR(HV_DENIED);
+        RT_CASE_RET_STR(HV_UNSUPPORTED);
+    }
+    return "";
 }
 
@@ -1064 +1083 @@
             int rc2 = RTLdrGetSymbol(hMod, g_aImports[i].pszName, (void **)g_aImports[i].ppfn);
             if (RT_SUCCESS(rc2))
-            {
-                LogRel(("NEM:  info: Found optional import Hypervisor!%s.\n",
-                        g_aImports[i].pszName));
-            }
+                LogRel(("NEM:  info: Found optional import Hypervisor!%s.\n", g_aImports[i].pszName));
             else
             {
                 *g_aImports[i].ppfn = NULL;
-
-                LogRel(("NEM:  info: Failed to import Hypervisor!%s: %Rrc\n",
-                        g_aImports[i].pszName, rc2));
+                LogRel(("NEM:  info: Optional import Hypervisor!%s not found: %Rrc\n", g_aImports[i].pszName, rc2));
             }
         }
-        if (RT_SUCCESS(rc))
-        {
-            Assert(!RTErrInfoIsSet(pErrInfo));
-        }
-
+        Assert(RT_SUCCESS(rc) && !RTErrInfoIsSet(pErrInfo));
         RTLdrClose(hMod);
     }
@@ -1243 +1253 @@
     int rc = nemR3DarwinLoadHv(pErrInfo);
     if (RT_FAILURE(rc))
+    {
+        if ((fForced || !fFallback) && RTErrInfoIsSet(pErrInfo))
+            return VMSetError(pVM, rc, RT_SRC_POS, "%s", pErrInfo->pszMsg);
         return rc;
+    }
 
     /*
@@ -1250 +1264 @@
      */
     PCFGMNODE pCfgCpum = CFGMR3GetChild(CFGMR3GetRoot(pVM), "CPUM/");
+
     hv_vm_config_t hVmCfg = NULL;
-
     if (   hv_vm_config_create
         && hv_vm_config_get_el2_supported)
@@ -1274 +1288 @@
                 if (hrc != HV_SUCCESS)
                     return VMSetError(pVM, VERR_CPUM_INVALID_HWVIRT_CONFIG, RT_SRC_POS,
-                                      "Cannot enable nested virtualization (hrc=%#x)!\n", hrc);
-                else
-                {
-                    pVM->nem.s.fEl2Enabled = true;
-                    LogRel(("NEM: Enabled nested virtualization (EL2) support\n"));
-                }
+                                      "Cannot enable nested virtualization: hrc=%#x %s!\n", hrc, nemR3DarwinHvStatusName(hrc));
+                pVM->nem.s.fEl2Enabled = true;
+                LogRel(("NEM: Enabled nested virtualization (EL2) support\n"));
             }
         }
@@ -1311 +1322 @@
         Log(("NEM: Marked active!\n"));
         PGMR3EnableNemMode(pVM);
-    }
-    else
-        rc = RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
-                           "hv_vm_create() failed: %#x", hrc);
+        return VINF_SUCCESS;
+    }
+
+    rc = RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED, "hv_vm_create() failed: %#x %s", hrc, nemR3DarwinHvStatusName(hrc));
 
     /*