Changeset 2507

Timestamp:

05/04/07 20:23:45 (2 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.

Files:

• trunk/include/VBox/err.h (modified) (2 diffs)
• trunk/src/VBox/VMM/DBGF.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -136 +136 @@
- * interrupts having changed the EIP. */
-#define VINF_EM_RESCHEDULE                  1117
-ex
+in
-#define VINF_EM_LAST                        1118
-
@@ -712 +712 @@
-/** Reason for leaving GC: I/O port write. */
-#define VINF_IOM_HC_IOPORT_WRITE            2621
-/** Reason for leaving GC: I/O read/write.
- * @deprecated Don't use this! */
-#define VINF_IOM_HC_IOPORT_READWRITE        2622
-/** Reason for leaving GC: MMIO write. */
-#define VINF_IOM_HC_MMIO_READ               2623

trunk/src/VBox/VMM/DBGF.cpp

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