Changeset 17332 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2009 9:14:23 AM (16 years ago)

Author:

vboxsync

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

43708

Message:

Partially backed out 43703

Location:

trunk/src/VBox/VMM

Files:

• IOM.cpp (modified) (1 diff)
• IOMInternal.h (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)

trunk/src/VBox/VMM/IOM.cpp

@@ -458 +458 @@
         {
             /* register the statistics counters. */
-            rc = STAMR3RegisterF(pVM, &pStats->ReadR3,              STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-R3", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->WriteR3,             STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-R3", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->ReadRZ,              STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-RZ", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->WriteRZ,             STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-RZ", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->ReadRZToR3,          STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-RZtoR3", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->WriteRZToR3,         STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-RZtoR3", GCPhys); AssertRC(rc);
-            rc = STAMR3RegisterF(pVM, &pStats->IOEmulateFailedR0,   STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-IOEmuFailedR0", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->ReadR3,      STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-R3", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->WriteR3,     STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-R3", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->ReadRZ,      STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-RZ", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->WriteRZ,     STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-RZ", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->ReadRZToR3,  STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Read-RZtoR3", GCPhys); AssertRC(rc);
+            rc = STAMR3RegisterF(pVM, &pStats->WriteRZToR3, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, pszDesc, "/IOM/MMIO/%RGp-Write-RZtoR3", GCPhys); AssertRC(rc);
 
             /* Profiling */

trunk/src/VBox/VMM/IOMInternal.h

@@ -128 +128 @@
     /** Number of writes to this address from R0/RC which was serviced in R3. */
     STAMCOUNTER                 WriteRZToR3;
-
-    /** Number of failed IO block emulation attempts. */
-    STAMCOUNTER                 IOEmulateFailedR0;
-
 } IOMMMIOSTATS;
 /** Pointer to I/O port statistics. */

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -1393 +1393 @@
             STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
 #endif
-#ifdef IN_RING0
-        if (    rc == VINF_EM_RAW_EMULATE_IO_BLOCK
-            &&  !HWACCMCanEmulateIoBlock(pVM))
-        {
-            /* Failed io emulation block attempt; just retry (a switch to ring 3 would jump right back) */
-# ifdef VBOX_WITH_STATISTICS
-            STAM_PROFILE_ADV_START(&pStats->CTX_SUFF_Z(ProfWrite), a);
-            STAM_COUNTER_INC(&pStats->IOEmulateFailedR0);
-# endif
-            int rc = pRange->CTX_SUFF(pfnWriteCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhys, &u32Value, (unsigned)cbValue);
-# ifdef VBOX_WITH_STATISTICS
-            STAM_PROFILE_ADV_STOP(&pStats->CTX_SUFF_Z(ProfWrite), a);
-            if (rc != VINF_IOM_HC_MMIO_WRITE)
-                STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
-# endif
-        }
-#endif
         Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, u32Value, cbValue, rc));
         return rc;