Changeset 19773 in vbox

Timestamp:

May 18, 2009 10:07:30 AM (15 years ago)

Author:

vboxsync

Message:

Fixed accidental commits

Location:

trunk/src/VBox/VMM

Files:

• DBGFSym.cpp (modified) (1 diff)
• VMMAll/TMAll.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/DBGFSym.cpp

@@ -25 +25 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DBGF
-#if defined(RT_OS_WINDOWS) && 1 //defined(DEBUG_bird) // enabled this is you want to debug win32 guests, the hypervisor of EFI.
+#if defined(RT_OS_WINDOWS) && 0 //defined(DEBUG_bird) // enabled this is you want to debug win32 guests, the hypervisor of EFI.
 # include <Windows.h>
 # define _IMAGEHLP64

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -672 +672 @@
                     Assert(!pTimer->offPrev);
                     Assert(!pTimer->offNext);
-/*
                     AssertMsg(      pTimer->enmClock != TMCLOCK_VIRTUAL_SYNC
                               ||    pTimer->CTX_SUFF(pVM)->tm.s.fVirtualSyncTicking
                               ||    u64Expire >= pTimer->CTX_SUFF(pVM)->tm.s.u64VirtualSync,
                               ("%RU64 < %RU64 %s\n", u64Expire, pTimer->CTX_SUFF(pVM)->tm.s.u64VirtualSync, R3STRING(pTimer->pszDesc)));
-*/
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);

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

@@ -607 +607 @@
     else
     {
-        Log(("CPU%d: INJ-EI: %x at %RGv\n", pVCpu->idCpu, iGate, (RTGCPTR)pCtx->rip));
+        LogFlow(("INJ-EI: %x at %RGv\n", iGate, (RTGCPTR)pCtx->rip));
         Assert(VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW || !VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
         Assert(VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW || pCtx->eflags.u32 & X86_EFL_IF);
@@ -1076 +1076 @@
 
     u32TrapMask = HWACCM_VMX_TRAP_MASK;
-//#ifndef DEBUG
+#ifndef DEBUG
     if (pVM->hwaccm.s.fNestedPaging)
         u32TrapMask &= ~RT_BIT(X86_XCPT_PF);   /* no longer need to intercept #PF. */
-//#endif
+#endif
 
     /* Also catch floating point exceptions as we need to report them to the guest in a different way. */
@@ -2874 +2874 @@
             errCode |= X86_TRAP_PF_P;
 
-        LogFlow(("EPT Page fault %x at %RGp error code %x\n", (uint32_t)exitQualification, GCPhys, errCode));
+        Log(("EPT Page fault %x at %RGp error code %x\n", (uint32_t)exitQualification, GCPhys, errCode));
 
         /* GCPhys contains the guest physical address of the page fault. */