Changeset 78926 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2019 10:02:38 AM (6 years ago)

Author:

vboxsync

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

131047

Message:

VMM/EM: Nested VMX: bugref:9180 Hopefully proper fix for r131045.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1848 +1848 @@
     int rcIrq = VINF_SUCCESS;
 #endif
-    int rc2 = VINF_SUCCESS;
+    int rc2;
 #define UPDATE_RC() \
         do { \
@@ -2230 +2230 @@
                             }
                         }
+                        UPDATE_RC();
                     }
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
@@ -2237 +2238 @@
                         rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitNmi(pVCpu));
                         Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
+                        UPDATE_RC();
                     }
 #endif
@@ -2247 +2249 @@
                                   && rc2 != VINF_SVM_VMEXIT
                                   && rc2 != VINF_NO_CHANGE, ("%Rrc\n", rc2));
+                        UPDATE_RC();
                     }
 #endif
-                    UPDATE_RC();
                 }
                 else