Changeset 43961 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 26, 2012 12:04:59 PM (12 years ago)

Author:

vboxsync

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

82306

Message:

VMM: Pass the VMCPU to IOMMMIOMapMMIOHCPage() as we already have it.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAllMMIO.cpp (modified) (3 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -2417 +2417 @@
  * @returns VBox status code.
  *
- * @param   pVM             The virtual machine.
+ * @param   pVM             Pointer to the VM.
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   GCPhys          The address of the MMIO page to be changed.
  * @param   HCPhys          The address of the host physical page.
@@ -2423 +2424 @@
  *                          for the time being.
  */
-VMMDECL(int) IOMMMIOMapMMIOHCPage(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint64_t fPageFlags)
+VMMDECL(int) IOMMMIOMapMMIOHCPage(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint64_t fPageFlags)
 {
     /* Currently only called from VT-x code during a page fault. */
@@ -2430 +2431 @@
     AssertReturn(fPageFlags == (X86_PTE_RW | X86_PTE_P), VERR_INVALID_PARAMETER);
     Assert(HMIsEnabled(pVM));
-
-    PVMCPU pVCpu = VMMGetCpu(pVM);
 
     /*

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

@@ -3535 +3535 @@
                     {
                         Log(("Enable VT-x virtual APIC access filtering\n"));
-                        rc2 = IOMMMIOMapMMIOHCPage(pVM, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess, X86_PTE_RW | X86_PTE_P);
+                        rc2 = IOMMMIOMapMMIOHCPage(pVM, pVCpu, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess,
+                                                   X86_PTE_RW | X86_PTE_P);
                         AssertRC(rc2);
                     }
@@ -4044 +4045 @@
                 {
                     Log(("Enable VT-x virtual APIC access filtering\n"));
-                    rc2 = IOMMMIOMapMMIOHCPage(pVM, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess, X86_PTE_RW | X86_PTE_P);
+                    rc2 = IOMMMIOMapMMIOHCPage(pVM, pVCpu, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess,
+                                               X86_PTE_RW | X86_PTE_P);
                     AssertRC(rc2);
                 }
@@ -4104 +4106 @@
             {
                 Log(("Enable VT-x virtual APIC access filtering\n"));
-                rc2 = IOMMMIOMapMMIOHCPage(pVM, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess, X86_PTE_RW | X86_PTE_P);
+                rc2 = IOMMMIOMapMMIOHCPage(pVM, pVCpu, GCPhysApicBase, pVM->hm.s.vmx.HCPhysApicAccess,
+                                           X86_PTE_RW | X86_PTE_P);
                 AssertRC(rc2);
             }