Changeset 45533 in vbox for trunk/src/VBox/VMM/VMMR3/TRPM.cpp

Timestamp:

Apr 13, 2013 4:13:22 PM (12 years ago)

Author:

vboxsync

Message:

#ifdef the raw-mode force flags to find more code to #ifdef out.

File:

• trunk/src/VBox/VMM/VMMR3/TRPM.cpp (modified) (20 diffs)

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

@@ -424 +424 @@
 
 
-/** Enable or disable tracking of Guest's IDT. */
+#ifdef VBOX_WITH_RAW_MODE
+/ ** Enable or disable tracking of Guest's IDT. */
 #define TRPM_TRACK_GUEST_IDT_CHANGES
-
 /** Enable or disable tracking of Shadow IDT. */
-#define TRPM_TRACK_SHADOW_IDT_CHANGES
+# define TRPM_TRACK_SHADOW_IDT_CHANGES
+#endif
 
 /** TRPM saved state version. */
@@ -440 +441 @@
 static DECLCALLBACK(int) trpmR3Save(PVM pVM, PSSMHANDLE pSSM);
 static DECLCALLBACK(int) trpmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
+#ifdef TRPM_TRACK_GUEST_IDT_CHANGES
 static DECLCALLBACK(int) trpmR3GuestIDTWriteHandler(PVM pVM, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
+#endif
 
 
@@ -571 +574 @@
     STAM_REG(pVM, &pVM->trpm.s.StatTrap0dRdTsc,             STAMTYPE_COUNTER, "/TRPM/RC/Traps/0d/RdTsc",        STAMUNIT_OCCURENCES, "Number of RDTSC #GPs.");
 
+#ifdef VBOX_WITH_RAW_MODE
     /*
      * Default action when entering raw mode for the first time
@@ -576 +580 @@
     PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
     VMCPU_FF_SET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT);
+#endif
     return 0;
 }
@@ -773 +778 @@
     TRPMR3Relocate(pVM, 0);
 
+#ifdef VBOX_WITH_RAW_MODE
     /*
      * Default action when entering raw mode for the first time
@@ -778 +784 @@
     PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
     VMCPU_FF_SET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT);
+#endif
 }
 
@@ -847 +854 @@
     SSMR3PutBool(pSSM,      pTrpm->fDisableMonitoring);
     PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies 1 VCPU */
-    SSMR3PutUInt(pSSM,      VMCPU_FF_ISSET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT));
+    SSMR3PutUInt(pSSM,      VM_WHEN_RAW_MODE(VMCPU_FF_ISSET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT), 0));
     SSMR3PutMem(pSSM,       &pTrpm->au32IdtPatched[0], sizeof(pTrpm->au32IdtPatched));
     SSMR3PutU32(pSSM, ~0);              /* separator. */
@@ -947 +954 @@
         return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
     }
+#ifdef VBOX_WITH_RAW_MODE
     if (fSyncIDT)
     {
@@ -953 +961 @@
     }
     /* else: cleared by reset call above. */
+#endif
 
     SSMR3GetMem(pSSM, &pTrpm->au32IdtPatched[0], sizeof(pTrpm->au32IdtPatched));
@@ -1000 +1009 @@
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
@@ -1021 +1031 @@
     }
 
-#ifdef VBOX_WITH_RAW_MODE
     if (fRawRing0 && CSAMIsEnabled(pVM))
     {
@@ -1033 +1042 @@
         CSAMR3CheckGates(pVM, 0, 256);
     }
-#endif /* VBOX_WITH_RAW_MODE */
 
     /*
@@ -1046 +1054 @@
     }
 
-#ifdef TRPM_TRACK_GUEST_IDT_CHANGES
+# ifdef TRPM_TRACK_GUEST_IDT_CHANGES
     /*
      * Check if Guest's IDTR has changed.
@@ -1068 +1076 @@
                                              0, trpmR3GuestIDTWriteHandler, "trpmRCGuestIDTWriteHandler", 0, "Guest IDT write access handler");
 
-# ifdef VBOX_WITH_RAW_MODE
             if (rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT)
             {
@@ -1079 +1086 @@
                                                  0, trpmR3GuestIDTWriteHandler, "trpmRCGuestIDTWriteHandler", 0, "Guest IDT write access handler");
             }
-# endif /* VBOX_WITH_RAW_MODE */
 
             AssertRCReturn(rc, rc);
@@ -1087 +1093 @@
         pVM->trpm.s.GuestIdtr = IDTR;
     }
-#endif
+# endif
 
     /*
@@ -1125 +1131 @@
      * Deregister any virtual handlers.
      */
-#ifdef TRPM_TRACK_GUEST_IDT_CHANGES
+# ifdef TRPM_TRACK_GUEST_IDT_CHANGES
     if (pVM->trpm.s.GuestIdtr.pIdt != RTRCPTR_MAX)
     {
@@ -1136 +1142 @@
     }
     pVM->trpm.s.GuestIdtr.cbIdt = 0;
-#endif
-
-#ifdef TRPM_TRACK_SHADOW_IDT_CHANGES
+# endif
+
+# ifdef TRPM_TRACK_SHADOW_IDT_CHANGES
     if (pVM->trpm.s.pvMonShwIdtRC != RTRCPTR_MAX)
     {
@@ -1145 +1151 @@
         pVM->trpm.s.pvMonShwIdtRC = RTRCPTR_MAX;
     }
-#endif
+# endif
 
     PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
@@ -1181 +1187 @@
 }
 
-#ifdef VBOX_WITH_RAW_MODE
 
 /**