Changeset 43864 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 13, 2012 2:16:42 PM (12 years ago)

Author:

vboxsync

Message:

VMM: a few compile fixes for VBOX_WITH_RAW_MODE disabled

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• VMMSwitcher.cpp (modified) (3 diffs)
• VMMTests.cpp (modified) (5 diffs)

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

@@ -271 +271 @@
 
 
+#ifdef VBOX_WITH_RAW_MODE
+
 /**
  * Generic switcher code relocator.
@@ -860 +862 @@
 }
 
-
 /**
  * Relocator for the 32-Bit to 32-Bit world switcher.
@@ -986 +987 @@
     return VERR_NOT_IMPLEMENTED;
 }
+
+#endif /* VBOX_WITH_RAW_MODE */
 
 

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

@@ -50 +50 @@
 }
 
+
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
@@ -177 +179 @@
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
+
 
 /* execute the switch. */
 VMMR3DECL(int) VMMDoTest(PVM pVM)
 {
-#if 1
+    int rc = VINF_SUCCESS;
+
+#ifdef VBOX_WITH_RAW_MODE
     PVMCPU pVCpu = &pVM->aCpus[0];
 
-#ifdef NO_SUPCALLR0VMM
+# ifdef NO_SUPCALLR0VMM
     RTPrintf("NO_SUPCALLR0VMM\n");
-    return VINF_SUCCESS;
-#endif
+    return rc;
+# endif
 
     /*
@@ -193 +199 @@
      */
     RTRCPTR RCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (RT_SUCCESS(rc))
     {
@@ -204 +210 @@
         vmmR3DoTrapTest(pVM, 0x3, 1, VINF_EM_DBG_HYPER_ASSERTION,  0xf0f0f0f0, "vmmGCTestTrap3_FaultEIP", "int3 WP");
 
-#if defined(DEBUG_bird) /* guess most people would like to skip these since they write to com1. */
+# if defined(DEBUG_bird) /* guess most people would like to skip these since they write to com1. */
         vmmR3DoTrapTest(pVM, 0x8, 0, VERR_TRPM_PANIC,       0x00000000, "vmmGCTestTrap8_FaultEIP", "#DF [#PG]");
         SELMR3Relocate(pVM); /* this resets the busy flag of the Trap 08 TSS */
         bool f;
         rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "DoubleFault", &f);
-#if !defined(DEBUG_bird)
+# if !defined(DEBUG_bird)
         if (RT_SUCCESS(rc) && f)
-#endif
+# endif
         {
             /* see triple fault warnings in SELM and VMMGC.cpp. */
@@ -217 +223 @@
             SELMR3Relocate(pVM); /* this resets the busy flag of the Trap 08 TSS */
         }
-#endif
+# endif
 
         vmmR3DoTrapTest(pVM, 0xd, 0, VERR_TRPM_DONT_PANIC,  0xf0f0f0f0, "vmmGCTestTrap0d_FaultEIP", "ltr #GP");