Changeset 48039 in vbox for trunk

Timestamp:

Aug 23, 2013 7:46:02 PM (12 years ago)

Author:

vboxsync

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

88374

Message:

VMM/HMVMXR0: Burn fix.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -9078 +9078 @@
 HMVMX_EXIT_DECL hmR0VmxExitErrInvalidGuestState(PVMCPU pVCpu, PCPUMCTX pMixedCtx, PVMXTRANSIENT pVmxTransient)
 {
+    int rc = hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
+    AssertRCReturn(rc, rc);
+
+    uint32_t uInvalidReason = hmR0VmxCheckGuestState(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
+    NOREF(uInvalidReason);
+
+#ifdef VBOX_STRICT
     uint32_t       uIntrState;
     HMVMXHCUINTREG uHCReg;
@@ -9083 +9090 @@
     uint32_t       u32Val;
 
-    int rc  = hmR0VmxReadEntryIntrInfoVmcs(pVmxTransient);
-    rc     |= hmR0VmxReadEntryXcptErrorCodeVmcs(pVmxTransient);
-    rc     |= hmR0VmxReadEntryInstrLenVmcs(pVCpu, pVmxTransient);
-    rc     |= VMXReadVmcs32(VMX_VMCS32_GUEST_INTERRUPTIBILITY_STATE, &uIntrState);
-    rc     |= hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
+    rc  = hmR0VmxReadEntryIntrInfoVmcs(pVmxTransient);
+    rc |= hmR0VmxReadEntryXcptErrorCodeVmcs(pVmxTransient);
+    rc |= hmR0VmxReadEntryInstrLenVmcs(pVCpu, pVmxTransient);
+    rc |= VMXReadVmcs32(VMX_VMCS32_GUEST_INTERRUPTIBILITY_STATE, &uIntrState);
     AssertRCReturn(rc, rc);
 
-    uint32_t uInvalidReason = hmR0VmxCheckGuestState(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
-    NOREF(uInvalidReason);
-
-#ifdef VBOX_STRICT
+    Log4(("uInvalidReason                             %u\n", uInvalidReason));
     Log4(("VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO    %#RX32\n", pVmxTransient->uEntryIntrInfo));
     Log4(("VMX_VMCS32_CTRL_ENTRY_EXCEPTION_ERRCODE    %#RX32\n", pVmxTransient->uEntryXcptErrorCode));