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

Timestamp:

Feb 20, 2013 5:20:27 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: bits.

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -266 +266 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        pVCpu->hm.s.vmx.hMemObjVMCS = NIL_RTR0MEMOBJ;
+        pVCpu->hm.s.vmx.hMemObjVmcs = NIL_RTR0MEMOBJ;
 
         /* Allocate one page for the VM control structure (VMCS). */
-        rc = RTR0MemObjAllocCont(&pVCpu->hm.s.vmx.hMemObjVMCS, PAGE_SIZE, false /* fExecutable */);
+        rc = RTR0MemObjAllocCont(&pVCpu->hm.s.vmx.hMemObjVmcs, PAGE_SIZE, false /* fExecutable */);
         AssertRC(rc);
         if (RT_FAILURE(rc))
             return rc;
 
-        pVCpu->hm.s.vmx.pvVMCS     = RTR0MemObjAddress(pVCpu->hm.s.vmx.hMemObjVMCS);
-        pVCpu->hm.s.vmx.HCPhysVMCS = RTR0MemObjGetPagePhysAddr(pVCpu->hm.s.vmx.hMemObjVMCS, 0);
-        ASMMemZeroPage(pVCpu->hm.s.vmx.pvVMCS);
+        pVCpu->hm.s.vmx.pvVmcs     = RTR0MemObjAddress(pVCpu->hm.s.vmx.hMemObjVmcs);
+        pVCpu->hm.s.vmx.HCPhysVmcs = RTR0MemObjGetPagePhysAddr(pVCpu->hm.s.vmx.hMemObjVmcs, 0);
+        ASMMemZeroPage(pVCpu->hm.s.vmx.pvVmcs);
 
         pVCpu->hm.s.vmx.cr0_mask = 0;
@@ -332 +332 @@
 
 #ifdef LOG_ENABLED
-        SUPR0Printf("VMXR0InitVM %x VMCS=%x (%x)\n", pVM, pVCpu->hm.s.vmx.pvVMCS, (uint32_t)pVCpu->hm.s.vmx.HCPhysVMCS);
+        SUPR0Printf("VMXR0InitVM %x VMCS=%x (%x)\n", pVM, pVCpu->hm.s.vmx.pvVmcs, (uint32_t)pVCpu->hm.s.vmx.HCPhysVmcs);
 #endif
     }
@@ -352 +352 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        if (pVCpu->hm.s.vmx.hMemObjVMCS != NIL_RTR0MEMOBJ)
-        {
-            RTR0MemObjFree(pVCpu->hm.s.vmx.hMemObjVMCS, false);
-            pVCpu->hm.s.vmx.hMemObjVMCS = NIL_RTR0MEMOBJ;
-            pVCpu->hm.s.vmx.pvVMCS      = 0;
-            pVCpu->hm.s.vmx.HCPhysVMCS  = 0;
+        if (pVCpu->hm.s.vmx.hMemObjVmcs != NIL_RTR0MEMOBJ)
+        {
+            RTR0MemObjFree(pVCpu->hm.s.vmx.hMemObjVmcs, false);
+            pVCpu->hm.s.vmx.hMemObjVmcs = NIL_RTR0MEMOBJ;
+            pVCpu->hm.s.vmx.pvVmcs      = 0;
+            pVCpu->hm.s.vmx.HCPhysVmcs  = 0;
         }
         if (pVCpu->hm.s.vmx.hMemObjVirtApic != NIL_RTR0MEMOBJ)
@@ -496 +496 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        AssertPtr(pVCpu->hm.s.vmx.pvVMCS);
+        AssertPtr(pVCpu->hm.s.vmx.pvVmcs);
 
         /* Set revision dword at the beginning of the VMCS structure. */
-        *(uint32_t *)pVCpu->hm.s.vmx.pvVMCS = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(pVM->hm.s.vmx.msr.vmx_basic_info);
+        *(uint32_t *)pVCpu->hm.s.vmx.pvVmcs = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(pVM->hm.s.vmx.msr.vmx_basic_info);
 
         /*
          * Clear and activate the VMCS.
          */
-        Log(("HCPhysVMCS  = %RHp\n", pVCpu->hm.s.vmx.HCPhysVMCS));
-        rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+        Log(("HCPhysVmcs  = %RHp\n", pVCpu->hm.s.vmx.HCPhysVmcs));
+        rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
         if (RT_FAILURE(rc))
             goto vmx_end;
 
-        rc = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+        rc = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
         if (RT_FAILURE(rc))
             goto vmx_end;
@@ -722 +722 @@
          * VMCS data back to memory.
          */
-        rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+        rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
         AssertRC(rc);
 
@@ -4911 +4911 @@
         /* Try to extract more information about what might have gone wrong here. */
         VMXGetActivateVMCS(&pVCpu->hm.s.vmx.lasterror.u64VMCSPhys);
-        pVCpu->hm.s.vmx.lasterror.u32VMCSRevision = *(uint32_t *)pVCpu->hm.s.vmx.pvVMCS;
+        pVCpu->hm.s.vmx.lasterror.u32VMCSRevision = *(uint32_t *)pVCpu->hm.s.vmx.pvVmcs;
         pVCpu->hm.s.vmx.lasterror.idEnteredCpu    = pVCpu->hm.s.idEnteredCpu;
         pVCpu->hm.s.vmx.lasterror.idCurrentCpu    = RTMpCpuId();
@@ -4954 +4954 @@
 
     /* Activate the VMCS. */
-    int rc = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+    int rc = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
     if (RT_FAILURE(rc))
         return rc;
@@ -5006 +5006 @@
      * VMCS data back to memory.
      */
-    int rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+    int rc = VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
     AssertRC(rc);
 
@@ -5330 +5330 @@
 #ifdef DEBUG
     pCache->TestIn.HCPhysCpuPage= 0;
-    pCache->TestIn.HCPhysVMCS   = 0;
+    pCache->TestIn.HCPhysVmcs   = 0;
     pCache->TestIn.pCache       = 0;
-    pCache->TestOut.HCPhysVMCS  = 0;
+    pCache->TestOut.HCPhysVmcs  = 0;
     pCache->TestOut.pCache      = 0;
     pCache->TestOut.pCtx        = 0;
@@ -5340 +5340 @@
     aParam[0] = (uint32_t)(HCPhysCpuPage);                                  /* Param 1: VMXON physical address - Lo. */
     aParam[1] = (uint32_t)(HCPhysCpuPage >> 32);                            /* Param 1: VMXON physical address - Hi. */
-    aParam[2] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVMCS);                 /* Param 2: VMCS physical address - Lo. */
-    aParam[3] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVMCS >> 32);           /* Param 2: VMCS physical address - Hi. */
+    aParam[2] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVmcs);                 /* Param 2: VMCS physical address - Lo. */
+    aParam[3] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVmcs >> 32);           /* Param 2: VMCS physical address - Hi. */
     aParam[4] = VM_RC_ADDR(pVM, &pVM->aCpus[pVCpu->idCpu].hm.s.vmx.VMCSCache);
     aParam[5] = 0;
@@ -5359 +5359 @@
 #ifdef DEBUG
     AssertMsg(pCache->TestIn.HCPhysCpuPage== HCPhysCpuPage, ("%RHp vs %RHp\n", pCache->TestIn.HCPhysCpuPage, HCPhysCpuPage));
-    AssertMsg(pCache->TestIn.HCPhysVMCS   == pVCpu->hm.s.vmx.HCPhysVMCS, ("%RHp vs %RHp\n", pCache->TestIn.HCPhysVMCS,
-                                                                              pVCpu->hm.s.vmx.HCPhysVMCS));
-    AssertMsg(pCache->TestIn.HCPhysVMCS   == pCache->TestOut.HCPhysVMCS, ("%RHp vs %RHp\n", pCache->TestIn.HCPhysVMCS,
-                                                                          pCache->TestOut.HCPhysVMCS));
+    AssertMsg(pCache->TestIn.HCPhysVmcs   == pVCpu->hm.s.vmx.HCPhysVmcs, ("%RHp vs %RHp\n", pCache->TestIn.HCPhysVmcs,
+                                                                              pVCpu->hm.s.vmx.HCPhysVmcs));
+    AssertMsg(pCache->TestIn.HCPhysVmcs   == pCache->TestOut.HCPhysVmcs, ("%RHp vs %RHp\n", pCache->TestIn.HCPhysVmcs,
+                                                                          pCache->TestOut.HCPhysVmcs));
     AssertMsg(pCache->TestIn.pCache       == pCache->TestOut.pCache, ("%RGv vs %RGv\n", pCache->TestIn.pCache,
                                                                       pCache->TestOut.pCache));
@@ -5518 +5518 @@
 
     /* Clear VMCS. Marking it inactive, clearing implementation-specific data and writing VMCS data back to memory. */
-    VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+    VMXClearVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
 
     /* Leave VMX Root Mode. */
@@ -5548 +5548 @@
     }
 
-    rc2 = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVMCS);
+    rc2 = VMXActivateVMCS(pVCpu->hm.s.vmx.HCPhysVmcs);
     AssertRC(rc2);
     Assert(!(ASMGetFlags() & X86_EFL_IF));

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

@@ -1141 +1141 @@
             {
                 LogRel(("HM: VCPU%d: MSR bitmap physaddr    = %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysMsrBitmap));
-                LogRel(("HM: VCPU%d: VMCS physaddr          = %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysVMCS));
+                LogRel(("HM: VCPU%d: VMCS physaddr          = %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysVmcs));
             }
 
@@ -2731 +2731 @@
 
             case VERR_VMX_INVALID_VMCS_PTR:
-                LogRel(("VERR_VMX_INVALID_VMCS_PTR: CPU%d Current pointer %RGp vs %RGp\n", i, pVM->aCpus[i].hm.s.vmx.lasterror.u64VMCSPhys, pVM->aCpus[i].hm.s.vmx.HCPhysVMCS));
+                LogRel(("VERR_VMX_INVALID_VMCS_PTR: CPU%d Current pointer %RGp vs %RGp\n", i, pVM->aCpus[i].hm.s.vmx.lasterror.u64VMCSPhys, pVM->aCpus[i].hm.s.vmx.HCPhysVmcs));
                 LogRel(("VERR_VMX_INVALID_VMCS_PTR: CPU%d Current VMCS version %x\n", i, pVM->aCpus[i].hm.s.vmx.lasterror.u32VMCSRevision));
                 LogRel(("VERR_VMX_INVALID_VMCS_PTR: CPU%d Entered Cpu %d\n", i, pVM->aCpus[i].hm.s.vmx.lasterror.idEnteredCpu));

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

@@ -529 +529 @@
     {
         /** Physical address of the VM control structure (VMCS). */
-        RTHCPHYS                    HCPhysVMCS;
+        RTHCPHYS                    HCPhysVmcs;
         /** R0 memory object for the VM control structure (VMCS). */
-        RTR0MEMOBJ                  hMemObjVMCS;
+        RTR0MEMOBJ                  hMemObjVmcs;
         /** Virtual address of the VM control structure (VMCS). */
-        R0PTRTYPE(void *)           pvVMCS;
+        R0PTRTYPE(void *)           pvVmcs;
         /** Ring 0 handlers for VT-x. */
         PFNHMVMXSTARTVM             pfnStartVM;

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

@@ -400 +400 @@
     CHECK_MEMBER_ALIGNMENT(HM, StatTprPatchSuccess, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, StatEntry, 8);
-    CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.HCPhysVMCS, sizeof(RTHCPHYS));
+    CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.HCPhysVmcs, sizeof(RTHCPHYS));
     CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.u32ProcCtls, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, Event.u64IntrInfo, 8);