Changeset 2507 in vbox for trunk/src/VBox

Timestamp:

May 4, 2007 6:23:45 PM (18 years ago)

Author:

vboxsync

Message:

Drop the VINF_IOM_HC_IOPORT_READWRITE status code as it isn't really used. Made VINF_EM_LAST inclusive as per last/end convention used elsewhere in the VM.

Location:

trunk/src/VBox/VMM

Files:

• DBGF.cpp (modified) (2 diffs)
• VMM.cpp (modified) (1 diff)
• VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)
• VMMInternal.h (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/DBGF.cpp

@@ -610 +610 @@
                 rc = VMR3ReqProcess(pVM);
                 LogFlow(("dbgfr3VMMWait: VMR3ReqProcess -> %Vrc rcRet=%Vrc\n", rc, rcRet));
-                if (rc >= VINF_EM_FIRST && rc < VINF_EM_LAST)
+                if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
                 {
                     switch (rc)
@@ -662 +662 @@
                 rcRet = rc;
             else if (    rc >= VINF_EM_FIRST
-                     &&  rc < VINF_EM_LAST
+                     &&  rc <= VINF_EM_LAST
                      &&  (rc < rcRet || rcRet == VINF_SUCCESS))
                 rcRet = rc;

trunk/src/VBox/VMM/VMM.cpp

@@ -496 +496 @@
                     STAM_REG(pVM, &pVM->vmm.s.StatGCRetIORead,              STAMTYPE_COUNTER, "/VMM/GCRet/IORead",              STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_READ returns.");
                     STAM_REG(pVM, &pVM->vmm.s.StatGCRetIOWrite,             STAMTYPE_COUNTER, "/VMM/GCRet/IOWrite",             STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_WRITE returns.");
-                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetIOReadWrite,         STAMTYPE_COUNTER, "/VMM/GCRet/IOReadWrite",         STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_READWRITE returns.");
                     STAM_REG(pVM, &pVM->vmm.s.StatGCRetMMIORead,            STAMTYPE_COUNTER, "/VMM/GCRet/MMIORead",            STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_MMIO_READ returns.");
                     STAM_REG(pVM, &pVM->vmm.s.StatGCRetMMIOWrite,           STAMTYPE_COUNTER, "/VMM/GCRet/MMIOWrite",           STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_MMIO_WRITE returns.");

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

@@ -835 +835 @@
             /* no break; */
         case VINF_PGM_SYNC_CR3: /** @todo Check this with Sander. */
-        case VINF_IOM_HC_IOPORT_READWRITE:
         case VINF_IOM_HC_IOPORT_READ:
         case VINF_IOM_HC_IOPORT_WRITE:

trunk/src/VBox/VMM/VMMInternal.h

@@ -270 +270 @@
     STAMCOUNTER                 StatGCRetIORead;
     STAMCOUNTER                 StatGCRetIOWrite;
-    STAMCOUNTER                 StatGCRetIOReadWrite;
     STAMCOUNTER                 StatGCRetMMIORead;
     STAMCOUNTER                 StatGCRetMMIOWrite;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -279 +279 @@
         case VINF_IOM_HC_IOPORT_WRITE:
             STAM_COUNTER_INC(&pVM->vmm.s.StatGCRetIOWrite);
-            break;
-        case VINF_IOM_HC_IOPORT_READWRITE:
-            STAM_COUNTER_INC(&pVM->vmm.s.StatGCRetIOReadWrite);
             break;
         case VINF_IOM_HC_MMIO_READ: