Changeset 75828 in vbox for trunk/src/VBox

Timestamp:

Nov 30, 2018 8:26:15 AM (6 years ago)

Author:

vboxsync

Message:

HVMSVMR0: Fixes to mesa hack.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -7837 +7837 @@
  * @sa      hmR0VmxIsMesaDrvGp
  */
-DECLINLINE(bool) hmR0SvmIsMesaDrvGp(PVMCPU pVCpu, PSVMTRANSIENT pSvmTransient, PCPUMCTX pCtx, PCSVMVMCB pVmcb)
+DECLINLINE(bool) hmR0SvmIsMesaDrvGp(PVMCPU pVCpu, PCPUMCTX pCtx, PCSVMVMCB pVmcb)
 {
     /* Check magic and port. */
@@ -7848 +7848 @@
 
     /* Check that it is #GP(0). */
-    if (pSvmTransient->u64ExitCode != 0)
+    if (pVmcb->ctrl.u64ExitInfo1 != 0)
         return false;
 
@@ -7898 +7898 @@
     PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
     if (   !pVCpu->hm.s.fTrapXcptGpForLovelyMesaDrv
-        || hmR0SvmIsMesaDrvGp(pVCpu, pSvmTransient, pCtx, pVmcb))
+        || !hmR0SvmIsMesaDrvGp(pVCpu, pCtx, pVmcb))
     {
         SVMEVENT Event;
@@ -7906 +7906 @@
         Event.n.u8Vector         = X86_XCPT_GP;
         Event.n.u1ErrorCodeValid = 1;
-        Event.n.u32ErrorCode     = (uint32_t)pSvmTransient->u64ExitCode;
+        Event.n.u32ErrorCode     = (uint32_t)pVmcb->ctrl.u64ExitInfo1;
         hmR0SvmSetPendingEvent(pVCpu, &Event, 0 /* GCPtrFaultAddress */);
         return VINF_SUCCESS;