vbox的更動 69031 路徑 trunk/src/VBox

時間撮記:

2017-10-11 上午05:28:33 (7 年 以前)

作者:

vboxsync

訊息:

VMM/HMSVMR0: Log and nit.

檔案:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (修改) (4 筆差異)

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

@@ -6181 +6181 @@
     {
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitWrmsr);
+        Log4(("MSR Write: idMsr=%#RX32\n", pCtx->ecx));
 
         /* Handle TPR patching; intercepted LSTAR write. */
@@ -6245 +6246 @@
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdmsr);
         Assert(pVmcb->ctrl.u64ExitInfo1 == SVM_EXIT1_MSR_READ);
+        Log4(("MSR Read: idMsr=%#RX32\n", pCtx->ecx));
 
         if (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
@@ -6586 +6588 @@
                   || rcStrict == VINF_EM_RAW_GUEST_TRAP
                   || rcStrict == VINF_EM_RAW_TO_R3
-                  || rcStrict == VINF_TRPM_XCPT_DISPATCHED, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+                  || rcStrict == VINF_TRPM_XCPT_DISPATCHED
+                  || rcStrict == VINF_EM_TRIPLE_FAULT, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
     }
 #endif
@@ -6654 +6657 @@
         /* If event delivery causes an MMIO #NPF, go back to instruction emulation as
            otherwise injecting the original pending event would most likely cause the same MMIO #NPF. */
-        if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
+        if (pVCpu->hm.s.Event.fPending)
             return VINF_EM_RAW_INJECT_TRPM_EVENT;