Changeset 55040 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Mar 31, 2015 3:15:37 PM (10 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Fix #UD hypercall handling for GIM KVM.

File:

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

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

@@ -5002 +5002 @@
     int rc = hmR0SvmEmulateMovTpr(pVCpu->CTX_SUFF(pVM), pVCpu, pCtx);
     if (rc == VINF_SUCCESS)
+    {
         HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
+        return VINF_SUCCESS;
+    }
     else if (rc == VERR_NOT_FOUND)
     {
         /* Handle GIM provider hypercalls. */
-        rc = VERR_NOT_SUPPORTED;
         if (GIMAreHypercallsEnabled(pVCpu))
+        {
             rc = GIMHypercall(pVCpu, pCtx);
-
-        /* If the hypercall changes anything other than guest general-purpose registers,
-           we would need to reload the guest changed bits on VM-reentry. */
-    }
-
-    if (RT_SUCCESS(rc))
-        hmR0SvmUpdateRip(pVCpu, pCtx, 3);
-    else
-        hmR0SvmSetPendingXcptUD(pVCpu);
+            /* If the hypercall changes anything other than guest general-purpose registers,
+               we would need to reload the guest changed bits on VM-reentry. */
+            if (RT_SUCCESS(rc))
+            {
+                hmR0SvmUpdateRip(pVCpu, pCtx, 3);
+                return VINF_SUCCESS;
+            }
+        }
+    }
+
+    hmR0SvmSetPendingXcptUD(pVCpu);
     return VINF_SUCCESS;
 }
@@ -5222 +5227 @@
     HMSVM_CHECK_EXIT_DUE_TO_EVENT_DELIVERY();
 
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestUD);
-
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     if (   pVM->hm.s.fTrapXcptUD
@@ -5231 +5234 @@
         hmR0SvmSetPendingXcptUD(pVCpu);
 
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestUD);
     return VINF_SUCCESS;
 }