Changeset 56403 in vbox

Timestamp:

Jun 13, 2015 6:21:54 PM (10 years ago)

Author:

vboxsync

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

101003

Message:

IOMIOPortWriteString,IOMIOPortReadString: Don't make all string I/O return to ring-3 just because the device hasn't got any string I/O callback.

File:

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

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

@@ -68 +68 @@
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
@@ -227 +227 @@
  * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
+ * @retval  VINF_SUCCESS                Success or no string I/O callback in
+ *                                      this context.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
  * @param   Port        The port to read.
- * @param   pGCPtrDst   Pointer to the destination buffer (GC, incremented appropriately).
+ * @param   pGCPtrDst   Pointer to the destination buffer (RC, incremented
+ *                      appropriately).
  * @param   pcTransfers Pointer to the number of transfer units to read, on return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
@@ -292 +294 @@
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_IOM_R3_IOPORT_READ;
+            return VINF_SUCCESS;
         }
 #endif
@@ -372 +374 @@
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
@@ -506 +508 @@
  * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
+ * @retval  VINF_SUCCESS                Success or no string I/O callback in
+ *                                      this context.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
  * @param   Port        The port to write.
- * @param   pGCPtrSrc   Pointer to the source buffer (GC, incremented appropriately).
+ * @param   pGCPtrSrc   Pointer to the source buffer (RC, incremented
+ *                      appropriately).
  * @param   pcTransfers Pointer to the number of transfer units to write, on return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
@@ -571 +575 @@
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_IOM_R3_IOPORT_WRITE;
+            return VINF_SUCCESS;
         }
 #endif