Changeset 95048 in vbox

Timestamp:

May 20, 2022 7:28:15 AM (3 years ago)

Author:

vboxsync

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

151511

Message:

GCM: Corrected return codes.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)

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

@@ -6856 +6856 @@
         if (rc2 == VINF_SUCCESS)
             rcStrict = VINF_SUCCESS;    /* Restart instruction with modified guest register context. */
-        else if (rc2 == VINF_EM_RAW_GUEST_TRAP)
+        else if (rc2 == VERR_NOT_FOUND)
             rcStrict = VERR_NOT_FOUND;  /* Deliver the exception. */
         else
@@ -6865 +6865 @@
 
     /* If the GCM #DE exception handler didn't succeed or wasn't needed, raise #DE. */
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(rcStrict))
     {
         vmxHCSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),

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

@@ -8405 +8405 @@
         if (rcStrict == VINF_SUCCESS)
             rc = VINF_SUCCESS;      /* Restart instruction with modified guest register context. */
-        else if (rcStrict == VINF_EM_RAW_GUEST_TRAP)
+        else if (rcStrict == VERR_NOT_FOUND)
             rc = VERR_NOT_FOUND;    /* Deliver the exception. */
         else