Changeset 58354 in vbox for trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

Timestamp:

Oct 21, 2015 10:13:47 AM (9 years ago)

Author:

vboxsync

Message:

IOMIOPortReadString,IOMIOPortWriteString: Must return to ring-3 when there aren't ring-0/raw-mode handlers for a range, and set *pcTransfers to zero for unused ports (read also store 0xff in pvDst).

File:

• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (4 diffs)

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

@@ -299 +299 @@
         else
         {
-            STAM_STATS({ if (pStats)
-                    STAM_COUNTER_INC(&pStats->InRZToR3); });
+            STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_SUCCESS;
+            return VINF_IOM_R3_IOPORT_READ;
         }
 #endif
@@ -411 +410 @@
      * Ok, no handler for this port.
      */
+    *pcTransfers = 0;
+    memset(pvDst, 0xff, cRequestedTransfers * cb);
 #ifdef VBOX_WITH_STATISTICS
     if (pStats)
         STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(In));
 #endif
-
-    Log3(("IOMIOPortReadStr: uPort=%RTiop pvDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
+    Log3(("IOMIOPortReadStr: uPort=%RTiop (unused) pvDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
           uPort, pvDst, pcTransfers, cRequestedTransfers, *pcTransfers, cb));
     IOM_UNLOCK_SHARED(pVM);
@@ -641 +641 @@
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_SUCCESS;
+            return VINF_IOM_R3_IOPORT_WRITE;
         }
 #endif
@@ -744 +744 @@
      * Ok, no handler for this port.
      */
+    *pcTransfers = 0;
 #ifdef VBOX_WITH_STATISTICS
     if (pStats)
         STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Out));
 #endif
-
-    Log3(("IOMIOPortWriteStr: uPort=%RTiop pvSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
+    Log3(("IOMIOPortWriteStr: uPort=%RTiop (unused) pvSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
           uPort, pvSrc, pcTransfers, cRequestedTransfers, *pcTransfers, cb));
     IOM_UNLOCK_SHARED(pVM);