Changeset 49147 in vbox for trunk/src/VBox

Timestamp:

Oct 16, 2013 9:35:14 PM (11 years ago)

Author:

vboxsync

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

90007

Message:

tstVMM/msr: Formatting bug on 32-bit hosts, a cast got lost in a revision of the code. :/ Run the test with interrupts enabled and query 4/16 times more MSRs in one go.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/VMM.cpp (modified) (1 diff)
• VMMR3/VMMTests.cpp (modified) (3 diffs)
• VMMRC/VMMRC.cpp (modified) (2 diffs)

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

@@ -1949 +1949 @@
                       );
 
+#if 0
     memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE); /* Clear the stack. */
+#endif
     PRTGCUINTPTR32 pFrame = (PRTGCUINTPTR32)(pVCpu->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE) - cArgs;
     int i = cArgs;

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

@@ -679 +679 @@
              * The MSRs.
              */
-#ifdef RT_OS_WINDOWS /* Paranoia: Avoid DPC and other watchdogs. */
-            uint32_t const      cMsrsPerCall = 1024;
-#else
-            uint32_t const      cMsrsPerCall = 4096;
-#endif
+            uint32_t const      cMsrsPerCall = 16384;
             uint32_t            cbResults = cMsrsPerCall * sizeof(VMMTESTMSRENTRY);
             PVMMTESTMSRENTRY    paResults;
@@ -704 +700 @@
                     }
 
-                    RT_BZERO(paResults, cbResults);
+                    /*RT_BZERO(paResults, cbResults);*/
                     rc = VMMR3CallRC(pVM, RCPtrEP, 4, pVM->pVMRC, uCurMsr, cMsrsPerCall, RCPtrResults);
                     if (RT_FAILURE(rc))
@@ -715 +711 @@
                         if (paResults[i].uMsr != UINT64_MAX)
                         {
-                            RTStrmPrintf(pOutStrm, "%#010x = %#llx\n", paResults[i].uMsr, paResults[i].uValue);
-                            RTPrintf("%#010x = %#llx\n", paResults[i].uMsr, paResults[i].uValue);
+                            if (paResults[i].uValue == 0)
+                            {
+                                RTStrmPrintf(pOutStrm, "%#010llx = 0\n", paResults[i].uMsr);
+                                RTPrintf("%#010llx = 0\n", paResults[i].uMsr);
+                            }
+                            else
+                            {
+                                RTStrmPrintf(pOutStrm, "%#010llx = %#x`%08x\n", paResults[i].uMsr,
+                                             (uint32_t)(paResults[i].uValue >> 32), (uint32_t)paResults[i].uValue);
+                                RTPrintf("%#010llx = %#010x`%08x\n", paResults[i].uMsr,
+                                         (uint32_t)(paResults[i].uValue >> 32), (uint32_t)paResults[i].uValue);
+                            }
                             cMsrsFound++;
                             uLastMsr = paResults[i].uMsr;

trunk/src/VBox/VMM/VMMRC/VMMRC.cpp

@@ -361 +361 @@
 VMMRCTestReadMsrs(PVM pVM, uint32_t uMsr, uint32_t cMsrs, PVMMTESTMSRENTRY paResults)
 {
-    AssertReturn(cMsrs <= 4096, VERR_INVALID_PARAMETER);
+    AssertReturn(cMsrs <= 16384, VERR_INVALID_PARAMETER);
     AssertPtrReturn(paResults, VERR_INVALID_POINTER);
+    ASMIntEnable(); /* Run with interrupts enabled, so we can query more MSRs in one block. */
 
     for (uint32_t i = 0; i < cMsrs; i++, uMsr++)
@@ -371 +372 @@
             paResults[i].uMsr = UINT64_MAX;
     }
+
+    ASMIntDisable();
     return VINF_SUCCESS;
 }