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

Timestamp:

Jun 8, 2023 12:39:40 PM (20 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8.cpp: VM reset and poweroff fixes, bugref:10390

File:

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

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

@@ -1005 +1005 @@
 #endif
 
-    RT_NOREF(pVM);
     VBOXSTRICTRC rcStrict = VINF_SUCCESS;
     if (u16Imm == 0)
@@ -1023 +1022 @@
                     break;
                 case ARM_PSCI_FUNC_ID_SYSTEM_OFF:
-                    rcStrict = VINF_EM_OFF;
+                    rcStrict = VMR3PowerOff(pVM->pUVM);
                     break;
                 case ARM_PSCI_FUNC_ID_SYSTEM_RESET:
-                    rcStrict = VINF_EM_RESET;
+                case ARM_PSCI_FUNC_ID_SYSTEM_RESET2:
+                {
+                    bool fHaltOnReset;
+                    int rc = CFGMR3QueryBool(CFGMR3GetChild(CFGMR3GetRoot(pVM), "PDM"), "HaltOnReset", &fHaltOnReset);
+                    if (RT_SUCCESS(rc) && fHaltOnReset)
+                    {
+                        Log(("nemR3DarwinHandleExitExceptionTrappedHvcInsn: Halt On Reset!\n"));
+                        rc = VINF_EM_HALT;
+                    }
+                    else
+                    {
+                        /** @todo pVM->pdm.s.fResetFlags = fFlags; */
+                        VM_FF_SET(pVM, VM_FF_RESET);
+                        rc = VINF_EM_RESET;
+                    }
                     break;
+                }
                 case ARM_PSCI_FUNC_ID_CPU_ON:
                 {