Changeset 37323 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 3, 2011 4:20:06 PM (14 years ago)

Author:

vboxsync

Message:

build fix and some prefix cleanup.

Location:

trunk/src/VBox/VMM/include

Files:

• HWACCMInternal.h (modified) (4 diffs)
• HWACCMInternal.mac (modified) (2 diffs)

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

@@ -517 +517 @@
     struct
     {
-        RTHCPHYS    pPageCpuPhys;
-        RTHCPHYS    pVMCSPhys;
+        RTHCPHYS    HCPhysCpuPage;
+        RTHCPHYS    HCPhysVMCS;
         RTGCPTR     pCache;
         RTGCPTR     pCtx;
@@ -524 +524 @@
     struct
     {
-        RTHCPHYS    pVMCSPhys;
+        RTHCPHYS    HCPhysVMCS;
         RTGCPTR     pCache;
         RTGCPTR     pCtx;
@@ -592 +592 @@
     {
         /** Physical address of the VM control structure (VMCS). */
-        RTHCPHYS                    pVMCSPhys;
+        RTHCPHYS                    HCPhysVMCS;
         /** R0 memory object for the VM control structure (VMCS). */
-        RTR0MEMOBJ                  pMemObjVMCS;
+        RTR0MEMOBJ                  hMemObjVMCS;
         /** Virtual address of the VM control structure (VMCS). */
-        R0PTRTYPE(void *)           pVMCS;
+        R0PTRTYPE(void *)           pvVMCS;
 
         /** Ring 0 handlers for VT-x. */
@@ -612 +612 @@
 
         /** Physical address of the virtual APIC page for TPR caching. */
-        RTHCPHYS                    pVAPICPhys;
+        RTHCPHYS                    HCPhysVAPIC;
         /** R0 memory object for the virtual APIC page for TPR caching. */
-        RTR0MEMOBJ                  pMemObjVAPIC;
+        RTR0MEMOBJ                  hMemObjVAPIC;
         /** Virtual address of the virtual APIC page for TPR caching. */
-        R0PTRTYPE(uint8_t *)        pVAPIC;
+        R0PTRTYPE(uint8_t *)        pbVAPIC;
 
         /** Current CR0 mask. */

trunk/src/VBox/VMM/include/HWACCMInternal.mac

@@ -17 +17 @@
 %define VMX_USE_CACHED_VMCS_ACCESSES
 
-;Maximum number of cached entries. 
+;Maximum number of cached entries.
 %define VMCSCACHE_MAX_ENTRY                             128
 
-; Structure for storing read and write VMCS actions. 
+; Structure for storing read and write VMCS actions.
 struc VMCSCACHE
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -43 +43 @@
     .Read.aFieldVal           resq    VMCSCACHE_MAX_ENTRY
 %ifdef DEBUG
-    .TestIn.pPageCpuPhys      resq    1
-    .TestIn.pVMCSPhys         resq    1
+    .TestIn.HCPhysCpuPage     resq    1
+    .TestIn.HCPhysVMCS        resq    1
     .TestIn.pCache            resq    1
     .TestIn.pCtx              resq    1
-    .TestOut.pVMCSPhys        resq    1
+    .TestOut.HCPhysVMCS       resq    1
     .TestOut.pCache           resq    1
     .TestOut.pCtx             resq    1