Changeset 86117 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 14, 2020 8:03:03 AM (4 years ago)

Author:

vboxsync

Message:

NEM: Some adjustments to r140349.

File:

• trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -3346 +3346 @@
             break;
 
+        /*
+         * Workaround the lovely mesa driver assuming that vmsvga means vmware
+         * hypervisor and tries to log stuff to the host.
+         */
         case X86_XCPT_GP:
-        {
-            PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
+            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionGp);
+            /** @todo r=bird: Need workaround in IEM for this, right?
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_XCPT_GP),
+                             pMsg->Header.Rip + pMsg->Header.CsSegment.Base, ASMReadTSC()); */
             if (   !pVCpu->hm.s.fTrapXcptGpForLovelyMesaDrv
-                || !nemHcWinIsMesaDrvGp(pVCpu, pCtx, pMsg->InstructionBytes, pMsg->InstructionByteCount))
+                || !nemHcWinIsMesaDrvGp(pVCpu, &pVCpu->cpum.GstCtx, pMsg->InstructionBytes, pMsg->InstructionByteCount))
             {
-                /** @todo Need to emulate instruction or we get a triple fault when trying to inject the #GP... */
+# if 1 /** @todo Need to emulate instruction or we get a triple fault when trying to inject the #GP... */
                 rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx), pMsg->Header.Rip,
                                                         pMsg->InstructionBytes, pMsg->InstructionByteCount);
@@ -3358 +3364 @@
                       pVCpu->idCpu, pMsg->Header.CsSegment.Selector, pMsg->Header.Rip,
                       nemHCWinExecStateToLogStr(&pMsg->Header), VBOXSTRICTRC_VAL(rcStrict) ));
-                STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionUdHandled);
                 return rcStrict;
+# else
+                break;
+# endif
             }
-            return nemHcWinHandleMesaDrvGp(pVCpu, pCtx);
-        }
+            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionGpMesa);
+            return nemHcWinHandleMesaDrvGp(pVCpu, &pVCpu->cpum.GstCtx);
 
         /*
@@ -3464 +3472 @@
             break;
 
+        /*
+         * Workaround the lovely mesa driver assuming that vmsvga means vmware
+         * hypervisor and tries to log stuff to the host.
+         */
         case X86_XCPT_GP:
-        {
-            PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
+            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionGp);
+            /** @todo r=bird: Need workaround in IEM for this, right?
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_XCPT_GP),
+                             pExit->VpContext.Rip + pExit->VpContext.Cs.Base, ASMReadTSC()); */
             if (   !pVCpu->nem.s.fTrapXcptGpForLovelyMesaDrv
-                || !nemHcWinIsMesaDrvGp(pVCpu, pCtx, pExit->VpException.InstructionBytes,
+                || !nemHcWinIsMesaDrvGp(pVCpu, &pVCpu->cpum.GstCtx, pExit->VpException.InstructionBytes,
                                         pExit->VpException.InstructionByteCount))
             {
-                /** @todo Need to emulate instruction or we get a triple fault when trying to inject the #GP... */
+# if 1 /** @todo Need to emulate instruction or we get a triple fault when trying to inject the #GP... */
                 rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx), pExit->VpContext.Rip,
                                                         pExit->VpException.InstructionBytes,
@@ -3480 +3494 @@
                 STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionUdHandled);
                 return rcStrict;
+# else
+                break;
+# endif
             }
-            return nemHcWinHandleMesaDrvGp(pVCpu, pCtx);
-        }
+            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionGpMesa);
+            return nemHcWinHandleMesaDrvGp(pVCpu, &pVCpu->cpum.GstCtx);
 
         /*