Changeset 48230 in vbox for trunk/src/VBox/VMM/VMMRZ

Timestamp:

Sep 2, 2013 2:52:50 PM (12 years ago)

Author:

vboxsync

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

88625

Message:

VMM: Propagate errors properly while leaving HM context.

File:

• trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -86 +86 @@
     pVM->vmm.s.pfnRCToHost(VINF_VMM_CALL_HOST);
 #else
+    int rc;
     if (   pVCpu->vmm.s.pfnCallRing3CallbackR0
         && enmOperation != VMMCALLRING3_VM_R0_ASSERTION)
     {
-        pVCpu->vmm.s.pfnCallRing3CallbackR0(pVCpu, enmOperation, pVCpu->vmm.s.pvCallRing3CallbackUserR0);
-    }
-    int rc = vmmR0CallRing3LongJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, VINF_VMM_CALL_HOST);
+        rc = pVCpu->vmm.s.pfnCallRing3CallbackR0(pVCpu, enmOperation, pVCpu->vmm.s.pvCallRing3CallbackUserR0);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+    rc = vmmR0CallRing3LongJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, VINF_VMM_CALL_HOST);
     if (RT_FAILURE(rc))
         return rc;