Changeset 1580 in vbox for trunk/src

Timestamp:

Mar 20, 2007 8:08:01 PM (18 years ago)

Author:

vboxsync

Message:

Corrected VBOXTSS member name.

Location:

trunk/src/VBox/VMM

Files:

• SELM.cpp (modified) (4 diffs)
• TRPMInternal.mac (modified) (1 diff)
• VMMGC/SELMGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/SELM.cpp

@@ -108 +108 @@
     AssertRelease((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));
     AssertRelease((RT_OFFSETOF(VM, selm.s.TssTrap08) & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.TssTrap08));
-    AssertRelease(sizeof(pVM->selm.s.Tss.redirBitmap) == 0x20);
+    AssertRelease(sizeof(pVM->selm.s.Tss.IntRedirBitmap) == 0x20);
 
     /*
@@ -153 +153 @@
     pVM->selm.s.Tss.offIoBitmap = sizeof(VBOXTSS);
     /* bit set to 1 means no redirection */
-    memset(pVM->selm.s.Tss.redirBitmap, 0xff, sizeof(pVM->selm.s.Tss.redirBitmap));
+    memset(pVM->selm.s.Tss.IntRedirBitmap, 0xff, sizeof(pVM->selm.s.Tss.IntRedirBitmap));
 
     /*
@@ -1430 +1430 @@
                                   || pDesc->Gen.u4Type == X86_SEL_TYPE_SYS_386_TSS_BUSY;
 
-        /** @note we should monitor the whole TSS to catch accesses to the virtual interrupt redirection bitmap, but
-         *        that causes some problems and with Windows guests some overhead as the entire TSS is rather big (3 pages).
-         *        We'll assume for now that the bitmap is static.
+        /* Note: We should monitor the whole TSS to catch accesses to the virtual interrupt redirection bitmap, but
+         *       that causes some problems and with Windows guests some overhead as the entire TSS is rather big (3 pages).
+         *       We'll assume for now that the bitmap is static.
          */
 #if 1
@@ -1517 +1517 @@
                 if (CPUMGetGuestCR4(pVM) & X86_CR4_VME)
                 {
-                    uint32_t offRedirBitmap = tss.offIoBitmap - sizeof(tss.redirBitmap);
+                    uint32_t offRedirBitmap = tss.offIoBitmap - sizeof(tss.IntRedirBitmap);
                     
                     /** @todo not sure how the partial case is handled; probably not allowed */
-                    if (offRedirBitmap + sizeof(tss.redirBitmap) <= cbTss)
+                    if (offRedirBitmap + sizeof(tss.IntRedirBitmap) <= cbTss)
                     {
-                        rc = PGMPhysReadGCPtr(pVM, &pVM->selm.s.Tss.redirBitmap, GCPtrTss + offRedirBitmap, sizeof(tss.redirBitmap));
+                        rc = PGMPhysReadGCPtr(pVM, &pVM->selm.s.Tss.IntRedirBitmap, GCPtrTss + offRedirBitmap, sizeof(tss.IntRedirBitmap));
                         AssertRC(rc);
                         Log2(("Redirection bitmap:\n"));
-                        Log2(("%.*Vhxd\n", sizeof(tss.redirBitmap), &pVM->selm.s.Tss.redirBitmap));
+                        Log2(("%.*Vhxd\n", sizeof(tss.IntRedirBitmap), &pVM->selm.s.Tss.IntRedirBitmap));
                     }
                 }

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -113 +113 @@
     .fDebugTrap         resw 1
     .offIoBitmap        resw 1
-    .redirBitmap        resb 32
+    .IntRedirBitmap     resb 32
 endstruc
 

trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

@@ -287 +287 @@
         if (CPUMGetGuestCR4(pVM) & X86_CR4_VME)
         {
-            uint32_t offRedirBitmap = pGuestTSS->offIoBitmap - sizeof(pVM->selm.s.Tss.redirBitmap);
+            uint32_t offIntRedirBitmap = pGuestTSS->offIoBitmap - sizeof(pVM->selm.s.Tss.IntRedirBitmap);
 
             /** @todo not sure how the partial case is handled; probably not allowed */
-            if (   offRedirBitmap <= offRange 
-                && offRedirBitmap + sizeof(pVM->selm.s.Tss.redirBitmap) >= offRange + cb
-                && offRedirBitmap + sizeof(pVM->selm.s.Tss.redirBitmap) <= pVM->selm.s.cbGuestTss)
+            if (   offIntRedirBitmap <= offRange 
+                && offIntRedirBitmap + sizeof(pVM->selm.s.Tss.IntRedirBitmap) >= offRange + cb
+                && offIntRedirBitmap + sizeof(pVM->selm.s.Tss.IntRedirBitmap) <= pVM->selm.s.cbGuestTss)
             {
-                Log(("offIoBitmap=%x offRedirBitmap=%x cbTSS=%x\n", pGuestTSS->offIoBitmap, offRedirBitmap, pVM->selm.s.cbGuestTss));
+                Log(("offIoBitmap=%x offIntRedirBitmap=%x cbTSS=%x\n", pGuestTSS->offIoBitmap, offIntRedirBitmap, pVM->selm.s.cbGuestTss));
                 /** @todo only update the changed part. */
-                for (uint32_t i=0;i<sizeof(pVM->selm.s.Tss.redirBitmap)/8;i++)
+                for (uint32_t i = 0; i < sizeof(pVM->selm.s.Tss.IntRedirBitmap) / 8;i++)
                 {
-                    rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.redirBitmap[i*8], (uint8_t *)pGuestTSS + offRedirBitmap + i*8, 8);
+                    rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.IntRedirBitmap[i * 8], (uint8_t *)pGuestTSS + offIntRedirBitmap + i * 8, 8);
                     if (VBOX_FAILURE(rc))
                     {
                         /* Shadow page table might be out of sync */
-                        rc = PGMPrefetchPage(pVM, (uint8_t *)pGuestTSS + offRedirBitmap + i*8);
+                        rc = PGMPrefetchPage(pVM, (uint8_t *)pGuestTSS + offIntRedirBitmap + i*8);
                         if (VBOX_FAILURE(rc))
                         {
-                            AssertMsg(rc == VINF_SUCCESS, ("PGMPrefetchPage %VGv failed with %Vrc\n", (uint8_t *)pGuestTSS + offRedirBitmap + i*8, rc));
+                            AssertMsg(rc == VINF_SUCCESS, ("PGMPrefetchPage %VGv failed with %Vrc\n", (uint8_t *)pGuestTSS + offIntRedirBitmap + i*8, rc));
                             break;
                         }
-                        rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.redirBitmap[i*8], (uint8_t *)pGuestTSS + offRedirBitmap + i*8, 8);
+                        rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.IntRedirBitmap[i * 8], (uint8_t *)pGuestTSS + offIntRedirBitmap + i * 8, 8);
                     }
-                    AssertMsg(rc == VINF_SUCCESS, ("MMGCRamRead %VGv failed with %Vrc\n", (uint8_t *)pGuestTSS + offRedirBitmap + i*8, rc));
+                    AssertMsg(rc == VINF_SUCCESS, ("MMGCRamRead %VGv failed with %Vrc\n", (uint8_t *)pGuestTSS + offIntRedirBitmap + i * 8, rc));
                 }
                 STAM_COUNTER_INC(&pVM->selm.s.StatGCWriteGuestTSSRedir);