Changeset 13831 in vbox

Timestamp:

Nov 5, 2008 1:53:59 AM (17 years ago)

Author:

vboxsync

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

38822

Message:

VMM: Retired VM::pVMGCUnused.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• include/VBox/vm.mac (modified) (2 diffs)
• src/VBox/VMM/MMHyper.cpp (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -464 +464 @@
     /** Ring-0 Host Context VM Pointer. */
     R0PTRTYPE(struct VM *)      pVMR0;
-    /** Raw-mode Context VM Pointer.
-     * @deprecated Use VM::pVMRC. */
-    RCPTRTYPE(struct VM *)      pVMGCUnused;
     /** Raw-mode Context VM Pointer. */
     RCPTRTYPE(struct VM *)      pVMRC;
@@ -482 +479 @@
 
     /** Reserved; alignment. */
-    uint32_t                    u32Reserved[5];
+    uint32_t                    u32Reserved[6];
 
     /** @name Public VMM Switcher APIs

trunk/include/VBox/vm.mac

@@ -54 +54 @@
     .pVMR3              RTR3PTR_RES 1
     .pVMR0              RTR0PTR_RES 1
-    .pVMGCUnused        RTRCPTR_RES 1
     .pVMRC              RTRCPTR_RES 1
     .hSelf              resd 1
@@ -60 +59 @@
     .cbSelf             resd 1
     .offVMCPU           resd 1
-    .u32Reserved        resd 5
+    .u32Reserved        resd 6
 
     .pfnVMMGCGuestToHostAsmGuestCtx RTRCPTR_RES 1

trunk/src/VBox/VMM/MMHyper.cpp

@@ -111 +111 @@
         {
             pVM->pVMRC = (RTRCPTR)GCPtr;
-            pVM->pVMGCUnused = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
                 pVM->aCpus[i].pVMRC = pVM->pVMRC;
@@ -288 +287 @@
              * Relocate the VM structure and ourselves.
              */
-            RTGCINTPTR      offDelta = GCPtrNew - GCPtrOld;
+            RTGCINTPTR offDelta = GCPtrNew - GCPtrOld;
             pVM->pVMRC                          += offDelta;
-            pVM->pVMGCUnused                     = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
                 pVM->aCpus[i].pVMRC              = pVM->pVMRC;