Changeset 56381 in vbox

Timestamp:

Jun 12, 2015 11:50:53 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100980

Message:

Stubbed VMMR0_DO_CALL_HYPERVISOR and VMMR0_DO_RAW_RUN when !VBOX_WITH_RAW_MODE.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• include/VBox/vmm/hm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (9 diffs)

trunk/include/VBox/err.h

@@ -89 +89 @@
 /** Invalid CPU index. */
 #define VERR_INVALID_CPU_INDEX              (-1022)
+/** This VirtualBox build does not support raw-mode. */
+#define VERR_RAW_MODE_NOT_SUPPORTED         (-1023)
 /** @} */
 

trunk/include/VBox/vmm/hm.h

@@ -175 +175 @@
 VMMR0_INT_DECL(int)             HMR0TermVM(PVM pVM);
 VMMR0_INT_DECL(int)             HMR0EnableAllCpus(PVM pVM);
+# ifdef VBOX_WITH_RAW_MODE
 VMMR0_INT_DECL(int)             HMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pfVTxDisabled);
 VMMR0_INT_DECL(void)            HMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled);
+# endif
 
 VMMR0_INT_DECL(void)            HMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext,

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

@@ -1626 +1626 @@
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
@@ -1726 +1727 @@
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
 #ifdef VBOX_STRICT
 

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

@@ -875 +875 @@
         case VMMR0_DO_RAW_RUN:
         {
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+#ifdef VBOX_WITH_RAW_MODE
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             /* Some safety precautions first. */
             if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
@@ -882 +883 @@
                 break;
             }
-#endif
+# endif
 
             /*
@@ -902 +903 @@
                  * Commit the CPU identifiers and update the periodict preemption timer if it's active.
                  */
-#ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+# ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
                 CPUMR0SetLApic(pVCpu, iHostCpuSet);
-#endif
+# endif
                 pVCpu->iHostCpuSet = iHostCpuSet;
                 ASMAtomicWriteU32(&pVCpu->idHostCpu, idHostCpu);
@@ -954 +955 @@
                     /* Fire dtrace probe and collect statistics. */
                     VBOXVMM_R0_VMM_RETURN_TO_RING3_RC(pVCpu, CPUMQueryGuestCtxPtr(pVCpu), rc);
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
                     STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
                     vmmR0RecordRC(pVM, pVCpu, rc);
-#endif
+# endif
                 }
                 else
@@ -989 +990 @@
                     pVCpu->vmm.s.iLastGZRc = VERR_INVALID_CPU_INDEX;
             }
+
+#else  /* !VBOX_WITH_RAW_MODE */
+            pVCpu->vmm.s.iLastGZRc = VERR_RAW_MODE_NOT_SUPPORTED;
+#endif
             break;
         }
@@ -1342 +1347 @@
         case VMMR0_DO_CALL_HYPERVISOR:
         {
+#ifdef VBOX_WITH_RAW_MODE
             /*
              * Validate input / context.
@@ -1350 +1356 @@
                 return VERR_INVALID_PARAMETER;
             PVMCPU pVCpu = &pVM->aCpus[idCpu];
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
                 return VERR_PGM_NO_CR3_SHADOW_ROOT;
-#endif
+# endif
 
             /*
@@ -1384 +1390 @@
              * Commit the CPU identifiers.
              */
-#ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+# ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
             CPUMR0SetLApic(pVCpu, iHostCpuSet);
-#endif
+# endif
             pVCpu->iHostCpuSet = iHostCpuSet;
             ASMAtomicWriteU32(&pVCpu->idHostCpu, idHostCpu);
@@ -1419 +1425 @@
             ASMSetFlags(fFlags);
             return rc;
+
+#else  /* !VBOX_WITH_RAW_MODE */
+            return VERR_RAW_MODE_NOT_SUPPORTED;
+#endif
         }