Changeset 43771 in vbox

Timestamp:

Oct 29, 2012 6:00:54 PM (13 years ago)

Author:

vboxsync

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

81706

Message:

VMM/VMMR0: HM bits.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -756 +756 @@
 #define VMX_VMCS64_CTRL_MSR_BITMAP_HIGH                           0x2005
 
-#define VMX_VMCS64_CTRL_VMEXIT_MSR_STORE_FULL                     0x2006
-#define VMX_VMCS64_CTRL_VMEXIT_MSR_STORE_HIGH                     0x2007
-#define VMX_VMCS64_CTRL_VMEXIT_MSR_LOAD_FULL                      0x2008
-#define VMX_VMCS64_CTRL_VMEXIT_MSR_LOAD_HIGH                      0x2009
-
-#define VMX_VMCS64_CTRL_VMENTRY_MSR_LOAD_FULL                     0x200A
-#define VMX_VMCS64_CTRL_VMENTRY_MSR_LOAD_HIGH                     0x200B
+#define VMX_VMCS64_CTRL_EXIT_MSR_STORE_FULL                       0x2006
+#define VMX_VMCS64_CTRL_EXIT_MSR_STORE_HIGH                       0x2007
+#define VMX_VMCS64_CTRL_EXIT_MSR_LOAD_FULL                        0x2008
+#define VMX_VMCS64_CTRL_EXIT_MSR_LOAD_HIGH                        0x2009
+
+#define VMX_VMCS64_CTRL_ENTRY_MSR_LOAD_FULL                       0x200A
+#define VMX_VMCS64_CTRL_ENTRY_MSR_LOAD_HIGH                       0x200B
 
 #define VMX_VMCS64_CTRL_EXEC_VMCS_PTR_FULL                        0x200C

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

@@ -685 +685 @@
          */
         Assert(pVCpu->hm.s.vmx.HCPhysGuestMsr);
-        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_VMENTRY_MSR_LOAD_FULL, pVCpu->hm.s.vmx.HCPhysGuestMsr);
+        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_ENTRY_MSR_LOAD_FULL, pVCpu->hm.s.vmx.HCPhysGuestMsr);
         AssertRC(rc);
-        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_VMEXIT_MSR_STORE_FULL, pVCpu->hm.s.vmx.HCPhysGuestMsr);
+        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_EXIT_MSR_STORE_FULL, pVCpu->hm.s.vmx.HCPhysGuestMsr);
         AssertRC(rc);
         Assert(pVCpu->hm.s.vmx.HCPhysHostMsr);
-        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_VMEXIT_MSR_LOAD_FULL,  pVCpu->hm.s.vmx.HCPhysHostMsr);
+        rc = VMXWriteVMCS64(VMX_VMCS64_CTRL_EXIT_MSR_LOAD_FULL,  pVCpu->hm.s.vmx.HCPhysHostMsr);
         AssertRC(rc);
 #endif /* VBOX_WITH_AUTO_MSR_LOAD_RESTORE */
@@ -5573 +5573 @@
         case VMX_VMCS64_CTRL_IO_BITMAP_B_FULL:
         case VMX_VMCS64_CTRL_MSR_BITMAP_FULL:
-        case VMX_VMCS64_CTRL_VMEXIT_MSR_STORE_FULL:
-        case VMX_VMCS64_CTRL_VMEXIT_MSR_LOAD_FULL:
-        case VMX_VMCS64_CTRL_VMENTRY_MSR_LOAD_FULL:
+        case VMX_VMCS64_CTRL_EXIT_MSR_STORE_FULL:
+        case VMX_VMCS64_CTRL_EXIT_MSR_LOAD_FULL:
+        case VMX_VMCS64_CTRL_ENTRY_MSR_LOAD_FULL:
         case VMX_VMCS64_CTRL_VAPIC_PAGEADDR_FULL:
         case VMX_VMCS64_CTRL_APIC_ACCESSADDR_FULL: