Changeset 48023 in vbox

Timestamp:

Aug 23, 2013 12:05:17 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Additional logging to track VMCS state changes.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (5 diffs)
• VMMR3/HM.cpp (modified) (2 diffs)

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

@@ -4133 +4133 @@
                 else
                     Log4(("InstrError Desc.    Range exceeded %u\n", HMVMX_INSTR_ERROR_MAX));
+                Log4(("Entered host CPU   %u\n", pVCpu->hm.s.vmx.LastError.idEnteredCpu));
+                Log4(("Current host CPU   %u\n", pVCpu->hm.s.vmx.LastError.idCurrentCpu));
 
                 /* VMX control bits. */
@@ -4189 +4191 @@
                 Log4(("Old Guest Rflags %#RX32 New %#RX32\n", pCtx->eflags.u32, u32Val));
                 rc = VMXReadVmcs32(VMX_VMCS16_GUEST_FIELD_VPID, &u32Val);   AssertRC(rc);
-                Log4(("VMX_VMCS16_GUEST_FIELD_VPID %u\n", u32Val));
+                Log4(("VMX_VMCS16_GUEST_FIELD_VPID             %u\n", u32Val));
 
                 /* Host bits. */
@@ -6138 +6140 @@
             AssertRC(rc);
             pVCpu->hm.s.vmx.uVmcsState = HMVMX_VMCS_STATE_CLEAR;
-        }
+            Log4Func(("Cleared Vmcs\n"));
+        }
+
         pVCpu->hm.s.vmx.uVmcsState &= ~HMVMX_VMCS_STATE_LAUNCHED;
         pVCpu->hm.s.fLeaveDone = true;
@@ -6849 +6853 @@
     if (RT_FAILURE(rc))
         return rc;
+
     pVCpu->hm.s.vmx.uVmcsState = HMVMX_VMCS_STATE_ACTIVE;
-
     pVCpu->hm.s.fLeaveDone = false;
+    Log4Func(("Activated: HostCpuId=%u\n", RTMpCpuId()));
+
     return VINF_SUCCESS;
 }
@@ -6885 +6891 @@
             hmR0VmxLeave(pVM, pVCpu, pMixedCtx);
 
-            int rc;
-#if 0
-            /* Flush VMCS CPU state to the VMCS region in memory. */
-            if (pVCpu->hm.s.vmx.uVmcsState & HMVMX_VMCS_STATE_ACTIVE)
-            {
-                rc = VMXClearVmcs(pVCpu->hm.s.vmx.HCPhysVmcs);
-                AssertRC(rc);
-                pVCpu->hm.s.vmx.uVmcsState = HMVMX_VMCS_STATE_CLEAR;
-            }
-            pVCpu->hm.s.vmx.uVmcsState &= ~HMVMX_VMCS_STATE_LAUNCHED;
-#endif
-
             /* Leave HM context, takes care of local init (term). */
-            rc = HMR0LeaveEx(pVCpu);
+            int rc = HMR0LeaveEx(pVCpu);
             AssertRC(rc);
 

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

@@ -2892 +2892 @@
                                                                                 pVCpu->hm.s.vmx.HCPhysVmcs));
                 LogRel(("HM: CPU[%u] Current VMCS version %#x\n", i, pVCpu->hm.s.vmx.LastError.u32VMCSRevision));
-                LogRel(("HM: CPU[%u] Entered Cpu          %u\n",  i, pVCpu->hm.s.vmx.LastError.idEnteredCpu));
-                LogRel(("HM: CPU[%u] Current Cpu          %u\n",  i, pVCpu->hm.s.vmx.LastError.idCurrentCpu));
+                LogRel(("HM: CPU[%u] Entered Host Cpu     %u\n",  i, pVCpu->hm.s.vmx.LastError.idEnteredCpu));
+                LogRel(("HM: CPU[%u] Current Host Cpu     %u\n",  i, pVCpu->hm.s.vmx.LastError.idCurrentCpu));
                 break;
 
@@ -2904 +2904 @@
                     || pVM->aCpus[i].hm.s.vmx.LastError.u32InstrError == VMX_ERROR_VMRESUME_NON_LAUNCHED_VMCS)
                 {
-                    LogRel(("HM: CPU[%u] Entered Cpu          %u\n",  i, pVCpu->hm.s.vmx.LastError.idEnteredCpu));
-                    LogRel(("HM: CPU[%u] Current Cpu          %u\n",  i, pVCpu->hm.s.vmx.LastError.idCurrentCpu));
+                    LogRel(("HM: CPU[%u] Entered Host Cpu     %u\n",  i, pVCpu->hm.s.vmx.LastError.idEnteredCpu));
+                    LogRel(("HM: CPU[%u] Current Host Cpu     %u\n",  i, pVCpu->hm.s.vmx.LastError.idCurrentCpu));
                 }
                 else if (pVM->aCpus[i].hm.s.vmx.LastError.u32InstrError == VMX_ERROR_VMENTRY_INVALID_CONTROL_FIELDS)