Changeset 105843 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 23, 2024 9:01:50 AM (5 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8.cpp: Don't throw an error if the NEM based gic is not configured, bugref:10747

File:

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

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

@@ -830 +830 @@
                         "vbar_el1=%016VR{vbar_el1}\n"
                         );
-        char szInstr[256]; RT_ZERO(szInstr);
-#if 0
-        DBGFR3DisasInstrEx(pVM->pUVM, pVCpu->idCpu, 0, 0,
-                           DBGF_DISAS_FLAGS_CURRENT_GUEST | DBGF_DISAS_FLAGS_DEFAULT_MODE,
-                           szInstr, sizeof(szInstr), NULL);
-#endif
-        Log3(("%s%s\n", szRegs, szInstr));
-
         if (pVM->nem.s.fEl2Enabled)
         {
+            Log3(("%s\n", szRegs));
             DBGFR3RegPrintf(pVM->pUVM, pVCpu->idCpu, &szRegs[0], sizeof(szRegs),
                             "sp_el2=%016VR{sp_el2} elr_el2=%016VR{elr_el2}\n"
@@ -850 +843 @@
                             );
         }
-        Log3(("%s%s\n", szRegs));
+        char szInstr[256]; RT_ZERO(szInstr);
+        DBGFR3DisasInstrEx(pVM->pUVM, pVCpu->idCpu, 0, 0,
+                           DBGF_DISAS_FLAGS_CURRENT_GUEST | DBGF_DISAS_FLAGS_DEFAULT_MODE,
+                           szInstr, sizeof(szInstr), NULL);
+        Log3(("%s%s\n", szRegs, szInstr));
     }
 }
@@ -1174 +1171 @@
     //PCFGMNODE pGicDev = CFGMR3GetChild(CFGMR3GetRoot(pVM), "Devices/gic/0");
     PCFGMNODE pGicCfg = CFGMR3GetChild(CFGMR3GetRoot(pVM), "Devices/gic-nem/0/Config");
+    AssertPtrReturn(pGicCfg, VERR_NEM_IPE_5);
 
     hv_gic_config_t hGicCfg = hv_gic_config_create();
@@ -1416 +1414 @@
     AssertReturn(pVM->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API, VERR_WRONG_ORDER);
 
-    /* Need to create the GIC here before any vCPU is created according to the Apple docs. */
-    if (hv_gic_create)
+    /*
+     * Need to create the GIC here if the NEM variant is configured
+     * before any vCPU is created according to the Apple docs.
+     */
+    if (   hv_gic_create
+        && CFGMR3GetChild(CFGMR3GetRoot(pVM), "Devices/gic-nem/0"))
     {
         int rc = nemR3DarwinGicCreate(pVM);