Changeset 48210 in vbox for trunk/src

Timestamp:

Aug 30, 2013 10:22:15 PM (11 years ago)

Author:

vboxsync

Message:

VMM: More naming fixes.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (2 diffs)
• VMMR3/HM.cpp (modified) (3 diffs)
• include/HMInternal.h (modified) (1 diff)
• testcase/tstVMStructSize.cpp (modified) (1 diff)

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

@@ -114 +114 @@
 
         /** Host CR4 value (set by ring-0 VMX init) */
+        /** @todo This isn't used for anything relevant. Remove later? */
         uint64_t                    u64HostCr4;
 
@@ -1249 +1250 @@
     pVM->hm.s.vmx.cPreemptTimerShift    = g_HvmR0.vmx.cPreemptTimerShift;
     pVM->hm.s.vmx.msr.feature_ctrl      = g_HvmR0.vmx.msr.u64FeatureCtrl;
-    pVM->hm.s.vmx.hostCR4               = g_HvmR0.vmx.u64HostCr4;
-    pVM->hm.s.vmx.hostEFER              = g_HvmR0.vmx.u64HostEfer;
+    pVM->hm.s.vmx.u64HostCr4            = g_HvmR0.vmx.u64HostCr4;
+    pVM->hm.s.vmx.u64HostEfer           = g_HvmR0.vmx.u64HostEfer;
     pVM->hm.s.vmx.msr.vmx_basic_info    = g_HvmR0.vmx.msr.u64BasicInfo;
     pVM->hm.s.vmx.msr.vmx_pin_ctls      = g_HvmR0.vmx.msr.vmxPinCtls;

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

@@ -976 +976 @@
 
     LogRel(("HM: Using VT-x implementation 2.0!\n"));
-    LogRel(("HM: Host CR4                        = %#RX64\n", pVM->hm.s.vmx.hostCR4));
+    LogRel(("HM: Host CR4                        = %#RX64\n", pVM->hm.s.vmx.u64HostCr4));
     LogRel(("HM: MSR_IA32_FEATURE_CONTROL        = %#RX64\n", pVM->hm.s.vmx.msr.feature_ctrl));
     LogRel(("HM: MSR_IA32_VMX_BASIC_INFO         = %#RX64\n", pVM->hm.s.vmx.msr.vmx_basic_info));
@@ -1258 +1258 @@
 #if RT_ARCH_X86
         if (   !CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE)
-            || !(pVM->hm.s.vmx.hostEFER & MSR_K6_EFER_NXE))
+            || !(pVM->hm.s.vmx.u64HostEfer & MSR_K6_EFER_NXE))
             LogRel(("NX is only supported for 64-bit guests!\n"));
 #endif
@@ -1267 +1267 @@
     /** @todo this needs to be fixed properly!! */
     else if (   CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE)
-             && (pVM->hm.s.vmx.hostEFER & MSR_K6_EFER_NXE))
+             && (pVM->hm.s.vmx.u64HostEfer & MSR_K6_EFER_NXE))
         CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
     else

trunk/src/VBox/VMM/include/HMInternal.h

@@ -354 +354 @@
 #endif
         /** Host CR4 value (set by ring-0 VMX init) */
-        uint64_t                    hostCR4;
+        uint64_t                    u64HostCr4;
 
         /** Host EFER value (set by ring-0 VMX init) */
-        uint64_t                    hostEFER;
+        uint64_t                    u64HostEfer;
 
         /** VMX MSR values */

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -405 +405 @@
     /* hm - 32-bit gcc won't align uint64_t naturally, so check. */
     CHECK_MEMBER_ALIGNMENT(HM, uMaxAsid, 8);
-    CHECK_MEMBER_ALIGNMENT(HM, vmx.hostCR4, 8);
+    CHECK_MEMBER_ALIGNMENT(HM, vmx.u64HostCr4, 8);
     CHECK_MEMBER_ALIGNMENT(HM, vmx.msr.feature_ctrl, 8);
     CHECK_MEMBER_ALIGNMENT(HM, StatTprPatchSuccess, 8);