Changeset 60850 in vbox for trunk/src/VBox

Timestamp:

May 5, 2016 3:43:19 PM (9 years ago)

Author:

vboxsync

Message:

HM: Dropped HMR0SavePendingIOPortWrite and associated code (leaving HMR0SavePendingIOPortRead), since IOMIOPortWrite won't be returning VINF_IOM_R3_IOPORT_WRITE any more but rather VINF_IOM_R3_IOPORT_COMMIT_WRITE.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (2 diffs)
• include/HMInternal.h (modified) (2 diffs)

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

@@ -1626 +1626 @@
     pVCpu->hm.s.PendingIO.s.Port.uAndVal  = uAndVal;
     pVCpu->hm.s.PendingIO.s.Port.cbSize   = cbSize;
-/** @todo IOM will do this stuff, retire the HM feature.   */
-    return;
-}
-
-
-/**
- * Save a pending IO write.
- *
- * @param   pVCpu           The cross context virtual CPU structure.
- * @param   GCPtrRip        Address of IO instruction.
- * @param   GCPtrRipNext    Address of the next instruction.
- * @param   uPort           Port address.
- * @param   uAndVal         AND mask for fetching the result from eax.
- * @param   cbSize          Read size.
- */
-VMMR0_INT_DECL(void) HMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext,
-                                                unsigned uPort, unsigned uAndVal, unsigned cbSize)
-{
-    pVCpu->hm.s.PendingIO.enmType         = HMPENDINGIO_PORT_WRITE;
-    pVCpu->hm.s.PendingIO.GCPtrRip        = GCPtrRip;
-    pVCpu->hm.s.PendingIO.GCPtrRipNext    = GCPtrRipNext;
-    pVCpu->hm.s.PendingIO.s.Port.uPort    = uPort;
-    pVCpu->hm.s.PendingIO.s.Port.uAndVal  = uAndVal;
-    pVCpu->hm.s.PendingIO.s.Port.cbSize   = cbSize;
-/** @todo IOM will do this stuff, retire the HM feature.   */
     return;
 }

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

@@ -4929 +4929 @@
         {
             rcStrict = IOMIOPortWrite(pVM, pVCpu, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, cbValue);
-            if (rcStrict == VINF_IOM_R3_IOPORT_WRITE)
-                HMR0SavePendingIOPortWrite(pVCpu, pCtx->rip, pVmcb->ctrl.u64ExitInfo2, IoExitInfo.n.u16Port, uAndVal, cbValue);
-
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOWrite);
         }

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

@@ -12287 +12287 @@
         {
             rcStrict = IOMIOPortWrite(pVM, pVCpu, uIOPort, pMixedCtx->eax & uAndVal, cbValue);
-            if (rcStrict == VINF_IOM_R3_IOPORT_WRITE)
-                HMR0SavePendingIOPortWrite(pVCpu, pMixedCtx->rip, pMixedCtx->rip + cbInstr, uIOPort, uAndVal, cbValue);
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOWrite);
         }

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -3083 +3083 @@
 VMMR3_INT_DECL(VBOXSTRICTRC) HMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
+    /*
+     * Check if we've got relevant data pending.
+     */
     HMPENDINGIO enmType = pVCpu->hm.s.PendingIO.enmType;
-
+    if (enmType == HMPENDINGIO_INVALID)
+        return VERR_NOT_FOUND;
     pVCpu->hm.s.PendingIO.enmType = HMPENDINGIO_INVALID;
-
-    if (    pVCpu->hm.s.PendingIO.GCPtrRip != pCtx->rip
-        ||  enmType  == HMPENDINGIO_INVALID)
+    if (pVCpu->hm.s.PendingIO.GCPtrRip != pCtx->rip)
         return VERR_NOT_FOUND;
 
+    /*
+     * Execute pending I/O.
+     */
     VBOXSTRICTRC rcStrict;
     switch (enmType)
@@ -3109 +3114 @@
             break;
         }
-
-        case HMPENDINGIO_PORT_WRITE:
-            rcStrict = IOMIOPortWrite(pVM, pVCpu, pVCpu->hm.s.PendingIO.s.Port.uPort,
-                                      pCtx->eax & pVCpu->hm.s.PendingIO.s.Port.uAndVal,
-                                      pVCpu->hm.s.PendingIO.s.Port.cbSize);
-            if (IOM_SUCCESS(rcStrict))
-                pCtx->rip = pVCpu->hm.s.PendingIO.GCPtrRipNext;
-            break;
 
         default:

trunk/src/VBox/VMM/include/HMInternal.h

@@ -291 +291 @@
     HMPENDINGIO_INVALID = 0,
     HMPENDINGIO_PORT_READ,
-    HMPENDINGIO_PORT_WRITE,
-    HMPENDINGIO_STRING_READ,
-    HMPENDINGIO_STRING_WRITE,
+    /* not implemented: HMPENDINGIO_STRING_READ, */
+    /* not implemented: HMPENDINGIO_STRING_WRITE, */
     /** The usual 32-bit paranoia. */
     HMPENDINGIO_32BIT_HACK   = 0x7fffffff
@@ -871 +870 @@
     } EmulateIoBlock;
 
-    /** @todo IOM does this now, can be retired. */
+    /* */
     struct
     {