Changeset 68001 in vbox for trunk/src

Timestamp:

Jul 17, 2017 3:27:35 PM (8 years ago)

Author:

vboxsync

Message:

PGMR0,GVMMR0: Ditto for I/O MMU setup.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GVMMR0.cpp (modified) (1 diff)
• PGMR0.cpp (modified) (4 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -1883 +1883 @@
 
 /**
+ * Validates a GVM/VM pair.
+ *
+ * @returns VBox status code.
+ * @param   pGVM        The global (ring-0) VM structure.
+ * @param   pVM         The cross context VM structure.
+ */
+GVMMR0DECL(int) GVMMR0ValidateGVMandVM(PGVM pGVM, PVM pVM)
+{
+    PGVMM pGVMM;
+    return gvmmR0ByGVMandVM(pGVM, pVM, &pGVMM, false /*fTakeUsedLock*/);
+}
+
+
+
+/**
  * Validates a GVM/VM/EMT combo.
  *

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

@@ -77 +77 @@
     AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_CPU_ID); /* caller already checked this, but just to be sure. */
     AssertReturn(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf(), VERR_NOT_OWNER);
-    PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-    PGM_LOCK_ASSERT_OWNER_EX(pVM, pVCpu);
+    PGM_LOCK_ASSERT_OWNER_EX(pVM, &pVM->aCpus[idCpu]);
 
     /*
@@ -202 +200 @@
     AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_CPU_ID); /* caller already checked this, but just to be sure. */
     AssertReturn(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf(), VERR_NOT_OWNER);
-    PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-    PGM_LOCK_ASSERT_OWNER_EX(pVM, pVCpu);
+    PGM_LOCK_ASSERT_OWNER_EX(pVM, &pVM->aCpus[idCpu]);
 
     /*
@@ -244 +240 @@
     AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_CPU_ID); /* caller already checked this, but just to be sure. */
     AssertReturn(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf(), VERR_NOT_OWNER);
-    PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-    PGM_LOCK_ASSERT_OWNER_EX(pVM, pVCpu);
-
+    PGM_LOCK_ASSERT_OWNER_EX(pVM, &pVM->aCpus[idCpu]);
     Assert(!pVM->pgm.s.cLargeHandyPages);
 
@@ -388 +381 @@
  * @returns VBox status code.
  *
+ * @param   pGVM                The global (ring-0) VM structure.
  * @param   pVM                 The cross context VM structure.
  */
-VMMR0_INT_DECL(int) PGMR0PhysSetupIommu(PVM pVM)
-{
-    PGVM pGVM;
-    int rc = GVMMR0ByVM(pVM, &pGVM);
+VMMR0_INT_DECL(int) PGMR0PhysSetupIoMmu(PGVM pGVM, PVM pVM)
+{
+    int rc = GVMMR0ValidateGVMandVM(pGVM, pVM);
     if (RT_FAILURE(rc))
         return rc;

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

@@ -1655 +1655 @@
             if (idCpu != 0)
                 return VERR_INVALID_CPU_ID;
-            rc = PGMR0PhysSetupIommu(pVM);
+            rc = PGMR0PhysSetupIoMmu(pGVM, pVM);
             VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
             break;