Changeset 4789 in vbox

Timestamp:

Sep 14, 2007 11:10:35 AM (18 years ago)

Author:

vboxsync

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

24488

Message:

Also use host OS ioctls to go to ring 0 for hardware virtualization.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• VMM.cpp (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -423 +423 @@
             memset(pVM->hwaccm.s.vmx.pRealModeTSS->IntRedirBitmap, 0x0, sizeof(pVM->hwaccm.s.vmx.pRealModeTSS->IntRedirBitmap));
 
-            int rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL);
+            int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL, 0);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)
@@ -457 +457 @@
             pVM->hwaccm.s.fInitialized = true;
 
-            int rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL);
+            int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, NULL, 0);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)

trunk/src/VBox/VMM/VMM.cpp

@@ -1959 +1959 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL);
+            rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL, 0);
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);

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

@@ -1568 +1568 @@
 
 
-#ifndef IN_RING0 /** @todo broken in ring 0 */
 /**
  * [REP*] INSB/INSW/INSD
@@ -1885 +1884 @@
 }
 
-#endif /* IN_RING0 */

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

@@ -1218 +1218 @@
         if (IoExitInfo.n.u1STR)
         {
-#if 1
-            /** @todo the ring 3 emulation somehow causes the host to hang during e.g. nt4 installation; fall back to the recompiler */
-            rc = VINF_EM_RAW_EMULATE_INSTR;
-            break;
-#else
             /* ins/outs */
             uint32_t prefix = 0;
@@ -1240 +1235 @@
                 rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, prefix, uIOSize);
             }
-#endif
         }
         else

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

@@ -1418 +1418 @@
 #ifdef VBOX_STRICT
                 if (rc != VINF_EM_RAW_EMULATE_INSTR)
-                    Log(("PGMTrap0eHandler failed with %d\n", rc));
+                    Log2(("PGMTrap0eHandler failed with %d\n", rc));
 #endif
                 /* Need to go back to the recompiler to emulate the instruction. */
@@ -1696 +1696 @@
         if (VMX_EXIT_QUALIFICATION_IO_STRING(exitQualification))
         {
-#if 1
-            /** @todo the ring 3 emulation somehow causes the host to hang during e.g. nt4 installation; fall back to the recompiler */
-            rc = VINF_EM_RAW_EMULATE_INSTR;
-            break;
-#else 
             /* ins/outs */
             uint32_t prefix = 0;
@@ -1718 +1713 @@
                 rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, prefix, cbSize);
             }
-#endif
         }
         else