Changeset 13388 in vbox

Timestamp:

Oct 20, 2008 11:44:51 AM (16 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk

Files:

• include/VBox/iom.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)

trunk/include/VBox/iom.h

@@ -213 +213 @@
 VMMDECL(int)  IOMMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue);
 VMMDECL(int)  IOMInterpretCheckPortIOAccess(PVM pVM, PCPUMCTXCORE pCtxCore, RTIOPORT Port, unsigned cb);
-VMMDECL(int)  IOMMMIOModifyRegion(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags);
+VMMDECL(int)  IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags);
 VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys);
 

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

@@ -1739 +1739 @@
 VMMDECL(int)  IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags)
 {
-    Assert(fPageFlags == X86_PTE_RW);
+    Assert(fPageFlags == (X86_PTE_RW|X86_PTE_P));
 
     Log(("IOMMMIOModifyPage %VGp -> %VGp flags=%RX64\n", GCPhys, GCPhysRemapped, fPageFlags));
@@ -1763 +1763 @@
 
     /* Mark it as writable and present so reads and writes no longer fault. */
-    rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, X86_PTE_RW | X86_PTE_P);
+    rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, fPageFlags);
     AssertRC(rc);