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

Timestamp:

Mar 5, 2020 1:43:54 PM (5 years ago)

Author:

vboxsync

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

136347

Message:

VMM/HMSVMR0: If the #NPF exit handler requested emulation of the current instruction and an event caused the #NPF
in the first place, don't lose the original event. Rather than emulate, re-inject the original event through IEM.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -6880 +6880 @@
      */
     if (pVCpu->hm.s.Event.fPending)
+    {
         STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectReflectNPF);
+
+        /*
+         * If the #NPF handler requested emulation of the instruction, ignore it.
+         * We need to re-inject the original event so as to not lose it.
+         * Reproducible when booting ReactOS 0.4.12 with BTRFS (installed using BootCD,
+         * LiveCD is broken for other reasons).
+         */
+        if (rc == VINF_EM_RAW_EMULATE_INSTR)
+            rc = VINF_EM_RAW_INJECT_TRPM_EVENT;
+    }
 
     return rc;