Changeset 67720 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

Timestamp:

Jun 30, 2017 9:35:10 AM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested Hw.virt: Don't increment RIP if VMRUN causes a #VMEXIT (happens typically when injecting an event
as part of VM-entry). Fixes NT4 nested-guest BSOD.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -676 +676 @@
                  *        NRIP for the nested-guest to calculate the instruction length
                  *        below. */
-                LogFlow(("iemSvmVmrun: InjectingEvent: uVector=%u enmType=%d uErrorCode=%u cr2=%#RX64\n", uVector, enmType,
-                         uErrorCode, pCtx->cr2));
+                LogFlow(("iemSvmVmrun: Injecting event: %04x:%08RX64 uVector=%#x enmType=%d uErrorCode=%u cr2=%#RX64\n",
+                         pCtx->cs.Sel, pCtx->rip, uVector, enmType,uErrorCode, pCtx->cr2));
                 rcStrict = IEMInjectTrap(pVCpu, uVector, enmType, uErrorCode, pCtx->cr2, 0 /* cbInstr */);
             }
             else
-                LogFlow(("iemSvmVmrun: Entering nested-guest at %04x:%08RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 efer=%#RX64 efl=%#RX64\n",
+                LogFlow(("iemSvmVmrun: Entered nested-guest: %04x:%08RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 efer=%#RX64 efl=%#x\n",
                          pCtx->cs.Sel, pCtx->rip, pCtx->cr0, pCtx->cr3, pCtx->cr4, pCtx->msrEFER, pCtx->rflags.u64));
 
@@ -1133 +1133 @@
 
     VBOXSTRICTRC rcStrict = iemSvmVmrun(pVCpu, pCtx, cbInstr, GCPhysVmcb);
-    if (rcStrict == VINF_SVM_VMEXIT)
-    {
-        iemRegAddToRipAndClearRF(pVCpu, cbInstr);
-        rcStrict = VINF_SUCCESS;
-    }
-    else if (rcStrict == VERR_SVM_VMEXIT_FAILED)
+    if (rcStrict == VERR_SVM_VMEXIT_FAILED)
+    {
+        Assert(!CPUMIsGuestInSvmNestedHwVirtMode(pCtx));
         rcStrict = iemInitiateCpuShutdown(pVCpu);
+    }
     return rcStrict;
 }