Changeset 15414 in vbox for trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

Timestamp:

Dec 13, 2008 4:33:30 AM (16 years ago)

Author:

vboxsync

Message:

Corrected VBOX_WITH_HYBIRD_32BIT_KERNEL to VBOX_WITH_HYBRID_32BIT_KERNEL and moved it into src/VBox/VMM.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (13 diffs)

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

@@ -46 +46 @@
 #if defined(RT_ARCH_AMD64)
 # define VMX_IS_64BIT_HOST_MODE()   (true)
-#elif defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+#elif defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 # define VMX_IS_64BIT_HOST_MODE()   (g_fVMXIs64bitHost != 0)
 #else
@@ -59 +59 @@
 static uint32_t const g_aIOOpAnd[4] = {0xff, 0xffff, 0, 0xffffffff};
 
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
 /** See HWACCMR0A.asm. */
 extern "C" uint32_t g_fVMXIs64bitHost;
@@ -833 +833 @@
         /* Control registers */
         rc  = VMXWriteVMCS(VMX_VMCS_HOST_CR0,               ASMGetCR0());
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -852 +852 @@
 
         /* Selector registers. */
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -894 +894 @@
 
         /* GDTR & IDTR */
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -927 +927 @@
         }
 
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -951 +951 @@
 
         /* FS and GS base. */
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -966 +966 @@
         rc  = VMXWriteVMCS(VMX_VMCS32_HOST_SYSENTER_CS,       ASMRdMsr_Low(MSR_IA32_SYSENTER_CS));
         Log2(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_CS)));
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (VMX_IS_64BIT_HOST_MODE())
         {
@@ -1110 +1110 @@
     /* Save debug controls (dr7 & IA32_DEBUGCTL_MSR) (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
     val |= VMX_VMCS_CTRL_EXIT_CONTROLS_SAVE_DEBUG;
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (VMX_IS_64BIT_HOST_MODE())
         val |= VMX_VMCS_CTRL_EXIT_CONTROLS_HOST_AMD64;
@@ -1561 +1561 @@
 #if !defined(VBOX_ENABLE_64_BITS_GUESTS)
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
-#elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+#elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
         pVCpu->hwaccm.s.vmx.pfnStartVM  = VMXR0SwitcherStartVM64;
 #else
-# ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
         if (!pVM->hwaccm.s.fAllow64BitGuests)
             return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
@@ -3487 +3487 @@
             Log(("VMX_VMCS_HOST_RIP %RHv\n", val));
 
-# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
             if (VMX_IS_64BIT_HOST_MODE())
             {
@@ -3509 +3509 @@
 }
 
-#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 /**
  * Prepares for and executes VMLAUNCH (64 bits guest mode)
@@ -3628 +3628 @@
 }
 
-#endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) */
+#endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) */