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

Timestamp:

Apr 24, 2013 2:00:35 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix macro renaming breakage.

File:

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

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

@@ -38 +38 @@
 #define HMVMX_SAVE_FULL_GUEST_STATE
 #define HMVMX_SYNC_FULL_GUEST_STATE
-#define HMVMX_TRAP_ALL_EXCEPTIONS
+#define HMVMX_ALWAYS_TRAP_ALL_XCPTS
+#define HMVMX_ALWAYS_TRAP_PF
 #endif
 
@@ -2784 +2785 @@
 
         /* Additional intercepts for debugging, define these yourself explicitly. */
-#ifdef VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS
+#ifdef HMVMX_ALWAYS_TRAP_ALL_XCPTS
         pVCpu->hm.s.vmx.u32XcptBitmap |=   RT_BIT(X86_XCPT_BP)
                                          | RT_BIT(X86_XCPT_DB)
@@ -2795 +2796 @@
                                          | RT_BIT(X86_XCPT_PF)
                                          | RT_BIT(X86_XCPT_MF);
-#elif defined(VBOX_ALWAYS_TRAP_PF)
+#elif defined(HMVMX_ALWAYS_TRAP_PF)
         pVCpu->hm.s.vmx.u32XcptBitmap    |= RT_BIT(X86_XCPT_PF)
 #endif
@@ -3109 +3110 @@
     else if (!pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
     {
-#ifndef VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS
+#ifndef HMVMX_ALWAYS_TRAP_ALL_XCPTS
         pVCpu->hm.s.vmx.u32XcptBitmap &= ~RT_BIT(X86_XCPT_DB);
 #endif
@@ -6966 +6967 @@
                 case X86_XCPT_DB: rc = hmR0VmxExitXcptDB(pVCpu, pMixedCtx, pVmxTransient);      break;
                 case X86_XCPT_BP: rc = hmR0VmxExitXcptBP(pVCpu, pMixedCtx, pVmxTransient);      break;
-#ifdef VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS
+#ifdef HMVMX_ALWAYS_TRAP_ALL_XCPTS
                 case X86_XCPT_XF: STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestXF);
                                   rc = hmR0VmxExitXcptGeneric(pVCpu, pMixedCtx, pVmxTransient); break;
@@ -8491 +8492 @@
     VMX_VALIDATE_EXIT_XCPT_HANDLER_PARAMS();
 
-#ifndef VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS
+#ifndef HMVMX_ALWAYS_TRAP_ALL_XCPTS
     Assert(!CPUMIsGuestFPUStateActive(pVCpu));
 #endif
@@ -8534 +8535 @@
     if (!pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
     {
-#ifdef VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS
+#ifdef HMVMX_ALWAYS_TRAP_ALL_XCPTS
         /* If the guest is not in real-mode or we have unrestricted execution support, reflect #GP to the guest. */
         rc  = hmR0VmxReadExitIntrInfoVmcs(pVCpu, pVmxTransient);
@@ -8793 +8794 @@
     AssertRCReturn(rc, rc);
 
-#if defined(VBOX_ALWAYS_TRAP_ALL_EXCEPTIONS) || defined(VBOX_ALWAYS_TRAP_PF)
+#if defined(HMVMX_ALWAYS_TRAP_ALL_XCPTS) || defined(HMVMX_ALWAYS_TRAP_PF)
     if (pVM->hm.s.fNestedPaging)
     {