Changeset 43737 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 25, 2012 11:00:40 AM (13 years ago)

Author:

vboxsync

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

81637

Message:

VMM/VMMR0/HWVMXR0: fix typo while saving the host IDTR into the VMCS.
It worked previously as we restore it manually) but still having the right value in the VMCS is good
in case of VM entry exceptions.
Renamed a function to camel case.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0A.asm (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -971 +971 @@
 ; * @param  pIdtr        Where to store the 64-bit IDTR.
 ; */
-;DECLASM(void) hmR0Get64bitGDTRandIDTR(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
-ALIGNCODE(16)
-BEGINPROC hmR0Get64bitGDTRandIDTR
+;DECLASM(void) hmR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
+ALIGNCODE(16)
+BEGINPROC hmR0Get64bitGdtrAndIdtr
     db      0xea                        ; jmp far .sixtyfourbit_mode
     dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
@@ -991 +991 @@
     dd      .the_end, NAME(SUPR0AbsKernelCS)
 BITS 32
-ENDPROC   hmR0Get64bitGDTRandIDTR
+ENDPROC   hmR0Get64bitGdtrAndIdtr
 
 

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

@@ -1296 +1296 @@
         {
             X86XDTR64 gdtr64, idtr64;
-            hmR0Get64bitGDTRandIDTR(&gdtr64, &idtr64);
+            hmR0Get64bitGdtrAndIdtr(&gdtr64, &idtr64);
             rc  = VMXWriteVMCS64(VMX_VMCS_HOST_GDTR_BASE, gdtr64.uAddr);
-            rc |= VMXWriteVMCS64(VMX_VMCS_HOST_IDTR_BASE, gdtr64.uAddr);
+            rc |= VMXWriteVMCS64(VMX_VMCS_HOST_IDTR_BASE, idtr64.uAddr);
             AssertRC(rc);
             Log2(("VMX_VMCS_HOST_GDTR_BASE %RX64\n", gdtr64.uAddr));

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

@@ -852 +852 @@
  * @param  pIdtr        Where to store the 64-bit IDTR.
  */
-DECLASM(void) hmR0Get64bitGDTRandIDTR(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
+DECLASM(void) hmR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
 
 /**